X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomAPI%2FGeomAPI_DataMapOfShapeShape.h;h=42c8a86d1329e631ef4c4cb3a595d34545a2dc62;hb=3d28bcbab2f3ed0e40295e64f4e836caebc19fca;hp=24d3db14ed4562770f69ef54a0cd510683c1826a;hpb=88ca95388a92f9bbe96d81bf5b1456ca1179100e;p=modules%2Fshaper.git

diff --git a/src/GeomAPI/GeomAPI_DataMapOfShapeShape.h b/src/GeomAPI/GeomAPI_DataMapOfShapeShape.h
index 24d3db14e..42c8a86d1 100644
--- a/src/GeomAPI/GeomAPI_DataMapOfShapeShape.h
+++ b/src/GeomAPI/GeomAPI_DataMapOfShapeShape.h
@@ -17,31 +17,45 @@ class GeomAPI_Dir;
  * \ingroup DataModel
  * \brief DataMap of Shape - Shape defined by TopoDS_Shapes
  */
-class GEOMAPI_EXPORT GeomAPI_DataMapOfShapeShape : public GeomAPI_Interface
+class GeomAPI_DataMapOfShapeShape : public GeomAPI_Interface
 {
  public:
   /// Creation of plane by the point and normal
+  GEOMAPI_EXPORT 
   GeomAPI_DataMapOfShapeShape();
 
   /// Clear 
+  GEOMAPI_EXPORT 
   void clear();
 
   /// Size of the map
+  GEOMAPI_EXPORT 
   int size();
 
   /// Adds \a theKey to me with \a theItem. Returns True if the Key  was not already in the map
+  GEOMAPI_EXPORT 
   bool bind (std::shared_ptr<GeomAPI_Shape> theKey, std::shared_ptr<GeomAPI_Shape> theItem);
 
+  /// Merges two maps
+  GEOMAPI_EXPORT void merge(const GeomAPI_DataMapOfShapeShape& theDataMap);
+
+  /// Merges two maps
+  GEOMAPI_EXPORT void merge(const std::shared_ptr<GeomAPI_DataMapOfShapeShape> theDataMap);
+
   /// Returns true if theKey is stored  in the map.
+  GEOMAPI_EXPORT 
   bool isBound (std::shared_ptr<GeomAPI_Shape> theKey);
 
   /// Returns  the Item stored  with the Key in the Map.
+  GEOMAPI_EXPORT 
   const std::shared_ptr<GeomAPI_Shape> find(std::shared_ptr<GeomAPI_Shape> theKey);  
   
   /// Removes the Key from the  map. Returns true if the Key was in the Map
+  GEOMAPI_EXPORT 
   bool unBind(std::shared_ptr<GeomAPI_Shape> theKey);
 
   /// Destructor
+  GEOMAPI_EXPORT 
   ~GeomAPI_DataMapOfShapeShape();
 };