Final version of the V2_2_0 in the main trunk of the CVS tree.

[modules/med.git] / src / MEDMEM / MEDMEM_Support.cxx

diff --git a/src/MEDMEM/MEDMEM_Support.cxx b/src/MEDMEM/MEDMEM_Support.cxx
index f0f82d62cc8cccfe88e13c304b7ff7cf04b9aa2e..cc1f6401d2342aeae75b847fd664ee2db58c23be 100644 (file)
--- a/src/MEDMEM/MEDMEM_Support.cxx
+++ b/src/MEDMEM/MEDMEM_Support.cxx
@@ -1,4 +1,3 @@
-using namespace std;
 /*
  File Support.cxx
  $Header$
@@ -16,6 +15,7 @@ using namespace std;
 //#include "MEDMEM_Group.hxx"
 #include "MEDMEM_Mesh.hxx"
 
+using namespace std;
 using namespace MED_EN;
 using namespace MEDMEM;
 
@@ -233,9 +233,9 @@ void SUPPORT::blending(SUPPORT * mySupport) throw (MEDEXCEPTION)
   medGeometryElement * myType = new medGeometryElement[MED_NBR_GEOMETRIE_MAILLE];
   int * whereIsType = new int[MED_NBR_GEOMETRIE_MAILLE];
   //MESH_ENTITIES myMeshEntities() ;
-  list<MED_FR::med_geometrie_element>::const_iterator listIt ;
+  list<MED_EN::medGeometryElement>::const_iterator listIt ;
   int it=0 ;
-  for(listIt=(MED_FR::meshEntities[(MED_FR::med_entite_maillage)_entity]).begin();listIt!=(MED_FR::meshEntities[(MED_FR::med_entite_maillage)_entity]).end();listIt++) {
+  for(listIt=(meshEntities[_entity]).begin();listIt!=(meshEntities[_entity]).end();listIt++) {
     tmp_NumberOfElementsInType[it]=0;
     whereIsType[it]=0 ;
     try {
@@ -588,9 +588,9 @@ void SUPPORT::intersecting(SUPPORT * mySupport) throw (MEDEXCEPTION)
   medGeometryElement * myType = new medGeometryElement[MED_NBR_GEOMETRIE_MAILLE];
   int * whereIsType = new int[MED_NBR_GEOMETRIE_MAILLE];
   //MESH_ENTITIES myMeshEntities() ;
-  list<MED_FR::med_geometrie_element>::const_iterator listIt ;
+  list<MED_EN::medGeometryElement>::const_iterator listIt ;
   int it=0 ;
-  for(listIt=(MED_FR::meshEntities[(MED_FR::med_entite_maillage)_entity]).begin();listIt!=(MED_FR::meshEntities[(MED_FR::med_entite_maillage)_entity]).end();listIt++) {
+  for(listIt=(meshEntities[_entity]).begin();listIt!=(meshEntities[_entity]).end();listIt++) {
     tmp_NumberOfElementsInType[it]=0;
     whereIsType[it]=0 ;
     myType[it]= MED_NONE;