CCAR: remove unneeded include in Calcium.hxx and check order of includes

diff --git a/src/DSC/DSC_User/Datastream/Calcium/Calcium.hxx b/src/DSC/DSC_User/Datastream/Calcium/Calcium.hxx
index 1b144603925883460ad730c262153c2db6975e37..54aab143a6b313bbf68df6cd3d8badc87880b85d 100644 (file)
--- 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 c75def8d03a7be8f1e0c30ef730ce1531a100714..2f4c86e7392354c81b8e4067a9c0c9b57d491828 100644 (file)
--- 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 3abcc4ea6f0bbf724c83d32d53b1ab4d6038c95f..9bab5d4565f1ab55f813227a6b6991d6ef412d31 100644 (file)
--- 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 7958d482a545e2e4f9fc5036e082220d23422f12..fb4db1f43f453c135db2fa73352079c53bd24f69 100644 (file)
--- 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"