From: nds <nds@opencascade.com>
Date: Tue, 21 Mar 2017 09:06:06 +0000 (+0300)
Subject: #2027 Sketcher Trim Feature: correction of compilation on Linux
X-Git-Tag: V_2.7.0~207
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a7fb6a3aa39361d4773c6dc54e7c30683b322014;p=modules%2Fshaper.git

#2027 Sketcher Trim Feature: correction of compilation on Linux
---

diff --git a/src/SketchPlugin/SketchPlugin_Trim.cpp b/src/SketchPlugin/SketchPlugin_Trim.cpp
index 6e2fab3ed..4ae706045 100644
--- a/src/SketchPlugin/SketchPlugin_Trim.cpp
+++ b/src/SketchPlugin/SketchPlugin_Trim.cpp
@@ -1055,7 +1055,7 @@ std::shared_ptr<ModelAPI_Result> SketchPlugin_Trim::getFeatureResult(
 
 //********************************************************************
 void SketchPlugin_Trim::fillObjectShapes(const ObjectPtr& theObject,
-                ObjectPtr& theSketch,
+                const ObjectPtr& theSketch,
                 std::map<ObjectPtr, std::set<GeomShapePtr> >& theCashedShapes,
                 std::map<ObjectPtr, PointToRefsMap>& theObjectToPoints)
 {
diff --git a/src/SketchPlugin/SketchPlugin_Trim.h b/src/SketchPlugin/SketchPlugin_Trim.h
index 6b95dd51b..db43d5fa6 100644
--- a/src/SketchPlugin/SketchPlugin_Trim.h
+++ b/src/SketchPlugin/SketchPlugin_Trim.h
@@ -14,6 +14,7 @@
 class GeomDataAPI_Point2D;
 class ModelAPI_Feature;
 class ModelAPI_Result;
+class ModelAPI_Object;
 
 typedef std::pair<std::string, std::shared_ptr<GeomDataAPI_Point2D> > IdToPointPair;
 
@@ -92,10 +93,10 @@ class SketchPlugin_Trim : public SketchPlugin_Feature, public GeomAPI_IPresentab
                    std::pair<std::list<std::shared_ptr<GeomDataAPI_Point2D> >,
                              std::list<std::shared_ptr<ModelAPI_Object> > > > PointToRefsMap;
 
-  static void fillObjectShapes(const ObjectPtr& theObject,
-                   ObjectPtr& theSketch,
-                   std::map<ObjectPtr, std::set<GeomShapePtr> >& theCashedShapes,
-                   std::map<ObjectPtr, PointToRefsMap>& theObjectToPoints);
+  static void fillObjectShapes(const std::shared_ptr<ModelAPI_Object>& theObject,
+    const std::shared_ptr<ModelAPI_Object>& theSketch,
+    std::map<std::shared_ptr<ModelAPI_Object>, std::set<GeomShapePtr> >& theCashedShapes,
+    std::map<std::shared_ptr<ModelAPI_Object>, PointToRefsMap>& theObjectToPoints);
 
 private:
   GeomShapePtr getSubShape(const std::string& theObjectAttributeId,
@@ -130,7 +131,7 @@ private:
   /// by the coincident attribute
   /// \param theObject an investigated object
   /// \param theCoincidencesToBaseFeature a container of list of referenced attributes
-  void getCoincidencesToObject(const ObjectPtr& theObject,
+  void getCoincidencesToObject(const std::shared_ptr<ModelAPI_Object>& theObject,
                                std::map<AttributePtr, FeaturePtr>& theCoincidencesToBaseFeature);
 
   /// Move constraints from attribute of base feature to attribute after modification
@@ -267,9 +268,8 @@ private:
   std::shared_ptr<GeomAPI_Pnt2d> convertPoint(const std::shared_ptr<GeomAPI_Pnt>& thePoint);
 
 private:
-  std::map<ObjectPtr, std::set<GeomShapePtr> > myCashedShapes;
-
-  std::map<ObjectPtr, PointToRefsMap> myObjectToPoints;
+  std::map<std::shared_ptr<ModelAPI_Object>, std::set<GeomShapePtr> > myCashedShapes;
+  std::map<std::shared_ptr<ModelAPI_Object>, PointToRefsMap> myObjectToPoints;
 };
 
 #endif