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

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

diff --git a/src/Model/Model_ResultConstruction.cpp b/src/Model/Model_ResultConstruction.cpp
index 18acf89ee278d0a96979348288c65492d8d5d965..e6a88069b47ed45de44474826caa59e36953ab07 100644 (file)
--- a/src/Model/Model_ResultConstruction.cpp
+++ b/src/Model/Model_ResultConstruction.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
@@ -133,7 +133,7 @@ static std::wstring shortName(
   // they are used as markers of start/end/forward/reversed indicators
   static const std::wstring aSyms(L"sefr");
   std::wstring::iterator aSuffix = aName.end() - 1;
-  while(aSyms.find(*aSuffix) != std::string::npos) {
+  while(aSyms.find(*aSuffix) != std::wstring::npos) {
     --aSuffix;
   }
   aName.erase(aSuffix + 1, aName.end());
@@ -222,7 +222,7 @@ void Model_ResultConstruction::setInfinite(const bool theInfinite)
   }
 }
 
-int Model_ResultConstruction::facesNum(const bool theUpdateNaming)
+int Model_ResultConstruction::facesNum(const bool /*theUpdateNaming*/)
 {
   int aResult = 0;
   std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>(data());
@@ -294,8 +294,8 @@ void Model_ResultConstruction::storeShape(std::shared_ptr<GeomAPI_Shape> theShap
       TopExp_Explorer anExp(aShape, TopAbs_VERTEX);
       for(int anIndex = 1; anExp.More(); anExp.Next(), anIndex++) {
         TDF_Label aSubLab = aShapeLab.FindChild(anIndex);
-        TNaming_Builder aBuilder(aSubLab);
-        aBuilder.Generated(anExp.Current());
+        TNaming_Builder aSubBuilder(aSubLab);
+        aSubBuilder.Generated(anExp.Current());
         std::wstring aVertexName = aMyName + L"_" +
           (anIndex == 1 ? L"StartVertex" : L"EndVertex");
         TDataStd_Name::Set(aSubLab, aVertexName.c_str());
@@ -441,7 +441,6 @@ void storeFacesOnLabel(std::shared_ptr<Model_Document>& theDocument,
   aBuilder.Generated(theShape);
   theDocument->addNamingName(theShapeLabel, theName);
   // set new faces to the labels
-  int aCurrentTag = 1;
   NCollection_List<TopoDS_Face>::Iterator anUnordered(theUnorderedFaces);
   for (int aCurrentTag = 1; !theFacesOrder.IsEmpty() || anUnordered.More(); aCurrentTag++) {
     TopoDS_Face aFaceToPut;