X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAlgoAPI%2FGeomAlgoAPI_Boolean.h;h=9ca251863ef5a812ecc7479b340f8b5820424b52;hb=refs%2Fheads%2FDev_1.0.1;hp=a46ab91a969f902f170e9e6821d1f6e13b7a89ce;hpb=7fbaddcd99f065a375775e2c3547ad93a5dd8c70;p=modules%2Fshaper.git

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h b/src/GeomAlgoAPI/GeomAlgoAPI_Boolean.h
index a46ab91a9..9ca251863 100644
--- 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
@@ -6,10 +8,13 @@
 #define GeomAlgoAPI_Boolean_H_
 
 #include <GeomAlgoAPI.h>
-#include <GeomAPI_Shape.h>
 #include <GeomAlgoAPI_MakeShape.h>
+
+#include <GeomAPI_Shape.h>
+#include <GeomAPI_Interface.h>
 #include <GeomAPI_DataMapOfShapeShape.h>
-#include <boost/shared_ptr.hpp>
+
+#include <memory>
 
 /**\class GeomAlgoAPI_Boolean
  * \ingroup DataAlgo
@@ -18,33 +23,32 @@
 class GeomAlgoAPI_Boolean : public GeomAPI_Interface
 {
  public:
-  /* \brief Creates cut boolean operation
+  /**\brief Creates cut boolean operation
    * \param[in] theShape the main shape
    * \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
+  /**\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
+  /**\brief Creates common boolean operation
    * \param[in] theObject the main shape
    * \param[in] theTool  second shape
-   * \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 +56,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 +67,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 +80,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;
 };