update after merging trhe branches CEA_V3_0_x, OCC_V3_1_0_a1_x, and the main

[modules/med.git] / src / MEDMEM / MEDMEM_DriversDef.hxx

diff --git a/src/MEDMEM/MEDMEM_DriversDef.hxx b/src/MEDMEM/MEDMEM_DriversDef.hxx
index 981f0b7a574b4e9df2fce6cc1c34d87acc172087..58710d3c045b1534b36c6e83e0bfd0582f215b74 100644 (file)
--- a/src/MEDMEM/MEDMEM_DriversDef.hxx
+++ b/src/MEDMEM/MEDMEM_DriversDef.hxx
@@ -9,13 +9,13 @@
 using namespace std ;
 
 #include "MEDMEM_define.hxx"
-#include "utilities.h"
-namespace MED_FR {
+#include "MEDMEM_Utilities.hxx"
 
-/*!  This Class inherits from  map. /n
-     It is a constant map association int (which is a med_geometrie_element) and string. /n
+namespace MED_EN {
+/*!  This Class inherits from  map. \n
+     It is a constant map association int (which is a med_geometrie_element) and string. \n
      Operator [] returns the (string) name of the geometry of an element 
-     given by a med_geometrie_element value. /n 
+     given by a med_geometrie_element value. \n 
      Such a static map is instancied and can be used in any code to have
      the name of the geometry of an element : MED_FR:GEO_NAME 
      A simple test/use case can be found in test/testUGeoNameMeshEntities.cxx  */
@@ -28,17 +28,17 @@ public :
   
   GEO_NAME();
   ~GEO_NAME();
-  string & operator[]( const MED_FR::med_geometrie_element &c ) const;
+  string & operator[]( const MED_EN::medGeometryElement &c ) const;
 } ;
 
 static const GEO_NAME geoNames ;
 
 //                             ____________________________    
   
-/*! This Class inherits from map. /n
-    It is a constant map association int (which is a med_entite_maillage) and string. /n
+/*! This Class inherits from map. \n
+    It is a constant map association int (which is a med_entite_maillage) and string. \n
     Operator[] returns the (string) name of the type of an entity given by 
-    a med_entite_maillage value. /n
+    a med_entite_maillage value. \n
     Such a static map is instancied and can be used in any code to have
     the name of the geometry of an element : MED_FR:ENT_NAME 
     A simple test/use case can be found in test/testUGeoNameMeshEntities.cxx  */
@@ -52,24 +52,24 @@ public :
 
   ENT_NAME ();
   ~ENT_NAME();
-  string & operator[]( const MED_FR::med_entite_maillage &c ) const;
+  string & operator[]( const MED_EN::medEntityMesh &c ) const;
 } ;
 
 static const ENT_NAME entNames ;
 
 //                             ____________________________    
 
-/*! This Class inherits from map. /n
-    It is a constant map association int (which is a med_entite_maillage) and  a list. /n
+/*! This Class inherits from map. \n
+    It is a constant map association int (which is a med_entite_maillage) and  a list. \n
     Operator[] returns the list of all exisiting med_geometrie_element for 
-    a med_entite_maillage value. /n
+    a med_entite_maillage value. \n
     Such a static map is instancied and can be used in any code to have
     the name of the geometry of an element : MED_FR:MESH_ENTITIES
     A simple test/use case can be found in test/testUGeoNameMeshEntities.cxx  */
 
 
 //--------------------------------------------------------------------------------
-class MESH_ENTITIES : public map<int, const list<MED_FR::med_geometrie_element> >
+class MESH_ENTITIES : public map<int, const list<MED_EN::medGeometryElement> >
 //--------------------------------------------------------------------------------
 {
 
@@ -77,18 +77,18 @@ public :
 
   MESH_ENTITIES ();
   ~MESH_ENTITIES();
-  const list<MED_FR::med_geometrie_element> & operator[]( const  MED_FR::med_entite_maillage &c ) const;
+  const list<MED_EN::medGeometryElement> & operator[]( const  MED_EN::medEntityMesh &c ) const;
   
 private:
                                        /*! This operator is used to initialize class objects of 
                                            type  const list<med_geometrie_element> */
-  list<MED_FR::med_geometrie_element> & operator[]( const  MED_FR::med_entite_maillage &c );
+  list<MED_EN::medGeometryElement> & operator[]( const  MED_EN::medEntityMesh &c );
   
 } ;
 
 static const MESH_ENTITIES meshEntities ;
 
-} // End Of NameSpace MED_FR
+} // End Of NameSpace MED_EN
 
 #endif