Fix of crash on undo/redo/undo of extrusion: the comment of sketch result was erased...

[modules/shaper.git] / src / GeomAlgoAPI / GeomAlgoAPI_Boolean.h

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h b/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
index a46ab91a969f902f170e9e6821d1f6e13b7a89ce..ac7b267d0eb4f4c0aba8c772c45b7b5c63d32799 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
@@ -1,3 +1,5 @@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
 // File:        GeomAlgoAPI_Boolean.h
 // Created:     02 Sept 2014
 // Author:      Vitaly Smetannikov
@@ -9,7 +11,7 @@
 #include <GeomAPI_Shape.h>
 #include <GeomAlgoAPI_MakeShape.h>
 #include <GeomAPI_DataMapOfShapeShape.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
 
 /**\class GeomAlgoAPI_Boolean
  * \ingroup DataAlgo
@@ -23,18 +25,18 @@ class GeomAlgoAPI_Boolean : public GeomAPI_Interface
    * \param[in] theTool  toole shape for boolean
    * \return a solid as result of operation
    */
-  GEOMALGOAPI_EXPORT static boost::shared_ptr<GeomAPI_Shape> makeCut(
-                                                 boost::shared_ptr<GeomAPI_Shape> theShape,
-                                              boost::shared_ptr<GeomAPI_Shape> theTool);
+  GEOMALGOAPI_EXPORT static std::shared_ptr<GeomAPI_Shape> makeCut(
+                                                 std::shared_ptr<GeomAPI_Shape> theShape,
+                                              std::shared_ptr<GeomAPI_Shape> theTool);
 
   /* \brief Creates fuse boolean operation
    * \param[in] theShape the main shape
    * \param[in] theTool  second shape
    * \return a solid as result of operation
    */
-  GEOMALGOAPI_EXPORT static boost::shared_ptr<GeomAPI_Shape> makeFuse(
-                                                 boost::shared_ptr<GeomAPI_Shape> theShape,
-                                              boost::shared_ptr<GeomAPI_Shape> theTool);
+  GEOMALGOAPI_EXPORT static std::shared_ptr<GeomAPI_Shape> makeFuse(
+                                                 std::shared_ptr<GeomAPI_Shape> theShape,
+                                              std::shared_ptr<GeomAPI_Shape> theTool);
 
   /* \brief Creates common boolean operation
    * \param[in] theObject the main shape
@@ -42,9 +44,9 @@ class GeomAlgoAPI_Boolean : public GeomAPI_Interface
    * \param[in] theType  type of the operation: Fuse, Cut, Common
    * \return a solid as result of operation
    */
-  GEOMALGOAPI_EXPORT static boost::shared_ptr<GeomAPI_Shape> makeCommon(
-                                                 boost::shared_ptr<GeomAPI_Shape> theObject,
-                                              boost::shared_ptr<GeomAPI_Shape> theTool);
+  GEOMALGOAPI_EXPORT static std::shared_ptr<GeomAPI_Shape> makeCommon(
+                                                 std::shared_ptr<GeomAPI_Shape> theObject,
+                                              std::shared_ptr<GeomAPI_Shape> theTool);
 
    enum {
        BOOL_CUT,
@@ -52,8 +54,8 @@ class GeomAlgoAPI_Boolean : public GeomAPI_Interface
     BOOL_COMMON
   };
   /// Constructor
-  GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean (boost::shared_ptr<GeomAPI_Shape> theObject,
-                                          boost::shared_ptr<GeomAPI_Shape> theTool,
+  GEOMALGOAPI_EXPORT GeomAlgoAPI_Boolean (std::shared_ptr<GeomAPI_Shape> theObject,
+                                          std::shared_ptr<GeomAPI_Shape> theTool,
                                                                                  int theType);
 
   /// Returns True if algorithm succeed
@@ -63,7 +65,7 @@ class GeomAlgoAPI_Boolean : public GeomAPI_Interface
   GEOMALGOAPI_EXPORT const bool isValid() const;
 
   /// Returns result of the boolean algorithm which may be a Solid or a Face
-  GEOMALGOAPI_EXPORT const boost::shared_ptr<GeomAPI_Shape>& shape () const; 
+  GEOMALGOAPI_EXPORT const std::shared_ptr<GeomAPI_Shape>& shape () const; 
  
   /// Returns map of sub-shapes of the result. To be used for History keeping
   GEOMALGOAPI_EXPORT void  mapOfShapes (GeomAPI_DataMapOfShapeShape& theMap) const;
@@ -76,13 +78,13 @@ class GeomAlgoAPI_Boolean : public GeomAPI_Interface
 
   private:
   /// builds resulting shape
-  void build(boost::shared_ptr<GeomAPI_Shape> theObject,
-             boost::shared_ptr<GeomAPI_Shape> theTool);
+  void build(std::shared_ptr<GeomAPI_Shape> theObject,
+             std::shared_ptr<GeomAPI_Shape> theTool);
   /// fields
   double mySize;
   bool myDone;
   int  myOperation;
-  boost::shared_ptr<GeomAPI_Shape> myShape;  
+  std::shared_ptr<GeomAPI_Shape> myShape;  
   GeomAPI_DataMapOfShapeShape myMap;
   GeomAlgoAPI_MakeShape * myMkShape;
 };