From 7fef2459b445a1a715c7c90d580c8f04738b138a Mon Sep 17 00:00:00 2001 From: rnv Date: Tue, 23 Feb 2021 17:25:18 +0300 Subject: [PATCH] Compilation under CentOS 6 and 7 --- src/MEDLoader/MeshFormatReader.hxx | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/MEDLoader/MeshFormatReader.hxx b/src/MEDLoader/MeshFormatReader.hxx index edba165d6..9f55a46bd 100644 --- a/src/MEDLoader/MeshFormatReader.hxx +++ b/src/MEDLoader/MeshFormatReader.hxx @@ -107,17 +107,22 @@ private: if (itTmp == aMap.end()) return; else { - std::vector * tmpVec2 = aMap[removeFromFamily.first]; - const MeshFormatElement e = removeFromFamily.second; - auto itt2 = std::find(tmpVec2->cbegin(), tmpVec2->cend(), e); - if (itt2 != tmpVec2->cend()) - tmpVec2->erase(itt2); - - if (!tmpVec2->size()) - { - delete tmpVec2; - aMap.erase(removeFromFamily.first); - } + 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()) + tmpVec2->erase(itt2); + + if (!tmpVec2->size()) + { + delete tmpVec2; + aMap.erase(removeFromFamily.first); + } } } public: -- 2.39.2