X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FNMTDS%2FNMTDS_DataMapOfIntegerMapOfInteger.hxx;h=2b8e12b0d4f9a4dba1909f3e1d8a047da1f9db89;hb=392db299f788946e7276fdb4e3384cef837be9b4;hp=2e7c5b402c105040a0c4631850a2b816607c5d4a;hpb=239f8109c64fa0c5a2e1d87a420bad5529b57f48;p=modules%2Fgeom.git

diff --git a/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger.hxx b/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger.hxx
index 2e7c5b402..2b8e12b0d 100644
--- a/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger.hxx
+++ b/src/NMTDS/NMTDS_DataMapOfIntegerMapOfInteger.hxx
@@ -1,12 +1,11 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // 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
+// 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.
@@ -16,6 +15,7 @@
 // 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 _NMTDS_DataMapOfIntegerMapOfInteger_HeaderFile
 #define _NMTDS_DataMapOfIntegerMapOfInteger_HeaderFile
@@ -32,6 +32,7 @@
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
 #endif
+
 class Standard_DomainError;
 class Standard_NoSuchObject;
 class TColStd_MapOfInteger;
@@ -39,7 +40,6 @@ class TColStd_MapIntegerHasher;
 class NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger;
 class NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger;
 
-
 #ifndef _Standard_HeaderFile
 #include <Standard.hxx>
 #endif
@@ -47,108 +47,69 @@ class NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger;
 #include <Standard_Macro.hxx>
 #endif
 
+#include <Basics_OCCTVersion.hxx>
 
-class NMTDS_DataMapOfIntegerMapOfInteger  : 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 NMTDS_DataMapOfIntegerMapOfInteger(const Standard_Integer NbBuckets = 1);
-
-
-Standard_EXPORT   NMTDS_DataMapOfIntegerMapOfInteger& Assign(const NMTDS_DataMapOfIntegerMapOfInteger& Other) ;
-  NMTDS_DataMapOfIntegerMapOfInteger& operator =(const NMTDS_DataMapOfIntegerMapOfInteger& Other) 
-{
-  return Assign(Other);
-}
-
-
-
-Standard_EXPORT   void ReSize(const Standard_Integer NbBuckets) ;
-
-
-Standard_EXPORT   void Clear() ;
-~NMTDS_DataMapOfIntegerMapOfInteger()
-{
-  Clear();
-}
-
-
-
-Standard_EXPORT   Standard_Boolean Bind(const Standard_Integer& K,const TColStd_MapOfInteger& I) ;
-
-
-Standard_EXPORT   Standard_Boolean IsBound(const Standard_Integer& K) const;
-
-
-Standard_EXPORT   Standard_Boolean UnBind(const Standard_Integer& K) ;
-
-
-Standard_EXPORT  const TColStd_MapOfInteger& Find(const Standard_Integer& K) const;
- const TColStd_MapOfInteger& operator()(const Standard_Integer& K) const
+class NMTDS_DataMapOfIntegerMapOfInteger : public TCollection_BasicMap
 {
-  return Find(K);
-}
-
-
-
-Standard_EXPORT   TColStd_MapOfInteger& ChangeFind(const Standard_Integer& K) ;
-  TColStd_MapOfInteger& operator()(const Standard_Integer& K) 
-{
-  return ChangeFind(K);
-}
-
-
-
-
-
-
-protected:
-
- // Methods PROTECTED
- // 
-
-
- // Fields PROTECTED
- //
+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 NMTDS_DataMapOfIntegerMapOfInteger(const Standard_Integer NbBuckets = 1);
+
+  Standard_EXPORT NMTDS_DataMapOfIntegerMapOfInteger& Assign(const NMTDS_DataMapOfIntegerMapOfInteger& Other);
+  NMTDS_DataMapOfIntegerMapOfInteger& operator =(const NMTDS_DataMapOfIntegerMapOfInteger& Other)
+  {
+    return Assign(Other);
+  }
+
+  Standard_EXPORT void ReSize(const Standard_Integer NbBuckets);
+
+  Standard_EXPORT void Clear();
+  ~NMTDS_DataMapOfIntegerMapOfInteger()
+  {
+    Clear();
+  }
+
+  Standard_EXPORT Standard_Boolean Bind (const Standard_Integer& K,const TColStd_MapOfInteger& I);
+  Standard_EXPORT Standard_Boolean IsBound (const Standard_Integer& K) const;
+  Standard_EXPORT Standard_Boolean UnBind (const Standard_Integer& K);
+
+  Standard_EXPORT const TColStd_MapOfInteger& Find (const Standard_Integer& K) const;
+  const TColStd_MapOfInteger& operator()(const Standard_Integer& K) const
+  {
+    return Find(K);
+  }
+
+  Standard_EXPORT TColStd_MapOfInteger& ChangeFind(const Standard_Integer& K);
+  TColStd_MapOfInteger& operator()(const Standard_Integer& K)
+  {
+    return ChangeFind(K);
+  }
+
+#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
+  Standard_EXPORT Standard_Address Find1 (const Standard_Integer& K) const;
+  Standard_EXPORT Standard_Address ChangeFind1 (const Standard_Integer& K);
+#endif
 
-private: 
+private:
 
  // Methods PRIVATE
- // 
-
-
-Standard_EXPORT NMTDS_DataMapOfIntegerMapOfInteger(const NMTDS_DataMapOfIntegerMapOfInteger& Other);
-
-
- // Fields PRIVATE
  //
 
+  Standard_EXPORT NMTDS_DataMapOfIntegerMapOfInteger(const NMTDS_DataMapOfIntegerMapOfInteger& Other);
 
 };
 
-
-
-
-
 // other Inline functions and methods (like "C++: function call" methods)
 //
 
-
 #endif