SALOME 9.1.0 Windows version

diff --git a/src/Plugins/MEDWriter/IO/VTKToMEDMem.hxx b/src/Plugins/MEDWriter/IO/VTKToMEDMem.hxx
index 5a0def7dc1aed38da5303a70e3725eef29afc47e..735b9f7ed9bef5ae38af5852eb92f0016a0e416b 100644 (file)
--- a/src/Plugins/MEDWriter/IO/VTKToMEDMem.hxx
+++ b/src/Plugins/MEDWriter/IO/VTKToMEDMem.hxx
@@ -21,6 +21,8 @@
 #ifndef __VTKTOMEDMEM_HXX__
 #define __VTKTOMEDMEM_HXX__
 
+#include "vtkSystemIncludes.h" //needed for exports
+
 #include "MEDFileMesh.hxx"
 #include "MEDFileField.hxx"
 #include "MEDFileData.hxx"
@@ -38,7 +40,7 @@
 
 class vtkDataSet;
 
-class MZCException : public std::exception
+class VTK_EXPORT MZCException : public std::exception
 {
 public:
   MZCException(const std::string& s):_reason(s) { }
@@ -50,7 +52,7 @@ private:
 
 namespace VTKToMEDMem
 {
-  class Grp
+  class VTK_EXPORT Grp
   {
   public:
     Grp(const std::string& name):_name(name) { }
@@ -62,7 +64,7 @@ namespace VTKToMEDMem
     std::vector<std::string> _fams;
   };
 
-  class Fam
+  class VTK_EXPORT Fam
   {
   public:
     Fam(const std::string& name);
@@ -76,11 +78,11 @@ namespace VTKToMEDMem
 
 class vtkDataObject;
 
-void WriteMEDFileFromVTKDataSet(MEDCoupling::MEDFileData *mfd, vtkDataSet *ds, const std::vector<int>& context, double timeStep, int tsId);
+void VTK_EXPORT WriteMEDFileFromVTKDataSet(MEDCoupling::MEDFileData *mfd, vtkDataSet *ds, const std::vector<int>& context, double timeStep, int tsId);
 
-void WriteMEDFileFromVTKGDS(MEDCoupling::MEDFileData *mfd, vtkDataObject *input, double timeStep, int tsId);
+void VTK_EXPORT WriteMEDFileFromVTKGDS(MEDCoupling::MEDFileData *mfd, vtkDataObject *input, double timeStep, int tsId);
   
-void PutFamGrpInfoIfAny(MEDCoupling::MEDFileData *mfd, const std::string& meshName, const std::vector<VTKToMEDMem::Grp>& groups, const std::vector<VTKToMEDMem::Fam>& fams);
+void VTK_EXPORT PutFamGrpInfoIfAny(MEDCoupling::MEDFileData *mfd, const std::string& meshName, const std::vector<VTKToMEDMem::Grp>& groups, const std::vector<VTKToMEDMem::Fam>& fams);
 
 #endif
 

diff --git a/src/Plugins/MEDWriter/IO/vtkMEDWriter.h b/src/Plugins/MEDWriter/IO/vtkMEDWriter.h
index 9f9432d4adbb1fef45bd6aa8fe7107d2db43ea2f..8cc663c207b65d1a2aa7eee66f9d2cb67a823f87 100644 (file)
--- a/src/Plugins/MEDWriter/IO/vtkMEDWriter.h
+++ b/src/Plugins/MEDWriter/IO/vtkMEDWriter.h
@@ -21,7 +21,6 @@
 #ifndef vtkMEDWriter_h__
 #define vtkMEDWriter_h__
 
-#include "vtkPVVTKExtensionsDefaultModule.h" //needed for exports
 #include "vtkDataObjectAlgorithm.h"
 
 class vtkMutableDirectedGraph;

diff --git a/src/Plugins/ParaMEDCorba/VTKMEDCouplingMultiFieldsClient.cxx b/src/Plugins/ParaMEDCorba/VTKMEDCouplingMultiFieldsClient.cxx
index d89f16eec892d7717f7861a3804661f88b93b1f9..485026cae07d530780f0733a56ecb831dfb445ae 100644 (file)
--- a/src/Plugins/ParaMEDCorba/VTKMEDCouplingMultiFieldsClient.cxx
+++ b/src/Plugins/ParaMEDCorba/VTKMEDCouplingMultiFieldsClient.cxx
@@ -18,6 +18,9 @@
 //
 
 // To access to vtkUnstructuredGrid::Faces and FaceLocations
+#ifdef WIN32
+#define _ALLOW_KEYWORD_MACROS
+#endif
 #define protected public
 
 #include "VTKMEDCouplingMultiFieldsClient.hxx"

diff --git a/src/Plugins/SimpleMode/IO/vtkSimpleMode.cxx b/src/Plugins/SimpleMode/IO/vtkSimpleMode.cxx
index d6bd567f134ad703eb005892abf141972dc6f81d..502ed67d0229625d604dbe07f5ba4113d4ba32dd 100644 (file)
--- a/src/Plugins/SimpleMode/IO/vtkSimpleMode.cxx
+++ b/src/Plugins/SimpleMode/IO/vtkSimpleMode.cxx
@@ -60,6 +60,7 @@
 #ifdef WIN32
 #define _USE_MATH_DEFINES
 #include <math.h>
+#include <functional>
 #endif
 
 #include <map>