Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for issue #1000
[modules/shaper.git]
/
src
/
GeomAPI
/
GeomAPI_DataMapOfShapeShape.h
diff --git
a/src/GeomAPI/GeomAPI_DataMapOfShapeShape.h
b/src/GeomAPI/GeomAPI_DataMapOfShapeShape.h
index cbc5f113c52947c28e6a74b6ce06c5ef2dc8fa58..42c8a86d1329e631ef4c4cb3a595d34545a2dc62 100644
(file)
--- a/
src/GeomAPI/GeomAPI_DataMapOfShapeShape.h
+++ b/
src/GeomAPI/GeomAPI_DataMapOfShapeShape.h
@@
-36,6
+36,12
@@
class GeomAPI_DataMapOfShapeShape : public GeomAPI_Interface
GEOMAPI_EXPORT
bool bind (std::shared_ptr<GeomAPI_Shape> theKey, std::shared_ptr<GeomAPI_Shape> theItem);
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 true if theKey is stored in the map.
GEOMAPI_EXPORT
bool isBound (std::shared_ptr<GeomAPI_Shape> theKey);