From: sbh Date: Fri, 16 Jan 2015 07:02:11 +0000 (+0300) Subject: Reanud's patch for modern Cpp11 compilers applied X-Git-Tag: V_1.0.0~35^2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b90fb4d28f6166894b6960e47bbee8edbdd2570a;p=modules%2Fshaper.git Reanud's patch for modern Cpp11 compilers applied --- diff --git a/src/SketchPlugin/SketchPlugin_Arc.cpp b/src/SketchPlugin/SketchPlugin_Arc.cpp index 3acdb0e31..deb2b2fae 100644 --- a/src/SketchPlugin/SketchPlugin_Arc.cpp +++ b/src/SketchPlugin/SketchPlugin_Arc.cpp @@ -188,7 +188,7 @@ double SketchPlugin_Arc::distanceToPoint(const std::shared_ptr& t } bool SketchPlugin_Arc::isFixed() { - return data()->selection(EXTERNAL_ID())->context(); + return data()->selection(EXTERNAL_ID())->context().get(); } bool SketchPlugin_Arc::isFeatureValid() diff --git a/src/SketchPlugin/SketchPlugin_Circle.cpp b/src/SketchPlugin/SketchPlugin_Circle.cpp index 5fde3dfbe..e880df9af 100644 --- a/src/SketchPlugin/SketchPlugin_Circle.cpp +++ b/src/SketchPlugin/SketchPlugin_Circle.cpp @@ -99,7 +99,7 @@ double SketchPlugin_Circle::distanceToPoint(const std::shared_ptr } bool SketchPlugin_Circle::isFixed() { - return data()->selection(EXTERNAL_ID())->context(); + return data()->selection(EXTERNAL_ID())->context().get(); } void SketchPlugin_Circle::attributeChanged(const std::string& theID) { diff --git a/src/SketchPlugin/SketchPlugin_Feature.h b/src/SketchPlugin/SketchPlugin_Feature.h index ca61e4b97..b862bb004 100644 --- a/src/SketchPlugin/SketchPlugin_Feature.h +++ b/src/SketchPlugin/SketchPlugin_Feature.h @@ -59,7 +59,7 @@ class SketchPlugin_Feature : public ModelAPI_Feature, public GeomAPI_ICustomPrs { AttributeSelectionPtr aAttr = data()->selection(EXTERNAL_ID()); if (aAttr) - return aAttr->context(); + return aAttr->context().get(); return false; } diff --git a/src/SketchPlugin/SketchPlugin_Line.cpp b/src/SketchPlugin/SketchPlugin_Line.cpp index 50d8f438f..429f7e132 100644 --- a/src/SketchPlugin/SketchPlugin_Line.cpp +++ b/src/SketchPlugin/SketchPlugin_Line.cpp @@ -98,7 +98,7 @@ double SketchPlugin_Line::distanceToPoint(const std::shared_ptr& } bool SketchPlugin_Line::isFixed() { - return data()->selection(EXTERNAL_ID())->context(); + return data()->selection(EXTERNAL_ID())->context().get(); } void SketchPlugin_Line::attributeChanged(const std::string& theID) { diff --git a/src/SketchPlugin/SketchPlugin_Point.cpp b/src/SketchPlugin/SketchPlugin_Point.cpp index 97c74f476..3fd71b560 100644 --- a/src/SketchPlugin/SketchPlugin_Point.cpp +++ b/src/SketchPlugin/SketchPlugin_Point.cpp @@ -70,7 +70,7 @@ double SketchPlugin_Point::distanceToPoint(const std::shared_ptr& } bool SketchPlugin_Point::isFixed() { - return data()->selection(EXTERNAL_ID())->context(); + return data()->selection(EXTERNAL_ID())->context().get(); } void SketchPlugin_Point::attributeChanged(const std::string& theID) {