From ef668f885e9234b154e36fdbdc26b7cb32d2c0d4 Mon Sep 17 00:00:00 2001 From: rnv Date: Sat, 20 Feb 2021 15:33:41 +0300 Subject: [PATCH] Compilation under Windows --- src/MEDLoader/MeshFormatReader.hxx | 13 ++++++------- src/MEDLoader/MeshFormatWriter.cxx | 3 ++- 2 files changed, 8 insertions(+), 8 deletions(-) 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 + +#ifndef WIN32 #include +#endif + namespace MEDCoupling { class DataArrayDouble; @@ -104,14 +108,9 @@ private: else { std::vector * tmpVec2 = aMap[removeFromFamily.first]; -#if __GNUC_PREREQ(4,9) - std::vector ::const_iterator itt2; -#else - std::vector ::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 -- 2.30.2