Merge remote-tracking branch 'remotes/origin/EDF_2020_Lot2'

[modules/shaper.git] / src / ExchangePlugin / ExchangePlugin_ImportPart.cpp

diff --git a/src/ExchangePlugin/ExchangePlugin_ImportPart.cpp b/src/ExchangePlugin/ExchangePlugin_ImportPart.cpp
index c0930ef872075a8d9eb9d319f0a25947d3c2a75b..ae74d6b3007eac78e3e70d52ab9ddc07642c632f 100644 (file)
--- a/src/ExchangePlugin/ExchangePlugin_ImportPart.cpp
+++ b/src/ExchangePlugin/ExchangePlugin_ImportPart.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2020  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
@@ -108,7 +108,7 @@ void ExchangePlugin_ImportPart::attributeChanged(const std::string& theID)
           anAcceptedValues.push_back(Locale::Convert::toString((*aFIt)->name()));
       }
 
-      if (aPartsAttr->size() != anAcceptedValues.size())
+      if ((size_t)aPartsAttr->size() != anAcceptedValues.size())
         aTargetAttr->setValue(0);
 
       aPartsAttr->setSize((int)anAcceptedValues.size());
@@ -173,7 +173,7 @@ typedef std::map<std::string, std::map<std::wstring, std::set<int> > > ObjectNam
 bool splitName(std::wstring& theName, int& theIndex)
 {
   size_t aLastUndercore = theName.find_last_of('_');
-  bool isOk = aLastUndercore != std::string::npos;
+  bool isOk = aLastUndercore != std::wstring::npos;
   if (isOk) {
     size_t isNumber;
     std::wstring anIndexStr = theName.substr(aLastUndercore + 1);