From: Ovidiu Mircescu <ovidiu.mircescu@edf.fr>
Date: Fri, 22 Jan 2016 15:15:54 +0000 (+0100)
Subject: Change namespace ParaMEDMEM to MEDCoupling when compiling with MPI.
X-Git-Tag: V8_0_0rc2^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=34d8291f57def317eb8b90ee3da546e7c61593b0;p=modules%2Fmed.git

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 a892e6799..168f03d2d 100644
--- 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 a1fa5dc54..c57344e10 100644
--- 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 8ee46c910..819ca4ba2 100644
--- 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 737ae090e..69398b126 100644
--- 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 ea390e931..6d4d76175 100644
--- 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 bab77522a..5ab0a9a97 100644
--- 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 701f27a39..9c796fa21 100644
--- 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 1f3414e3f..1564011bb 100644
--- 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 7faef6811..45e34163d 100644
--- 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
   {