Merge 'abn/V8_1_fix' branch into V8_1_BR.

[modules/med.git] / src / MEDCalc / cmp / MEDDataManager_i.hxx

diff --git a/src/MEDCalc/cmp/MEDDataManager_i.hxx b/src/MEDCalc/cmp/MEDDataManager_i.hxx
index 67c701bfb0f08826c91498e362caf1f3c0a243e4..f6a5611b03b50a1f9cb3a270a0da74779c49c4e9 100644 (file)
--- a/src/MEDCalc/cmp/MEDDataManager_i.hxx
+++ b/src/MEDCalc/cmp/MEDDataManager_i.hxx
@@ -29,7 +29,7 @@
 #include "MEDCouplingRemapper.hxx"
 #include "MEDCouplingUMesh.hxx"
 #include "MEDCouplingFieldDouble.hxx"
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 /*! This map is used for lifecycle management of fields used in this operator */
 #include <map>
@@ -75,8 +75,8 @@ public:
 
   // -----------------------------------------------------------
   // Mesh management
-  MEDCALC_EXPORT MEDCALC::MeshHandlerList * getMeshList(CORBA::Long datasourceId);
-  MEDCALC_EXPORT MEDCALC::MeshHandler * getMesh(CORBA::Long meshId);
+  MEDCALC_EXPORT MEDCALC::MeshHandlerList * getMeshHandlerList(CORBA::Long datasourceId);
+  MEDCALC_EXPORT MEDCALC::MeshHandler * getMeshHandler(CORBA::Long meshId);
 
   // -----------------------------------------------------------
   // Field management
@@ -107,6 +107,8 @@ public:
 
   MEDCALC_EXPORT void serverlog();
 
+  MEDCALC_EXPORT void cleanUp();
+
   //
   // ===========================================================
   // Other public functions (non available via CORBA)
@@ -161,7 +163,7 @@ private:
   long getUMeshId(const MEDCouplingMesh * mesh);
 
   INTERP_KERNEL::IntersectionType _getIntersectionType(const char* intersType);
-  ParaMEDMEM::NatureOfField _getNatureOfField(const char* fieldNature);
+  MEDCoupling::NatureOfField _getNatureOfField(const char* fieldNature);
 
 };