From a7fb6a3aa39361d4773c6dc54e7c30683b322014 Mon Sep 17 00:00:00 2001 From: nds Date: Tue, 21 Mar 2017 12:06:06 +0300 Subject: [PATCH] #2027 Sketcher Trim Feature: correction of compilation on Linux --- src/SketchPlugin/SketchPlugin_Trim.cpp | 2 +- src/SketchPlugin/SketchPlugin_Trim.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) 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 SketchPlugin_Trim::getFeatureResult( //******************************************************************** void SketchPlugin_Trim::fillObjectShapes(const ObjectPtr& theObject, - ObjectPtr& theSketch, + const ObjectPtr& theSketch, std::map >& theCashedShapes, std::map& 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 > IdToPointPair; @@ -92,10 +93,10 @@ class SketchPlugin_Trim : public SketchPlugin_Feature, public GeomAPI_IPresentab std::pair >, std::list > > > PointToRefsMap; - static void fillObjectShapes(const ObjectPtr& theObject, - ObjectPtr& theSketch, - std::map >& theCashedShapes, - std::map& theObjectToPoints); + static void fillObjectShapes(const std::shared_ptr& theObject, + const std::shared_ptr& theSketch, + std::map, std::set >& theCashedShapes, + std::map, 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& theObject, std::map& theCoincidencesToBaseFeature); /// Move constraints from attribute of base feature to attribute after modification @@ -267,9 +268,8 @@ private: std::shared_ptr convertPoint(const std::shared_ptr& thePoint); private: - std::map > myCashedShapes; - - std::map myObjectToPoints; + std::map, std::set > myCashedShapes; + std::map, PointToRefsMap> myObjectToPoints; }; #endif -- 2.39.2