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

[modules/shaper.git] / src / Model / Model_ResultField.cpp

diff --git a/src/Model/Model_ResultField.cpp b/src/Model/Model_ResultField.cpp
index fad43f23db38335a27f20e85256368494cfa89c9..8ec0fc33becd0cc51b58aec6188d4f4aaf2089b7 100644 (file)
--- a/src/Model/Model_ResultField.cpp
+++ b/src/Model/Model_ResultField.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
@@ -107,14 +107,14 @@ void Model_ResultField::updateSteps()
 {
   // Update Array of steps
   int aNbSteps = stepsSize();
-  if (mySteps.size() != aNbSteps) {
-    while(mySteps.size() > aNbSteps) {
+  if ((int)mySteps.size() != aNbSteps) {
+    while((int)mySteps.size() > aNbSteps) {
       //delete mySteps.back();
       mySteps.pop_back();
     }
-    while(mySteps.size() < aNbSteps) {
+    while((int)mySteps.size() < aNbSteps) {
       mySteps.push_back(FieldStepPtr(new Model_ResultField::Model_FieldStep(this,
-        int(mySteps.size()))));
+        (int)mySteps.size())));
     }
   }
 }
@@ -149,7 +149,7 @@ std::string Model_ResultField::textLine(int theLine) const
 // LCOV_EXCL_START
 std::shared_ptr<ModelAPI_ResultField::ModelAPI_FieldStep> Model_ResultField::step(int theId) const
 {
-  if (theId < mySteps.size()) {
+  if (theId < (int)mySteps.size()) {
     return mySteps[theId];
   }
   return NULL;