From: vsr <vsr@opencascade.com>
Date: Fri, 15 Jul 2011 09:15:02 +0000 (+0000)
Subject: Merge from V6_3_1_BR (V6_3_1rc3 tag) 15/07/2011
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9818d21a7cc58fb6d9d58cec803f099453880194;p=tools%2Fmedcoupling.git

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 17b6fe7d6..7b958119c 100644
--- 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 386587c20..d4975fffd 100644
--- a/src/ParaMEDMEMTest/MPI2Connector.cxx
+++ b/src/ParaMEDMEMTest/MPI2Connector.cxx
@@ -20,6 +20,7 @@
 #include "MPI2Connector.hxx"
 
 #include <iostream>
+#include <cstring>
 
 MPI2Connector::MPI2Connector()
 {