X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDLoader%2FSauvReader.cxx;h=f2a64fffff631bf83bfb8ba4f378119f079f97da;hb=1b746b38f3cdeae6654a9501f37fde5e56e59288;hp=30a62fecbe913530f3a61ad35fe08233e0120b63;hpb=4e3de127a60f9ffb63abae1d17ed01f3f6711fd2;p=tools%2Fmedcoupling.git diff --git a/src/MEDLoader/SauvReader.cxx b/src/MEDLoader/SauvReader.cxx index 30a62fecb..f2a64ffff 100644 --- a/src/MEDLoader/SauvReader.cxx +++ b/src/MEDLoader/SauvReader.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2019 CEA/DEN, EDF R&D +// Copyright (C) 2007-2024 CEA, EDF // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -38,6 +38,24 @@ using namespace std; #define GIBI_EQUAL(var_str, stat_str) (strncmp (var_str, stat_str, strlen(stat_str)) == 0) +namespace +{ + class Localizer + { + std::string _locale; + public: + Localizer() + { + _locale = setlocale(LC_NUMERIC, NULL); + setlocale(LC_NUMERIC, "C"); + } + ~Localizer() + { + setlocale(LC_NUMERIC, _locale.c_str()); + } + }; +} + //================================================================================ /*! * \brief Creates a reader of a given sauve file @@ -114,6 +132,8 @@ std::string SauvReader::lineNb() const MEDCoupling::MEDFileData * SauvReader::loadInMEDFileDS() { + Localizer loc; // localization, to read numbers in "C" locale + SauvUtilities::IntermediateMED iMed; // intermadiate DS _iMed = &iMed; @@ -735,10 +755,10 @@ void SauvReader::setFieldSupport(const vector& supports, while ( isSwapped ) { isSwapped = false; - for ( size_t i = 1; i < groups.size(); ++i ) + for ( std::size_t i = 1; i < groups.size(); ++i ) { - int nbN1 = groups[i-1]->empty() ? 0 : groups[i-1]->_cells[0]->_nodes.size(); - int nbN2 = groups[i ]->empty() ? 0 : groups[i ]->_cells[0]->_nodes.size(); + std::size_t nbN1 = groups[i-1]->empty() ? 0 : groups[i-1]->_cells[0]->_nodes.size(); + std::size_t nbN2 = groups[i ]->empty() ? 0 : groups[i ]->_cells[0]->_nodes.size(); if ( nbN1 > nbN2 ) { isSwapped = isModified = true; @@ -1204,7 +1224,7 @@ void SauvReader::read_PILE_STRINGS (const int nbObjects, const int fixedLength = 71; while ((int)aWholeString.length() < stringLen) { - int remainLen = stringLen - aWholeString.length(); + int remainLen = (int)(stringLen - aWholeString.length()); int len; if ( remainLen > fixedLength ) { @@ -1226,7 +1246,7 @@ void SauvReader::read_PILE_STRINGS (const int nbObjects, while ((int)aWholeString.length() < stringLen) { getNextLine( line ); - int remainLen = stringLen - aWholeString.length(); + int remainLen = (int)(stringLen - aWholeString.length()); if ( remainLen > fixedLength ) { aWholeString += line + 1;