From: mpv <mpv@opencascade.com>
Date: Tue, 23 Oct 2018 13:24:56 +0000 (+0300)
Subject: Remove compilation errors and warnings
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5e44c0ce644daa3277f1d488ef436f747fd6d21c;p=modules%2Fshaper.git

Remove compilation errors and warnings
---

diff --git a/src/Model/Model_AttributeSelection.cpp b/src/Model/Model_AttributeSelection.cpp
index cb17f802e..d30830cc0 100644
--- a/src/Model/Model_AttributeSelection.cpp
+++ b/src/Model/Model_AttributeSelection.cpp
@@ -706,7 +706,7 @@ void Model_AttributeSelection::selectBody(
     TopoDS_Shape aNewSub = theSubShape->impl<TopoDS_Shape>();
     FeaturePtr aFeatureOwner = std::dynamic_pointer_cast<ModelAPI_Feature>(owner());
     if (aFeatureOwner->document() != theContext->document()) { // reference to the sketch face
-      if (theSubShape->shapeType() == TopAbs_FACE) { // sketch face
+      if (theSubShape->shapeType() == GeomAPI_Shape::FACE) { // sketch face
         ResultConstructionPtr aConstr =
           std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(theContext);
         int aFaceIndex = -1, aFacesNum = aConstr->facesNum();
@@ -720,9 +720,9 @@ void Model_AttributeSelection::selectBody(
           TDataStd_Integer::Set(aSelLab, kEXT_SKETCH_FACE, aFaceIndex); // store index of the face
           return;
         }
-      } else if (theSubShape->shapeType() == TopAbs_EDGE ||  // sketch result edge (full one)
-                 theSubShape->shapeType() == TopAbs_VERTEX) { // or start/end vertex
-        bool isVertex = theSubShape->shapeType() == TopAbs_VERTEX;
+      } else if (theSubShape->shapeType() == GeomAPI_Shape::EDGE ||// sketch result edge (full one)
+                 theSubShape->shapeType() == GeomAPI_Shape::VERTEX) { // or start/end vertex
+        bool isVertex = theSubShape->shapeType() == GeomAPI_Shape::VERTEX;
         CompositeFeaturePtr aComposite = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(
           theContext->document()->feature(theContext));
         if (aComposite.get()) { // iterate edges of composite to find index of matched with value
diff --git a/src/Model/Model_BodyBuilder.cpp b/src/Model/Model_BodyBuilder.cpp
index ae6f60d88..d4e81b0eb 100755
--- a/src/Model/Model_BodyBuilder.cpp
+++ b/src/Model/Model_BodyBuilder.cpp
@@ -134,7 +134,7 @@ void Model_BodyBuilder::store(const GeomShapePtr& theShape,
 {
   std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>(data());
   if (aData) {
-    TDF_Label& aShapeLab = aData->shapeLab();
+    TDF_Label aShapeLab = aData->shapeLab();
     // clean builders
     clean();
     // store the new shape as primitive
@@ -178,7 +178,7 @@ void Model_BodyBuilder::storeGenerated(const GeomShapePtr& theFromShape,
 {
   std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>(data());
   if (aData) {
-    TDF_Label& aShapeLab = aData->shapeLab();
+    TDF_Label aShapeLab = aData->shapeLab();
     // clean builders
     clean();
     // store the new shape as primitive
@@ -969,7 +969,7 @@ bool Model_BodyBuilder::isLatestEqual(const GeomShapePtr& theShape)
     TopoDS_Shape aShape = theShape->impl<TopoDS_Shape>();
     std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>(data());
     if (aData) {
-      TDF_Label& aShapeLab = aData->shapeLab();
+      TDF_Label aShapeLab = aData->shapeLab();
       Handle(TNaming_NamedShape) aName;
       if (aShapeLab.FindAttribute(TNaming_NamedShape::GetID(), aName)) {
         TopoDS_Shape aLatest = TNaming_Tool::CurrentShape(aName);