Porting to OCCT development version: Standard_PI -> M_PI

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

diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx
index 108370ac14d51a4c991908d39e273561cf1a17ce..2c539bf80308f979be24184b695f6c7614d2c3d7 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfRealListOfShape.hxx
@@ -1,24 +1,24 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2011  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// 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_DataMapOfRealListOfShape_HeaderFile
 #define _GEOMAlgo_DataMapOfRealListOfShape_HeaderFile
 
@@ -37,6 +37,7 @@
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
 #endif
+
 class Standard_DomainError;
 class Standard_NoSuchObject;
 class TopTools_ListOfShape;
@@ -44,7 +45,6 @@ class TColStd_MapRealHasher;
 class GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape;
 class GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape;
 
-
 #ifndef _Standard_HeaderFile
 #include <Standard.hxx>
 #endif
@@ -52,6 +52,7 @@ class GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape;
 #include <Standard_Macro.hxx>
 #endif
 
+#include <Basics_OCCTVersion.hxx>
 
 class GEOMAlgo_DataMapOfRealListOfShape  : public TCollection_BasicMap {
 
@@ -82,8 +83,6 @@ Standard_EXPORT   GEOMAlgo_DataMapOfRealListOfShape& Assign(const GEOMAlgo_DataM
   return Assign(Other);
 }
 
-
-
 Standard_EXPORT   void ReSize(const Standard_Integer NbBuckets) ;
 
 
@@ -93,67 +92,36 @@ Standard_EXPORT   void Clear() ;
   Clear();
 }
 
-
-
 Standard_EXPORT   Standard_Boolean Bind(const Standard_Real& K,const TopTools_ListOfShape& I) ;
-
-
 Standard_EXPORT   Standard_Boolean IsBound(const Standard_Real& K) const;
-
-
 Standard_EXPORT   Standard_Boolean UnBind(const Standard_Real& K) ;
 
-
 Standard_EXPORT  const TopTools_ListOfShape& Find(const Standard_Real& K) const;
  const TopTools_ListOfShape& operator()(const Standard_Real& K) const
 {
   return Find(K);
 }
 
-
-
 Standard_EXPORT   TopTools_ListOfShape& ChangeFind(const Standard_Real& K) ;
   TopTools_ListOfShape& operator()(const Standard_Real& K) 
 {
   return ChangeFind(K);
 }
 
-
-
-
-
-
-protected:
-
- // Methods PROTECTED
- // 
-
-
- // Fields PROTECTED
- //
-
+#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
+  Standard_EXPORT Standard_Address Find1 (const Standard_Real& K) const;
+  Standard_EXPORT Standard_Address ChangeFind1 (const Standard_Real& K);
+#endif
 
 private: 
 
  // Methods PRIVATE
  // 
-
-
 Standard_EXPORT GEOMAlgo_DataMapOfRealListOfShape(const GEOMAlgo_DataMapOfRealListOfShape& Other);
 
-
- // Fields PRIVATE
- //
-
-
 };
 
-
-
-
-
 // other Inline functions and methods (like "C++: function call" methods)
 //
 
-
 #endif