Win32 compilation.

diff --git a/src/MEDPartitioner/MEDPARTITIONER.hxx b/src/MEDPartitioner/MEDPARTITIONER.hxx
index 64d457b4e9028b8b3763486efac8f8538e52c78a..dd26c4193e242f5f11b5da0bec10e09b0753de45 100755 (executable)
--- a/src/MEDPartitioner/MEDPARTITIONER.hxx
+++ b/src/MEDPartitioner/MEDPARTITIONER.hxx
@@ -20,8 +20,8 @@
 #ifndef __MEDPARTITIONER_HXX__
 #define __MEDPARTITIONER_HXX__
 
-#ifdef WNT
-# if defined MEDPARTITIONER_EXPORTS || defined medsplitter_EXPORTS
+#ifdef WIN32
+# if defined MEDPARTITIONER_EXPORTS || defined medpartitioner_EXPORTS
 #  define MEDPARTITIONER_EXPORT __declspec( dllexport )
 # else
 #  define MEDPARTITIONER_EXPORT __declspec( dllimport )

diff --git a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedAsciiDriver.hxx b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedAsciiDriver.hxx
index 13b72dd5a9c270023e5462e905a3931ae78fc28d..67d7f547e75ce074870c856a330d444b0e2b9a38 100644 (file)
--- a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedAsciiDriver.hxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedAsciiDriver.hxx
@@ -25,7 +25,7 @@
 namespace MEDPARTITIONER
 {
   class MeshCollection;
-  class MeshCollectionMedAsciiDriver : public MeshCollectionDriver
+  class MEDPARTITIONER_EXPORT MeshCollectionMedAsciiDriver : public MeshCollectionDriver
   {
   public:
     MeshCollectionMedAsciiDriver(MeshCollection*);

diff --git a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedXmlDriver.cxx b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedXmlDriver.cxx
index 2406505c99a50b2431914df37ab30ca18107d446..b401c12956258e174ecbf2421bc5b2113add3046 100644 (file)
--- a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedXmlDriver.cxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedXmlDriver.cxx
@@ -42,6 +42,11 @@
 #include <libxml/xpath.h>
 #include <libxml/xpathInternals.h>
 
+#ifdef WIN32
+#include <windows.h>
+#include <time.h>
+#endif
+
 using namespace MEDPARTITIONER;
 
 /*!\class MeshCollectionMedXmlDriver
@@ -194,13 +199,22 @@ void MeshCollectionMedXmlDriver::write(const char* filename, ParaDomainSelector*
   xmlNewProp(node, BAD_CAST "ver", BAD_CAST "1");
 
   //Description tag
+  char date[6];
+#ifndef WIN32
   time_t present;
   time( &present);
   struct tm *time_asc = localtime(&present);
-  char date[6];
   sprintf(date,"%02d%02d%02d",time_asc->tm_year
           ,time_asc->tm_mon+1
           ,time_asc->tm_mday);
+#else
+  SYSTEMTIME    st;
+  GetLocalTime ( &st );
+  sprintf(date,"%02d%02d%02d",
+          st.wYear
+          ,st.wMonth
+          ,st.wDay);
+#endif
 
   node = xmlNewChild(root_node,0, BAD_CAST "description",0);
 

diff --git a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedXmlDriver.hxx b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedXmlDriver.hxx
index 2b269960e9fc71c1080360e72c68594c2968a90e..33dde1a713211e6e7f2e71ae1f02b4207838dc68 100644 (file)
--- a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedXmlDriver.hxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedXmlDriver.hxx
@@ -25,7 +25,7 @@
 namespace MEDPARTITIONER
 {
   class MeshCollection;
-  class MeshCollectionMedXmlDriver : public MeshCollectionDriver
+  class MEDPARTITIONER_EXPORT MeshCollectionMedXmlDriver : public MeshCollectionDriver
   {
   public:
     MeshCollectionMedXmlDriver(MeshCollection*);

diff --git a/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.hxx b/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.hxx
index 8dcf1207d051d8e14157d4815007ed164d6893b6..4e7539d07eaf03030b2947ca762489180046abbe 100644 (file)
--- a/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.hxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.hxx
@@ -20,6 +20,8 @@
 #ifndef __MEDPARTITIONER_PARALLELTOPOLOGY_HXX__
 #define __MEDPARTITIONER_PARALLELTOPOLOGY_HXX__
 
+#include "MEDPARTITIONER.hxx"
+
 #include "MEDPARTITIONER_Topology.hxx"
 #include "MEDPARTITIONER_ParaDomainSelector.hxx"
 
@@ -34,7 +36,7 @@ namespace MEDPARTITIONER
   class MeshCollection;
   class MEDPARTITIONER_FaceModel;
 
-  class ParallelTopology : public Topology
+  class MEDPARTITIONER_EXPORT ParallelTopology : public Topology
   {
 
   public:

diff --git a/src/MEDPartitioner/MEDPARTITIONER_Topology.hxx b/src/MEDPartitioner/MEDPARTITIONER_Topology.hxx
index 2253ce1cb6695342bdc43a731a60356207f50535..f21b6be687b86a7275a473c7e74e152a66ebba61 100644 (file)
--- a/src/MEDPartitioner/MEDPARTITIONER_Topology.hxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_Topology.hxx
@@ -36,7 +36,7 @@ namespace MEDPARTITIONER
   class MeshCollection;
   class MEDPARTITIONER_FaceModel;
     
-  class Topology
+  class MEDPARTITIONER_EXPORT Topology
   {
   public:
     Topology() { }

diff --git a/src/MEDPartitioner/MEDPARTITIONER_UserGraph.hxx b/src/MEDPartitioner/MEDPARTITIONER_UserGraph.hxx
index fc1583aa835237c76f05e935c421956a9fda834a..c67076599e5df3ab986c470b974c104f8e9cd59d 100644 (file)
--- a/src/MEDPartitioner/MEDPARTITIONER_UserGraph.hxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_UserGraph.hxx
@@ -29,7 +29,7 @@ namespace MEDPARTITIONER
 {
   class SkyLineArray;
   class ParaDomainSelector;
-  class MEDPARTITIONER_EXPORT UserGraph : public Graph
+  class MEDPARTITIONER_EXPORT MEDPARTITIONER_EXPORT UserGraph : public Graph
   {
   public:
     UserGraph(MEDPARTITIONER::SkyLineArray*, const int*, int);

diff --git a/src/MEDPartitioner/MEDPARTITIONER_Utils.hxx b/src/MEDPartitioner/MEDPARTITIONER_Utils.hxx
index 8b548df3e3fa0a17157d45d267ed064e1e78b40c..e69cfe91e932366837c10be2239ce98c07933c3c 100644 (file)
--- a/src/MEDPartitioner/MEDPARTITIONER_Utils.hxx
+++ b/src/MEDPartitioner/MEDPARTITIONER_Utils.hxx
@@ -20,6 +20,8 @@
 #ifndef __MEDPARTITIONER_UTILS_HXX__
 #define __MEDPARTITIONER_UTILS_HXX__
 
+#include "MEDPARTITIONER.hxx"
+
 #include "MEDCouplingUMesh.hxx"
 
 #include <string>
@@ -30,48 +32,48 @@
 
 namespace MEDPARTITIONER
 {
-  std::string Trim(const std::string& s,const std::string& drop);
-  std::string IntToStr(const int i);
-  std::string DoubleToStr(const double i);
-  int StrToInt(const std::string& s);
-  double StrToDouble(const std::string& s);
-  bool TestArg(const char *arg, const char *argExpected, std::string& argValue);
-  std::vector<int> CreateRandomSize(const int size);
-  void RandomizeAdj(int* xadj, int* adjncy, std::vector<int>& ran, std::vector<int>& vx, std::vector<int>& va);
-  void TestRandomize();
-  
-  std::string ReprVectorOfString(const std::vector<std::string>& vec);
-  std::string ReprVectorOfString(const std::vector<std::string>& vec, const std::string separator);
-  std::string ReprMapOfStringInt(const std::map<std::string,int>& mymap);
-  std::string ReprMapOfStringVectorOfString(const std::map< std::string,std::vector<std::string> >& mymap);
-  std::string ReprFieldDescriptions(const std::vector<std::string>& vec,const  std::string separator);
+  MEDPARTITIONER_EXPORT std::string Trim(const std::string& s,const std::string& drop);
+  MEDPARTITIONER_EXPORT std::string IntToStr(const int i);
+  MEDPARTITIONER_EXPORT std::string DoubleToStr(const double i);
+  MEDPARTITIONER_EXPORT int StrToInt(const std::string& s);
+  MEDPARTITIONER_EXPORT double StrToDouble(const std::string& s);
+  MEDPARTITIONER_EXPORT bool TestArg(const char *arg, const char *argExpected, std::string& argValue);
+  MEDPARTITIONER_EXPORT std::vector<int> CreateRandomSize(const int size);
+  MEDPARTITIONER_EXPORT void RandomizeAdj(int* xadj, int* adjncy, std::vector<int>& ran, std::vector<int>& vx, std::vector<int>& va);
+  MEDPARTITIONER_EXPORT void TestRandomize();
+                       
+  MEDPARTITIONER_EXPORT std::string ReprVectorOfString(const std::vector<std::string>& vec);
+  MEDPARTITIONER_EXPORT std::string ReprVectorOfString(const std::vector<std::string>& vec, const std::string separator);
+  MEDPARTITIONER_EXPORT std::string ReprMapOfStringInt(const std::map<std::string,int>& mymap);
+  MEDPARTITIONER_EXPORT std::string ReprMapOfStringVectorOfString(const std::map< std::string,std::vector<std::string> >& mymap);
+  MEDPARTITIONER_EXPORT std::string ReprFieldDescriptions(const std::vector<std::string>& vec,const  std::string separator);
   
-  std::string SerializeFromString(const std::string& s);
-  std::string SerializeFromVectorOfString(const std::vector<std::string>& vec);
-  std::vector<std::string> DeserializeToVectorOfString(const std::string& str);
-  std::string EraseTagSerialized(const std::string& fromStr, const std::string& tag);
+  MEDPARTITIONER_EXPORT std::string SerializeFromString(const std::string& s);
+  MEDPARTITIONER_EXPORT std::string SerializeFromVectorOfString(const std::vector<std::string>& vec);
+  MEDPARTITIONER_EXPORT std::vector<std::string> DeserializeToVectorOfString(const std::string& str);
+  MEDPARTITIONER_EXPORT std::string EraseTagSerialized(const std::string& fromStr, const std::string& tag);
   
-  std::vector<std::string> VectorizeFromMapOfStringInt(const std::map<std::string,int>& mymap);
-  std::map<std::string,int> DevectorizeToMapOfStringInt(const std::vector<std::string>& vec);
+  MEDPARTITIONER_EXPORT std::vector<std::string> VectorizeFromMapOfStringInt(const std::map<std::string,int>& mymap);
+  MEDPARTITIONER_EXPORT std::map<std::string,int> DevectorizeToMapOfStringInt(const std::vector<std::string>& vec);
   
-  std::vector<std::string> VectorizeFromMapOfStringVectorOfString(const std::map< std::string,std::vector<std::string> >& mymap);
-  std::map< std::string,std::vector<std::string> > DevectorizeToMapOfStringVectorOfString(const std::vector<std::string>& vec);
+  MEDPARTITIONER_EXPORT std::vector<std::string> VectorizeFromMapOfStringVectorOfString(const std::map< std::string,std::vector<std::string> >& mymap);
+  MEDPARTITIONER_EXPORT std::map< std::string,std::vector<std::string> > DevectorizeToMapOfStringVectorOfString(const std::vector<std::string>& vec);
   
-  std::vector<std::string> SelectTagsInVectorOfString(const std::vector<std::string>& vec, const std::string tag);
-  std::vector<std::string> DeleteDuplicatesInVectorOfString(const std::vector<std::string>& vec);
-  std::map< std::string,std::vector<std::string> > DeleteDuplicatesInMapOfStringVectorOfString(const std::map< std::string,std::vector<std::string> >& mymap);
+  MEDPARTITIONER_EXPORT std::vector<std::string> SelectTagsInVectorOfString(const std::vector<std::string>& vec, const std::string tag);
+  MEDPARTITIONER_EXPORT std::vector<std::string> DeleteDuplicatesInVectorOfString(const std::vector<std::string>& vec);
+  MEDPARTITIONER_EXPORT std::map< std::string,std::vector<std::string> > DeleteDuplicatesInMapOfStringVectorOfString(const std::map< std::string,std::vector<std::string> >& mymap);
   
-  std::string Cle1ToStr(const std::string& s, const int inew);
-  void Cle1ToData(const std::string& cle, std::string& s, int& inew);
+  MEDPARTITIONER_EXPORT std::string Cle1ToStr(const std::string& s, const int inew);
+  MEDPARTITIONER_EXPORT void Cle1ToData(const std::string& cle, std::string& s, int& inew);
   
-  std::string Cle2ToStr(const std::string& s,const int inew,const int iold);
-  void Cle2ToData(const std::string& cle, std::string& s, int& inew, int& iold);
+  MEDPARTITIONER_EXPORT std::string Cle2ToStr(const std::string& s,const int inew,const int iold);
+  MEDPARTITIONER_EXPORT void Cle2ToData(const std::string& cle, std::string& s, int& inew, int& iold);
   
-  std::string ExtractFromDescription(const std::string& description,const  std::string& tag);
-  void FieldDescriptionToData(const std::string& description,
+  MEDPARTITIONER_EXPORT std::string ExtractFromDescription(const std::string& description,const  std::string& tag);
+  MEDPARTITIONER_EXPORT void FieldDescriptionToData(const std::string& description,
                               int& idomain, std::string& fileName, std::string& meshName, std::string& fieldName,
                               int& typeField, int& DT, int& IT);
-  void FieldShortDescriptionToData(const std::string& description,
+  MEDPARTITIONER_EXPORT void FieldShortDescriptionToData(const std::string& description,
                                    std::string& fieldName, int& typeField, int& entity, int& DT, int& IT);
   
   ParaMEDMEM::DataArrayInt *CreateDataArrayIntFromVector(const std::vector<int>& v);
@@ -90,8 +92,8 @@ namespace MEDPARTITIONER
   //void SendVectorOfString(const std::vector<std::string>& vec, const int target);
   //std::vector<std::string> RecvVectorOfString(const int source);
   //TODO void sendRecvVectorOfString(const std::vector<std::string>& vec, const int source, const int target);
-  std::vector<std::string> SendAndReceiveVectorOfString(const std::vector<std::string>& vec, const int source, const int target);
-  std::vector<std::string> AllgathervVectorOfString(const std::vector<std::string>& vec);
+  MEDPARTITIONER_EXPORT std::vector<std::string> SendAndReceiveVectorOfString(const std::vector<std::string>& vec, const int source, const int target);
+  MEDPARTITIONER_EXPORT std::vector<std::string> AllgathervVectorOfString(const std::vector<std::string>& vec);
   
   void SendDoubleVec(const std::vector<double>& vec, const int target);
   std::vector<double> *RecvDoubleVec(const int source);
@@ -115,7 +117,7 @@ namespace MEDPARTITIONER
   void TestPersistantMpiRingOnCommSplit(int taille, int nb);
 #endif
 
-  class MyGlobals
+  class MEDPARTITIONER_EXPORT MyGlobals
   {
   public :
     static int _Verbose;  //0 to 1000 over 200 is debug

diff --git a/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx b/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx
index e54c264398be8cd8351ec5b2af387709466a6b06..25f63b6528fa76d1e1f6c9b2c50599b026c36bda 100644 (file)
--- a/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx
+++ b/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx
@@ -703,7 +703,7 @@ void MEDPARTITIONERTest::verifyTestMeshWithVecFieldOnNodes()
     {
       cout<<"\n types in "<<name<<" : ";
       //for (std::set<INTERP_KERNEL::NormalizedCellType>::iterator t=types.begin(); t!=types.end(); ++t) cout<<" "<<*t;
-      for (std::set<INTERP_KERNEL::NormalizedCellType>::iterator t=types.begin(); t!=types.end(); ++t) 
+      for (std::set<INTERP_KERNEL::NormalizedCellType>::const_iterator t=types.begin(); t!=types.end(); ++t) 
         {
           //INTERP_KERNEL::CellModel essai=INTERP_KERNEL::CellModel::GetCellModel(*t);
           cout<<" "<<(INTERP_KERNEL::CellModel::GetCellModel(*t)).getRepr();

diff --git a/src/MEDPartitioner/Test/Makefile.am b/src/MEDPartitioner/Test/Makefile.am
index 9d29372ed068061dbc77e90d4b251ab2d4541baf..02227ea9573154fa3cc614218796f223199a70bb 100644 (file)
--- a/src/MEDPartitioner/Test/Makefile.am
+++ b/src/MEDPartitioner/Test/Makefile.am
@@ -50,7 +50,9 @@ libMEDPARTITIONERTest_la_LDFLAGS = \
        $(MED3_LIBS_C_ONLY) \
        $(HDF5_LIBS) \
        $(MPI_LIBS) \
-       @CPPUNIT_LIBS@
+       @CPPUNIT_LIBS@ \
+       ../../MEDLoader/libmedloader.la \
+       ../libmedpartitioner.la 
 
 # Executables targets
 
@@ -59,7 +61,8 @@ UNIT_TEST_PROG =
 
 bin_PROGRAMS = TestMEDPARTITIONER
 TestMEDPARTITIONER_SOURCES = TestMEDPARTITIONER.cxx
-TestMEDPARTITIONER_CPPFLAGS = $(libMEDPARTITIONERTest_la_CPPFLAGS) 
+TestMEDPARTITIONER_CPPFLAGS = $(libMEDPARTITIONERTest_la_CPPFLAGS) \
+       -I$(srcdir)/../../INTERP_KERNELTest
 
 if MPI_IS_OK
   TestMEDPARTITIONER_CPPFLAGS +=