Fix for the bug IPAL22851: Sub-shapes spelling

[modules/geom.git] / src / GEOMAlgo / GEOMAlgo_DataMapOfOrientedShapeShape.hxx

diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape.hxx
index 6cbc3a56a98412ffd81c35de1d1a54f5725f9448..bb222b10d051ad41bd0d50369e1f7e4d1e747bf0 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape.hxx
@@ -15,7 +15,6 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #ifndef _GEOMAlgo_DataMapOfOrientedShapeShape_HeaderFile
 #define _GEOMAlgo_DataMapOfOrientedShapeShape_HeaderFile
@@ -32,6 +31,7 @@
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
 #endif
+
 class Standard_DomainError;
 class Standard_NoSuchObject;
 class TopoDS_Shape;
@@ -39,7 +39,6 @@ class TopTools_OrientedShapeMapHasher;
 class GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape;
 class GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape;
 
-
 #ifndef _Standard_HeaderFile
 #include <Standard.hxx>
 #endif
@@ -47,108 +46,74 @@ class GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape;
 #include <Standard_Macro.hxx>
 #endif
 
+#include <Basics_OCCTVersion.hxx>
 
-class GEOMAlgo_DataMapOfOrientedShapeShape  : public TCollection_BasicMap {
-
+class GEOMAlgo_DataMapOfOrientedShapeShape  : public TCollection_BasicMap
+{
 public:
 
-    void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
- // Methods PUBLIC
- // 
-
-
-Standard_EXPORT GEOMAlgo_DataMapOfOrientedShapeShape(const Standard_Integer NbBuckets = 1);
-
-
-Standard_EXPORT   GEOMAlgo_DataMapOfOrientedShapeShape& Assign(const GEOMAlgo_DataMapOfOrientedShapeShape& Other) ;
+  void* operator new(size_t,void* anAddress) 
+  {
+    return anAddress;
+  }
+  void* operator new(size_t size) 
+  { 
+    return Standard::Allocate(size); 
+  }
+  void  operator delete(void *anAddress) 
+  { 
+    if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+  }
+
+  // Methods PUBLIC
+  // 
+
+  Standard_EXPORT GEOMAlgo_DataMapOfOrientedShapeShape(const Standard_Integer NbBuckets = 1);
+
+  Standard_EXPORT   GEOMAlgo_DataMapOfOrientedShapeShape& Assign(const GEOMAlgo_DataMapOfOrientedShapeShape& Other) ;
   GEOMAlgo_DataMapOfOrientedShapeShape& operator =(const GEOMAlgo_DataMapOfOrientedShapeShape& Other) 
-{
-  return Assign(Other);
-}
-
+  {
+    return Assign(Other);
+  }
 
+  Standard_EXPORT   void ReSize(const Standard_Integer NbBuckets) ;
 
-Standard_EXPORT   void ReSize(const Standard_Integer NbBuckets) ;
+  Standard_EXPORT   void Clear() ;
+  ~GEOMAlgo_DataMapOfOrientedShapeShape()
+  {
+    Clear();
+  }
 
+  Standard_EXPORT   Standard_Boolean Bind(const TopoDS_Shape& K,const TopoDS_Shape& I) ;
+  Standard_EXPORT   Standard_Boolean IsBound(const TopoDS_Shape& K) const;
+  Standard_EXPORT   Standard_Boolean UnBind(const TopoDS_Shape& K) ;
 
-Standard_EXPORT   void Clear() ;
-~GEOMAlgo_DataMapOfOrientedShapeShape()
-{
-  Clear();
-}
-
-
-
-Standard_EXPORT   Standard_Boolean Bind(const TopoDS_Shape& K,const TopoDS_Shape& I) ;
-
-
-Standard_EXPORT   Standard_Boolean IsBound(const TopoDS_Shape& K) const;
-
-
-Standard_EXPORT   Standard_Boolean UnBind(const TopoDS_Shape& K) ;
-
-
-Standard_EXPORT  const TopoDS_Shape& Find(const TopoDS_Shape& K) const;
- const TopoDS_Shape& operator()(const TopoDS_Shape& K) const
-{
-  return Find(K);
-}
-
+  Standard_EXPORT  const TopoDS_Shape& Find(const TopoDS_Shape& K) const;
+  const TopoDS_Shape& operator()(const TopoDS_Shape& K) const
+  {
+    return Find(K);
+  }
 
-
-Standard_EXPORT   TopoDS_Shape& ChangeFind(const TopoDS_Shape& K) ;
+  Standard_EXPORT   TopoDS_Shape& ChangeFind(const TopoDS_Shape& K) ;
   TopoDS_Shape& operator()(const TopoDS_Shape& K) 
-{
-  return ChangeFind(K);
-}
-
-
-
-
-
-
-protected:
-
- // Methods PROTECTED
- // 
-
-
- // Fields PROTECTED
- //
+  {
+    return ChangeFind(K);
+  }
 
+#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
+  Standard_EXPORT Standard_Address Find1 (const TopoDS_Shape& K) const;
+  Standard_EXPORT Standard_Address ChangeFind1 (const TopoDS_Shape& K);
+#endif
 
 private: 
 
  // Methods PRIVATE
  // 
-
-
 Standard_EXPORT GEOMAlgo_DataMapOfOrientedShapeShape(const GEOMAlgo_DataMapOfOrientedShapeShape& Other);
 
-
- // Fields PRIVATE
- //
-
-
 };
 
-
-
-
-
 // other Inline functions and methods (like "C++: function call" methods)
 //
 
-
 #endif