Change namespace ParaMEDMEM to MEDCoupling when compiling with MPI.

This is in order to fix compilation errors when compiling with
SALOME_USE_MPI=ON.

diff --git a/src/MEDGUI/MEDGUISelectComponents.cxx b/src/MEDGUI/MEDGUISelectComponents.cxx
index a892e6799ee1b3d6b7b04987aada1406cc383a9c..168f03d2dc4dd0a8c37fd109f333de21df87431d 100644 (file)
--- a/src/MEDGUI/MEDGUISelectComponents.cxx
+++ b/src/MEDGUI/MEDGUISelectComponents.cxx
@@ -35,7 +35,7 @@
 #include <QCheckBox>
 #include <QLineEdit>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 //  Constructor
 //  Initialize qt part and private var part

diff --git a/src/ParaMEDCouplingCorba/ParaMEDCouplingFieldDoubleServant.cxx b/src/ParaMEDCouplingCorba/ParaMEDCouplingFieldDoubleServant.cxx
index a1fa5dc5410724166e883f60a319313b69f55f25..c57344e10a1ca2e8fbd68d33cdde4246bc618af9 100644 (file)
--- a/src/ParaMEDCouplingCorba/ParaMEDCouplingFieldDoubleServant.cxx
+++ b/src/ParaMEDCouplingCorba/ParaMEDCouplingFieldDoubleServant.cxx
@@ -19,7 +19,7 @@
 
 #include "ParaMEDCouplingFieldDoubleServant.hxx"
 #include "utilities.h"
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 ParaMEDCouplingFieldDoubleServant::ParaMEDCouplingFieldDoubleServant(CORBA::ORB_ptr orb,MEDCouplingFieldDouble* field):MEDCouplingFieldDoubleServant(field)
 {

diff --git a/src/ParaMEDCouplingCorba/ParaMEDCouplingFieldDoubleServant.hxx b/src/ParaMEDCouplingCorba/ParaMEDCouplingFieldDoubleServant.hxx
index 8ee46c9109b046abd21986290a86dea5a87d1115..819ca4ba23b43c168f77321d8f969f74d9f7c44b 100644 (file)
--- a/src/ParaMEDCouplingCorba/ParaMEDCouplingFieldDoubleServant.hxx
+++ b/src/ParaMEDCouplingCorba/ParaMEDCouplingFieldDoubleServant.hxx
@@ -26,7 +26,7 @@
 #include "MEDCouplingFieldDouble.hxx"
 #include "MEDCouplingFieldDoubleServant.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class ParaMEDCouplingFieldDoubleServant : public virtual POA_SALOME_MED::ParaMEDCouplingFieldDoubleCorbaInterface,
                                             public MEDCouplingFieldDoubleServant,

diff --git a/src/ParaMEDCouplingCorba/ParaMEDCouplingUMeshServant.cxx b/src/ParaMEDCouplingCorba/ParaMEDCouplingUMeshServant.cxx
index 737ae090e905c36fe1591035d9afb6db648cb29b..69398b1268d554cea403ac96abb1e16efaaec251 100644 (file)
--- a/src/ParaMEDCouplingCorba/ParaMEDCouplingUMeshServant.cxx
+++ b/src/ParaMEDCouplingCorba/ParaMEDCouplingUMeshServant.cxx
@@ -19,7 +19,7 @@
 
 #include "ParaMEDCouplingUMeshServant.hxx"
 #include "utilities.h"
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 ParaMEDCouplingUMeshServant::ParaMEDCouplingUMeshServant(CORBA::ORB_ptr orb,MEDCouplingUMesh* mesh):MEDCouplingUMeshServant(mesh),MPIObject_i()
 {

diff --git a/src/ParaMEDCouplingCorba/ParaMEDCouplingUMeshServant.hxx b/src/ParaMEDCouplingCorba/ParaMEDCouplingUMeshServant.hxx
index ea390e931a033b8a285b5c09042947aac414fe5e..6d4d761759c67ad8e4e6e6d03d2f5a95627e7074 100644 (file)
--- a/src/ParaMEDCouplingCorba/ParaMEDCouplingUMeshServant.hxx
+++ b/src/ParaMEDCouplingCorba/ParaMEDCouplingUMeshServant.hxx
@@ -25,7 +25,7 @@
 #include "MPIObject_i.hxx"
 #include "MEDCouplingUMeshServant.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class ParaMEDCouplingUMeshServant : public virtual POA_SALOME_MED::ParaMEDCouplingUMeshCorbaInterface,
                                       public MEDCouplingUMeshServant,

diff --git a/src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.cxx b/src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.cxx
index bab77522a92316d79f598ff5a96e91e8e01715c3..5ab0a9a975d3abbf7621759b7cda57789c874e43 100644 (file)
--- a/src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.cxx
+++ b/src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.cxx
@@ -20,7 +20,7 @@
 #include "MPIMEDCouplingFieldDoubleServant.hxx"
 #include "utilities.h"
 using namespace std;
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 typedef struct
 {

diff --git a/src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.hxx b/src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.hxx
index 701f27a399a78b1e444b4f43b033253c11da385c..9c796fa21f739cbc3afd8b291ed4d32416c2bbca 100644 (file)
--- a/src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.hxx
+++ b/src/ParaMEDMEMComponent/MPIMEDCouplingFieldDoubleServant.hxx
@@ -29,7 +29,7 @@
 
 void * th_getdatabympi(void *st);
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MPIMEDCouplingFieldDoubleServant : public virtual POA_SALOME_MED::MPIMEDCouplingFieldDoubleCorbaInterface,
                                            public ParaMEDCouplingFieldDoubleServant

diff --git a/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.cxx b/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.cxx
index 1f3414e3fd41088bfd5362885652f62a443642b4..1564011bbff5ac508224e1d61cfbf6390dc78f3c 100644 (file)
--- a/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.cxx
+++ b/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.cxx
@@ -21,7 +21,7 @@
 #include "utilities.h"
 #include "Utils_SALOME_Exception.hxx"
 using namespace std;
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 typedef struct
 {

diff --git a/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.hxx b/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.hxx
index 7faef6811027093cd90910a6f143d5212be99f51..45e34163d9798ecc2676303029b14e7352ca3b3d 100644 (file)
--- a/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.hxx
+++ b/src/ParaMEDMEMComponent/ParaMEDMEMComponent_i.hxx
@@ -62,7 +62,7 @@ typedef struct
   SALOME_MED::ParaMEDMEMComponent_ptr compo;
 } thread_st;
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class ParaMEDMEMComponent_i : public virtual POA_SALOME_MED::ParaMEDMEMComponent, public Engines_Component_i, public MPIObject_i
   {