Merge from V6_3_1_BR (V6_3_1rc3 tag) 15/07/2011

diff --git a/src/MEDLoader/MEDFileField.cxx b/src/MEDLoader/MEDFileField.cxx
index 17b6fe7d66a039f7ab2a062a892bddc90aaed19c..7b958119c39b6931b5c5ef38f994a5845afdccce 100644 (file)
--- a/src/MEDLoader/MEDFileField.cxx
+++ b/src/MEDLoader/MEDFileField.cxx
@@ -252,7 +252,15 @@ try:_type(atype),_father(fath),_profile_it(profileIt)
   _profile=MEDLoaderBase::buildStringFromFortran(pflname,MED_NAME_SIZE);
   _localization=MEDLoaderBase::buildStringFromFortran(locname,MED_NAME_SIZE);
   if(type==ON_CELLS && !_localization.empty())
-    setType(ON_GAUSS_PT);
+    {
+      if(_localization!="MED_GAUSS_ELNO")
+        setType(ON_GAUSS_PT);
+      else
+        {
+          setType(ON_GAUSS_NE);
+          _localization.clear();
+        }
+    }
 }
 catch(INTERP_KERNEL::Exception& e)
 {

diff --git a/src/ParaMEDMEMTest/MPI2Connector.cxx b/src/ParaMEDMEMTest/MPI2Connector.cxx
index 386587c20f8360385500463c3f120b94d702c9e1..d4975fffdc3fcb38e788d6c672f184a02bff3d5e 100644 (file)
--- a/src/ParaMEDMEMTest/MPI2Connector.cxx
+++ b/src/ParaMEDMEMTest/MPI2Connector.cxx
@@ -20,6 +20,7 @@
 #include "MPI2Connector.hxx"
 
 #include <iostream>
+#include <cstring>
 
 MPI2Connector::MPI2Connector()
 {