Merge branch 'jfa/26449_1'

[modules/shaper.git] / src / Config / Config_Common.cpp

diff --git a/src/Config/Config_Common.cpp b/src/Config/Config_Common.cpp
index efa0efeb99726fb408231d61b24ac289953f1c37..3f8bac413d0624c142994c453a7c5d697b010e26 100644 (file)
--- a/src/Config/Config_Common.cpp
+++ b/src/Config/Config_Common.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2020  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2021  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -208,7 +208,7 @@ bool getParametersInfo(xmlNodePtr theNode, std::string& outPropertyId,
     std::stringstream aPropStringStream(aPropString);
     char COMMA_DELIM = ',';
     std::string aParameter;
-    while (std::getline(aPropStringStream, aParameter, ',')) {
+    while (std::getline(aPropStringStream, aParameter, COMMA_DELIM)) {
       outValidatorParameters.push_back(aParameter);
     }
   }
@@ -285,6 +285,7 @@ bool getBooleanAttribute(xmlNodePtr theNode, const char* theAttributeName, bool
 CONFIG_EXPORT std::string normalize(const std::string& theString)
 {
   std::string result = theString;
-  std::transform(result.begin(), result.end(), result.begin(), ::tolower);
+  std::transform(result.begin(), result.end(), result.begin(),
+                 [](char c) { return static_cast<char>(::tolower(c)); });
   return result;
 }