From: rnv <rnv@opencascade.com>
Date: Sat, 20 Feb 2021 12:33:41 +0000 (+0300)
Subject: Compilation under Windows
X-Git-Tag: V9_7_0a1~23^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ef668f885e9234b154e36fdbdc26b7cb32d2c0d4;p=tools%2Fmedcoupling.git

Compilation under Windows
---

diff --git a/src/MEDLoader/MeshFormatReader.hxx b/src/MEDLoader/MeshFormatReader.hxx
index 15e383653..edba165d6 100644
--- a/src/MEDLoader/MeshFormatReader.hxx
+++ b/src/MEDLoader/MeshFormatReader.hxx
@@ -34,7 +34,11 @@
 #include "libmesh5.hxx"
 
 #include <fstream>
+
+#ifndef WIN32
 #include <features.h>
+#endif
+
 namespace MEDCoupling
 {
 class DataArrayDouble;
@@ -104,14 +108,9 @@ private:
         else
         {
             std::vector <MeshFormatElement>* tmpVec2 = aMap[removeFromFamily.first];
-#if __GNUC_PREREQ(4,9)
-            std::vector <MeshFormatElement>::const_iterator itt2;
-#else
-            std::vector <MeshFormatElement>::iterator itt2;
-#endif
             const MeshFormatElement e = removeFromFamily.second;
-            itt2 = std::find(tmpVec2->begin(), tmpVec2->end(), e);
-            if (itt2 != tmpVec2->end())
+            auto itt2 = std::find(tmpVec2->cbegin(), tmpVec2->cend(), e);
+            if (itt2 != tmpVec2->cend())
                 tmpVec2->erase(itt2);
 
             if (!tmpVec2->size())
diff --git a/src/MEDLoader/MeshFormatWriter.cxx b/src/MEDLoader/MeshFormatWriter.cxx
index 346e4e106..942fdc564 100644
--- a/src/MEDLoader/MeshFormatWriter.cxx
+++ b/src/MEDLoader/MeshFormatWriter.cxx
@@ -405,7 +405,7 @@ MeshFormat::Status MeshFormatWriter::setFieldOnNodes(MEDCoupling::MEDFileFieldMu
     }
     delete [] valTab0;
 
-
+    return MeshFormat::Status::DRS_OK;
 
 }
 
@@ -476,6 +476,7 @@ MeshFormat::Status MeshFormatWriter::setFieldOnCells(MEDCoupling::MEDFileFieldMu
     delete [] cellToNodeFldb;
     delete [] fldb;
 
+    return MeshFormat::Status::DRS_OK;
 }
  /*\
  |*| extract the upper triangular matrix  of fullTensor