Merge branch 'agy/EltStrInMC' -> Structure elements in MED file are now read

diff --git a/src/INTERP_KERNELTest/BasicMainTest.hxx b/src/INTERP_KERNELTest/BasicMainTest.hxx
index 560ca52ca19f6d5c2dc2a91e1e7911991a5dbc0c..f2b40ad21bbb8e435b71be29e4531fa1692b4849 100644 (file)
--- a/src/INTERP_KERNELTest/BasicMainTest.hxx
+++ b/src/INTERP_KERNELTest/BasicMainTest.hxx
@@ -32,7 +32,7 @@
 #include <iostream>
 #include <fstream>
 
-#ifndef WIN32
+#if !defined WIN32 && !defined __APPLE__
 #include <fpu_control.h>
 #endif
 
@@ -45,7 +45,7 @@
 
 int main(int argc, char* argv[])
 {
-#ifndef WIN32
+#if !defined WIN32 && !defined __APPLE__
   fpu_control_t cw = _FPU_DEFAULT & ~(_FPU_MASK_IM | _FPU_MASK_ZM | _FPU_MASK_OM);
   _FPU_SETCW(cw);
 #endif
@@ -57,7 +57,7 @@ int main(int argc, char* argv[])
   controller.addListener( &result );        
 
   // ---  Add a listener that print dots as test run.
-#ifdef WIN32
+#if !defined WIN32 && !defined __APPLE__
   CPPUNIT_NS::TextTestProgressListener progress;
 #else
   CPPUNIT_NS::BriefTestProgressListener progress;

diff --git a/src/MEDLoader/Swig/SauvLoaderTest.py b/src/MEDLoader/Swig/SauvLoaderTest.py
index 40b301940a06422b3445f9b14062009ea06b5b51..ffa9364e00be4794ec906f555a1fc424ad40181e 100644 (file)
--- a/src/MEDLoader/Swig/SauvLoaderTest.py
+++ b/src/MEDLoader/Swig/SauvLoaderTest.py
@@ -134,8 +134,8 @@ class SauvLoaderTest(unittest.TestCase):
         self.assertEqual(1, um1.getNumberOfCellsWithType( NORM_TRI3 ))
         pointeUM0 = pointeMedMesh.getMeshAtLevel(0)
         self.assertTrue(m.getCoords().isEqualWithoutConsideringStr(pointeMedMesh.getCoords(),1e-12))
-        self.assertEqual( um0.getMeasureField(0).accumulate(0),
-                          pointeUM0.getMeasureField(0).accumulate(0),1e-12)
+        self.assertEqual( um0.getMeasureField(False).accumulate(0),
+                          pointeUM0.getMeasureField(False).accumulate(0),1e-12)
         # check fields
         # fieldnodedouble
         fieldnodedoubleTS1 = pointeMed.getFields().getFieldWithName("fieldnodedouble")

diff --git a/src/MEDPartitioner/MEDPARTITIONER_ParaDomainSelector.cxx b/src/MEDPartitioner/MEDPARTITIONER_ParaDomainSelector.cxx
index 9beacb2049562268b32dc79fd98a3738582ff5ff..f91be6f2549ff6bf741fd3d8853d58c7655b3235 100644 (file)
--- a/src/MEDPartitioner/MEDPARTITIONER_ParaDomainSelector.cxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_ParaDomainSelector.cxx
@@ -646,7 +646,7 @@ void MEDPARTITIONER::ParaDomainSelector::recvMesh(MEDCoupling::MEDCouplingUMesh*
 #endif
 }
 
-#ifndef WIN32
+#if !defined WIN32 && !defined __APPLE__
 #include <sys/sysinfo.h>
 #endif
 
@@ -658,7 +658,7 @@ int MEDPARTITIONER::ParaDomainSelector::evaluateMemory() const
   if ( _mesure_memory )
     {
       int used_memory = 0;
-#ifndef WIN32
+#if !defined WIN32 && !defined __APPLE__
       struct sysinfo si;
       int err = sysinfo( &si );
       if ( !err )