Merging with the MAN_SALOME2 branch

[modules/med.git] / src / MED / Med_Gen_i.cxx

diff --git a/src/MED/Med_Gen_i.cxx b/src/MED/Med_Gen_i.cxx
index 347a8304c377dc03e5fcaf1561fdef6f39e8afcb..b214dfb148cc86612faae7229a71fc8bee8fa7d7 100755 (executable)
--- a/src/MED/Med_Gen_i.cxx
+++ b/src/MED/Med_Gen_i.cxx
@@ -26,15 +26,14 @@
 //  Module : MED
 //  $Header$
 
-using namespace std;
 using namespace std;
 #include "Med_Gen_i.hxx"
 
-#include "Mesh_i.hxx"
-#include "Med_i.hxx"
-#include "FieldInt_i.hxx"
-#include "FieldDouble_i.hxx"
-#include "Support_i.hxx"
+#include "MEDMEM_Mesh_i.hxx"
+#include "MEDMEM_Med_i.hxx"
+#include "MEDMEM_FieldInt_i.hxx"
+#include "MEDMEM_FieldDouble_i.hxx"
+#include "MEDMEM_Support_i.hxx"
 
 
 #include "MEDMEM_Mesh.hxx"
@@ -61,6 +60,8 @@ using namespace std;
 #include <HDFascii.hxx>
 #include "SALOMEDS_Tool.hxx"
 
+using namespace MEDMEM;
+
 // Initialisation des variables statiques
  map <string, string> Med_Gen_i::_MedCorbaObj;
  string Med_Gen_i::_myFileName="";
@@ -934,7 +935,7 @@ SALOMEDS::SObject_ptr Med_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy,
     if ( !Comp->_is_nil() ) {
       aName->SetValue( Comp->componentusername() );
     }    
-    aBuilder->DefineComponentInstance(aFather, Med_Gen::_this());
+    aBuilder->DefineComponentInstance(aFather, MED_Gen::_this());
   }
 
   if (CORBA::is_nil(theSObject)) {