X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOM%2FGEOM_DataMapOfAsciiStringTransient.hxx;h=1a1b7004427d03923a7ab269cd07c1500cbe2e88;hb=6e2763b42437045fd4b18aa3a6197865020de84b;hp=98923841d13111a4e8150a021e82e45e526500bb;hpb=5b3622aa2363853841fd5b4205c78a715bfee4a4;p=modules%2Fgeom.git

diff --git a/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx b/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx
index 98923841d..1a1b70044 100644
--- a/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx
+++ b/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
@@ -6,7 +6,7 @@
 // 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.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,98 +23,11 @@
 #ifndef _GEOM_DataMapOfAsciiStringTransient_HeaderFile
 #define _GEOM_DataMapOfAsciiStringTransient_HeaderFile
 
-#ifndef _TCollection_BasicMap_HeaderFile
-#include <TCollection_BasicMap.hxx>
-#endif
-#ifndef _Handle_Standard_Transient_HeaderFile
-#include <Handle_Standard_Transient.hxx>
-#endif
-#ifndef _Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile
-#include <Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx>
-#endif
-#ifndef _Standard_Integer_HeaderFile
-#include <Standard_Integer.hxx>
-#endif
-#ifndef _Standard_Boolean_HeaderFile
-#include <Standard_Boolean.hxx>
-#endif
+#include <NCollection_DataMap.hxx>
+#include <Standard_Transient.hxx>
+#include <TCollection_AsciiString.hxx>
 
-class Standard_DomainError;
-class Standard_NoSuchObject;
-class TCollection_AsciiString;
-class Standard_Transient;
-class GEOM_DataMapNodeOfDataMapOfAsciiStringTransient;
-class GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient;
+typedef NCollection_DataMap<TCollection_AsciiString, Handle(Standard_Transient)> GEOM_DataMapOfAsciiStringTransient;
+typedef GEOM_DataMapOfAsciiStringTransient::Iterator GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient;
 
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-
-#include <Basics_OCCTVersion.hxx>
-
-class GEOM_DataMapOfAsciiStringTransient  : 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 GEOM_DataMapOfAsciiStringTransient(const Standard_Integer NbBuckets = 1);
-Standard_EXPORT   GEOM_DataMapOfAsciiStringTransient& Assign(const GEOM_DataMapOfAsciiStringTransient& Other) ;
-  GEOM_DataMapOfAsciiStringTransient& operator =(const GEOM_DataMapOfAsciiStringTransient& Other) 
-{
-  return Assign(Other);
-}
-
-Standard_EXPORT   void ReSize(const Standard_Integer NbBuckets) ;
-Standard_EXPORT   void Clear() ;
-~GEOM_DataMapOfAsciiStringTransient()
-{
-  Clear();
-}
-
-Standard_EXPORT   Standard_Boolean Bind(const TCollection_AsciiString& K,const Handle(Standard_Transient)& I) ;
-Standard_EXPORT   Standard_Boolean IsBound(const TCollection_AsciiString& K) const;
-Standard_EXPORT   Standard_Boolean UnBind(const TCollection_AsciiString& K) ;
-Standard_EXPORT  const Handle_Standard_Transient& Find(const TCollection_AsciiString& K) const;
- const Handle_Standard_Transient& operator()(const TCollection_AsciiString& K) const
-{
-  return Find(K);
-}
-
-Standard_EXPORT   Handle_Standard_Transient& ChangeFind(const TCollection_AsciiString& K) ;
-  Handle_Standard_Transient& operator()(const TCollection_AsciiString& K) 
-{
-  return ChangeFind(K);
-}
-
-#if OCC_VERSION_LARGE > 0x06050100 // for OCC-6.5.2 and higher version
-  Standard_EXPORT Standard_Address Find1 (const TCollection_AsciiString& K) const;
-  Standard_EXPORT Standard_Address ChangeFind1 (const TCollection_AsciiString& K);
-#endif
-
-private: 
- // Methods PRIVATE
- // 
-Standard_EXPORT GEOM_DataMapOfAsciiStringTransient(const GEOM_DataMapOfAsciiStringTransient& Other);
-};
-
-// other Inline functions and methods (like "C++: function call" methods)
-//
-
-#endif
+#endif // _GEOM_DataMapOfAsciiStringTransient_HeaderFile