Sacrifice of MEDRenumber python module for windows due to lack of time. medcoupling...

diff --git a/src/MEDCoupling/MEDCouplingFieldDouble.hxx b/src/MEDCoupling/MEDCouplingFieldDouble.hxx
index 757df6ae72a3ec4dae16c244673cdab27cebdeeb..051d4a5e2295d6c9ee4bf019e447dd3be556a1eb 100644 (file)
--- a/src/MEDCoupling/MEDCouplingFieldDouble.hxx
+++ b/src/MEDCoupling/MEDCouplingFieldDouble.hxx
@@ -154,13 +154,13 @@ namespace MEDCoupling
   protected:
     ~MEDCouplingFieldDouble() { }
   private:
-    MEDCouplingFieldDouble(TypeOfField type, TypeOfTimeDiscretization td);
-    MEDCouplingFieldDouble(const MEDCouplingFieldTemplate& ft, TypeOfTimeDiscretization td);
-    MEDCouplingFieldDouble(const MEDCouplingFieldDouble& other, bool deepCpy);
-    MEDCouplingFieldDouble(NatureOfField n, MEDCouplingTimeDiscretization *td, MEDCouplingFieldDiscretization *type);
-    MCAuto<MEDCouplingFieldDouble> voronoizeGen(const Voronizer *vor, double eps) const;
-    MEDCouplingTimeDiscretization *timeDiscr();
-    const MEDCouplingTimeDiscretization *timeDiscr() const;
+    MEDCOUPLING_EXPORT MEDCouplingFieldDouble(TypeOfField type, TypeOfTimeDiscretization td);
+    MEDCOUPLING_EXPORT MEDCouplingFieldDouble(const MEDCouplingFieldTemplate& ft, TypeOfTimeDiscretization td);
+    MEDCOUPLING_EXPORT MEDCouplingFieldDouble(const MEDCouplingFieldDouble& other, bool deepCpy);
+    MEDCOUPLING_EXPORT MEDCouplingFieldDouble(NatureOfField n, MEDCouplingTimeDiscretization *td, MEDCouplingFieldDiscretization *type);
+    MEDCOUPLING_EXPORT MCAuto<MEDCouplingFieldDouble> voronoizeGen(const Voronizer *vor, double eps) const;
+    MEDCOUPLING_EXPORT MEDCouplingTimeDiscretization *timeDiscr();
+    MEDCOUPLING_EXPORT const MEDCouplingTimeDiscretization *timeDiscr() const;
   };
 }
 

diff --git a/src/RENUMBER_Swig/MEDRenumberCommon.i b/src/RENUMBER_Swig/MEDRenumberCommon.i
index a88e4fb6f9aa3b8a1d79bb2fe4a2da5f4a0bac88..cfc8354ecf339c45989c2f0bb5de157163c8c82c 100644 (file)
--- a/src/RENUMBER_Swig/MEDRenumberCommon.i
+++ b/src/RENUMBER_Swig/MEDRenumberCommon.i
@@ -25,6 +25,11 @@
 #ifdef WIN32
 #define MEDCOUPLING_WIN32_SWIG
 #endif
+%}
+
+%include "MEDCouplingCommon.i"
+
+%{
 #include "MEDCouplingMemArray.txx"
 #include "MCAuto.hxx"
 #include "MEDCouplingDataArrayTypemaps.i"

diff --git a/src/RENUMBER_Swig/MEDRenumberTest.py b/src/RENUMBER_Swig/MEDRenumberTest.py
index f4bb200035695a4c66335a39cc86783b32f2a6a5..ba44c08463f8fcd4e319902e6566af842ef96477 100644 (file)
--- a/src/RENUMBER_Swig/MEDRenumberTest.py
+++ b/src/RENUMBER_Swig/MEDRenumberTest.py
@@ -23,13 +23,8 @@ import sys
 
 class MEDRenumberTest(unittest.TestCase):
 
-    @unittest.skipUnless("BOOST" in RenumberAvailableMethods(),"requires BOOST prerequisite !")
+    @unittest.skipUnless("Boost" in RenumberAvailableMethods(),"requires BOOST prerequisite !")
     def test1(self):
-        if sys.platform == "win32":
-            from MEDCouplingCompat import MEDCouplingCMesh
-        else:
-            from MEDCoupling import MEDCouplingCMesh
-
         ren=RenumberingFactory("BOOST")
         arr=DataArrayDouble(10) ; arr.iota()
         c=MEDCouplingCMesh() ; c.setCoords(arr,arr)