Porting to OCCT development version: Standard_PI -> M_PI

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

diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx
index 77720cdb5dee757d337a96331c9f018c08161163..6e7f997428613cd245e3d21c5850d40b1e03d11a 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.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_DataMapIteratorOfDataMapOfShapeShapeSet_HeaderFile
 #define _GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_HeaderFile
 
@@ -28,6 +28,7 @@
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_HeaderFile
 #include <Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx>
 #endif
+
 class Standard_NoSuchObject;
 class TopoDS_Shape;
 class GEOMAlgo_ShapeSet;
@@ -35,7 +36,6 @@ class TopTools_ShapeMapHasher;
 class GEOMAlgo_DataMapOfShapeShapeSet;
 class GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet;
 
-
 #ifndef _Standard_HeaderFile
 #include <Standard.hxx>
 #endif
@@ -43,73 +43,32 @@ class GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet;
 #include <Standard_Macro.hxx>
 #endif
 
-
-class GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet  : public TCollection_BasicMapIterator {
-
+class GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet  : public TCollection_BasicMapIterator
+{
 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); 
+  }
 
-    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_DataMapIteratorOfDataMapOfShapeShapeSet();
-
-
-Standard_EXPORT GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet(const GEOMAlgo_DataMapOfShapeShapeSet& aMap);
-
-
-Standard_EXPORT   void Initialize(const GEOMAlgo_DataMapOfShapeShapeSet& aMap) ;
-
-
-Standard_EXPORT  const TopoDS_Shape& Key() const;
-
-
-Standard_EXPORT  const GEOMAlgo_ShapeSet& Value() const;
-
+  Standard_EXPORT GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet();
 
+  Standard_EXPORT GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet
+  (const GEOMAlgo_DataMapOfShapeShapeSet& aMap);
 
+  Standard_EXPORT   void Initialize(const GEOMAlgo_DataMapOfShapeShapeSet& aMap);
 
+  Standard_EXPORT  const TopoDS_Shape& Key() const;
 
-protected:
-
- // Methods PROTECTED
- // 
-
-
- // Fields PROTECTED
- //
-
-
-private: 
-
- // Methods PRIVATE
- // 
-
-
- // Fields PRIVATE
- //
-
-
+  Standard_EXPORT  const GEOMAlgo_ShapeSet& Value() const;
 };
 
-
-
-
-
-// other Inline functions and methods (like "C++: function call" methods)
-//
-
-
 #endif