X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FGeomAPI_Shape.h;h=55db3759aec02a5e3cc56653910723489a845365;hb=d9db5498b576854aae37ddf8c0bb6fceb264712e;hp=b557e845ed47cb50052b6d8d43923969ef0a90cc;hpb=3244e0f3d7e585ccfc3c37c56fbf5d6826055448;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/GeomAPI_Shape.h b/src/GeomAPI/GeomAPI_Shape.h
index b557e845e..55db3759a 100644
--- a/src/GeomAPI/GeomAPI_Shape.h
+++ b/src/GeomAPI/GeomAPI_Shape.h
@@ -2,33 +2,41 @@
 // Created:     23 Apr 2014
 // Author:      Mikhail PONIKAROV
 
-#ifndef GeomAPI_Shape_HeaderFile
-#define GeomAPI_Shape_HeaderFile
+#ifndef GeomAPI_Shape_H_
+#define GeomAPI_Shape_H_
 
 #include <GeomAPI_Interface.h>
+#include <boost/shared_ptr.hpp>
+#include <list>
 
 /**\class GeomAPI_Shape
  * \ingroup DataModel
  * \brief Interface to the topological shape object
  */
-class TopoDS_Shape;
-
-#define MY_SHAPE static_cast<TopoDS_Shape*>(myImpl)
-
-class GEOMAPI_EXPORT GeomAPI_Shape: public GeomAPI_Interface
+class GEOMAPI_EXPORT GeomAPI_Shape : public GeomAPI_Interface
 {
-public:
+ public:
   /// Creation of empty (null) shape
   GeomAPI_Shape();
 
-  bool isNull();
+  bool isNull() const;
+
+  /// Returns whether the shapes are equal
+  virtual bool isEqual(const boost::shared_ptr<GeomAPI_Shape> theShape) const;
 
   /// Returns whether the shape is a vertex
   virtual bool isVertex() const;
 
   /// Returns whether the shape is an edge
   virtual bool isEdge() const;
+
 };
 
-#endif
+<<<<<<< HEAD
+typedef std::list<boost::shared_ptr<GeomAPI_Shape>> ListOfShape;
+=======
+//! Pointer on attribute object
+typedef boost::shared_ptr<GeomAPI_Shape> GeomShapePtr;
 
+>>>>>>> 01cda8378dd1cff425f88438e8c0085122ed7495
+#endif