From 4d922ee9527dab9b99747c3417b2af3975b6fbcc Mon Sep 17 00:00:00 2001
From: caremoli <caremoli>
Date: Wed, 16 Mar 2011 17:47:00 +0000
Subject: [PATCH] CCAR: remove unneeded include in Calcium.hxx and check order
 of includes

---
 src/DSC/DSC_User/Datastream/Calcium/Calcium.hxx             | 1 -
 src/DSC/DSC_User/Datastream/Calcium/CalciumCxxInterface.hxx | 4 ++++
 src/DSC/DSC_User/Datastream/Calcium/CalciumException.hxx    | 4 ++++
 src/DSC/DSC_User/Datastream/Calcium/CalciumInterface.hxx    | 4 ++++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/DSC/DSC_User/Datastream/Calcium/Calcium.hxx b/src/DSC/DSC_User/Datastream/Calcium/Calcium.hxx
index 1b1446039..54aab143a 100644
--- a/src/DSC/DSC_User/Datastream/Calcium/Calcium.hxx
+++ b/src/DSC/DSC_User/Datastream/Calcium/Calcium.hxx
@@ -18,7 +18,6 @@
 //
 
 #include "Superv_Component_i.hxx"
-#include "calcium_port_factory.hxx"
 
 class PySupervCompo:public Superv_Component_i
 {
diff --git a/src/DSC/DSC_User/Datastream/Calcium/CalciumCxxInterface.hxx b/src/DSC/DSC_User/Datastream/Calcium/CalciumCxxInterface.hxx
index c75def8d0..2f4c86e73 100644
--- a/src/DSC/DSC_User/Datastream/Calcium/CalciumCxxInterface.hxx
+++ b/src/DSC/DSC_User/Datastream/Calcium/CalciumCxxInterface.hxx
@@ -27,6 +27,10 @@
 #ifndef _CALCIUM_CXXINTERFACE_HXX_
 #define _CALCIUM_CXXINTERFACE_HXX_
 
+#if defined(__CONST_H) || defined(__CALCIUM_H)
+#error "The header CalciumCxxInterface.hxx must be included before calcium.h"
+#endif
+
 #include <string>
 #include <vector>
 #include <iostream>
diff --git a/src/DSC/DSC_User/Datastream/Calcium/CalciumException.hxx b/src/DSC/DSC_User/Datastream/Calcium/CalciumException.hxx
index 3abcc4ea6..9bab5d456 100644
--- a/src/DSC/DSC_User/Datastream/Calcium/CalciumException.hxx
+++ b/src/DSC/DSC_User/Datastream/Calcium/CalciumException.hxx
@@ -27,6 +27,10 @@
 #ifndef CALCIUM_EXCEPTION_HXX
 #define CALCIUM_EXCEPTION_HXX
 
+#if defined(__CONST_H) || defined(__CALCIUM_H)
+#error "The header CalciumException.hxx must be included before calcium.h"
+#endif
+
 #include "DSC_Exception.hxx"
 #include "CalciumTypes.hxx"
 #include <string>
diff --git a/src/DSC/DSC_User/Datastream/Calcium/CalciumInterface.hxx b/src/DSC/DSC_User/Datastream/Calcium/CalciumInterface.hxx
index 7958d482a..fb4db1f43 100644
--- a/src/DSC/DSC_User/Datastream/Calcium/CalciumInterface.hxx
+++ b/src/DSC/DSC_User/Datastream/Calcium/CalciumInterface.hxx
@@ -30,6 +30,10 @@
 #ifndef _CALCIUM_INTERFACE_HXX_
 #define _CALCIUM_INTERFACE_HXX_
 
+#if defined(__CONST_H) || defined(__CALCIUM_H)
+#error "The header CalciumInterface.hxx must be included before calcium.h"
+#endif
+
 //Interface CALCIUM des utilisateurs en C++ 
 #include "CalciumCxxInterface.hxx"
 
-- 
2.39.2