Merge branch 'master' of newgeom:newgeom

[modules/shaper.git] / src / GeomAPI / GeomAPI_Shape.h

diff --git a/src/GeomAPI/GeomAPI_Shape.h b/src/GeomAPI/GeomAPI_Shape.h
index 96db714562f42983e3730546629d62bb049c306e..55db3759aec02a5e3cc56653910723489a845365 100644 (file)
--- a/src/GeomAPI/GeomAPI_Shape.h
+++ b/src/GeomAPI/GeomAPI_Shape.h
@@ -7,6 +7,7 @@
 
 #include <GeomAPI_Interface.h>
 #include <boost/shared_ptr.hpp>
+#include <list>
 
 /**\class GeomAPI_Shape
  * \ingroup DataModel
@@ -31,7 +32,11 @@ class GEOMAPI_EXPORT GeomAPI_Shape : public GeomAPI_Interface
 
 };
 
+<<<<<<< HEAD
+typedef std::list<boost::shared_ptr<GeomAPI_Shape>> ListOfShape;
+=======
 //! Pointer on attribute object
 typedef boost::shared_ptr<GeomAPI_Shape> GeomShapePtr;
 
+>>>>>>> 01cda8378dd1cff425f88438e8c0085122ed7495
 #endif