Fix compilation on Windows with VS 2017 after implementation 64 bit ids in MEDCOUPLING.

diff --git a/src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.cxx b/src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.cxx
index 891814ef03c25ba0ecadc3d5bc3e101e07a9f679..5a044ad97ec078dbc163953b766051b574aedf64 100644 (file)
--- a/src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.cxx
+++ b/src/Plugins/MEDReader/IO/MEDFileFieldRepresentationTree.cxx
@@ -48,6 +48,9 @@
 #include "vtkDoubleArray.h"
 #include "vtkIntArray.h"
 #include "vtkLongArray.h"
+#ifdef WIN32
+#include "vtkLongLongArray.h"
+#endif
 #include "vtkFloatArray.h"
 #include "vtkCellArray.h"
 #include "vtkPointData.h"
@@ -222,10 +225,18 @@ public:
 };
 
 template<>
+#ifdef WIN32
+class MEDFileVTKTraits<long long>
+#else
 class MEDFileVTKTraits<long>
+#endif
 {
 public:
+#ifdef WIN32
+  typedef vtkLongLongArray VtkType;
+#else
   typedef vtkLongArray VtkType;
+#endif
   typedef MEDCoupling::DataArrayInt64 MCType;
 };
 

diff --git a/src/Plugins/MEDReader/IO/vtkExtractGroup.cxx b/src/Plugins/MEDReader/IO/vtkExtractGroup.cxx
index 2b2af12ddb0ff9e046037d3303ae78451e783060..7bf32f5d25c9d72f04663a05efeeaf9b8647032f 100644 (file)
--- a/src/Plugins/MEDReader/IO/vtkExtractGroup.cxx
+++ b/src/Plugins/MEDReader/IO/vtkExtractGroup.cxx
@@ -27,6 +27,9 @@
 #include "vtkDataArrayTemplate.h"
 #include "vtkIntArray.h"
 #include "vtkLongArray.h"
+#ifdef WIN32
+#include "vtkLongLongArray.h"
+#endif
 #include "vtkCellData.h"
 #include "vtkPointData.h"
 

diff --git a/src/Plugins/MEDWriter/IO/VTKMEDTraits.hxx b/src/Plugins/MEDWriter/IO/VTKMEDTraits.hxx
index 08c534893076063e8ee7062d9656649eb77df0dd..4efcdc241a35cf56c5f21a48bac23f7660fb83fe 100644 (file)
--- a/src/Plugins/MEDWriter/IO/VTKMEDTraits.hxx
+++ b/src/Plugins/MEDWriter/IO/VTKMEDTraits.hxx
@@ -23,6 +23,9 @@
 
 class vtkIntArray;
 class vtkLongArray;
+#ifdef WIN32
+class vtkLongLongArray;
+#endif
 class vtkFloatArray;
 class vtkDoubleArray;
 
@@ -43,10 +46,19 @@ public:
 };
 
 template<>
+#ifdef WIN32
+class MEDFileVTKTraits<long long>
+#else 
 class MEDFileVTKTraits<long>
+#endif
+#
 {
 public:
+#ifdef WIN32
+  typedef vtkLongLongArray VtkType;
+#else
   typedef vtkLongArray VtkType;
+#endif
   typedef MEDCoupling::DataArrayInt64 MCType;
 };