From 8b8b2338fd18b6a6d93d66cef2462f2657630120 Mon Sep 17 00:00:00 2001 From: jfa Date: Tue, 13 Sep 2011 11:29:04 +0000 Subject: [PATCH] Porting to OCCT6.5.1 development version --- src/OBJECT/Makefile.am | 3 +- src/OBJECT/SALOME_DataMapOfIOMapOfInteger.hxx | 44 ++++--------------- 2 files changed, 10 insertions(+), 37 deletions(-) diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am index 503df228e..fe6680ce5 100755 --- a/src/OBJECT/Makefile.am +++ b/src/OBJECT/Makefile.am @@ -18,7 +18,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 -# include $(top_srcdir)/adm_local/unix/make_common_starter.am @@ -58,7 +57,7 @@ dist_libSalomeObject_la_SOURCES = \ SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx \ SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx -libSalomeObject_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) +libSalomeObject_la_CPPFLAGS = $(QT_INCLUDES) $(CAS_CPPFLAGS) @KERNEL_CXXFLAGS@ libSalomeObject_la_LDFLAGS = $(QT_LIBS) $(CAS_LDPATH) -lTKV3d # internal (non-distributed) headers diff --git a/src/OBJECT/SALOME_DataMapOfIOMapOfInteger.hxx b/src/OBJECT/SALOME_DataMapOfIOMapOfInteger.hxx index 61baa1a5f..7f4b4999e 100644 --- a/src/OBJECT/SALOME_DataMapOfIOMapOfInteger.hxx +++ b/src/OBJECT/SALOME_DataMapOfIOMapOfInteger.hxx @@ -18,12 +18,11 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// // SALOME SALOMEGUI : implementation of desktop and GUI kernel // File : SALOME_DataMapOfIOMapOfInteger.hxx // Module : SALOME -// + #ifndef _SALOME_DataMapOfIOMapOfInteger_HeaderFile #define _SALOME_DataMapOfIOMapOfInteger_HeaderFile @@ -42,6 +41,7 @@ #ifndef _Standard_Boolean_HeaderFile #include #endif + class Standard_DomainError; class Standard_NoSuchObject; class SALOME_InteractiveObject; @@ -50,7 +50,6 @@ class TColStd_MapTransientHasher; class SALOME_DataMapNodeOfDataMapOfIOMapOfInteger; class SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger; - #ifndef _Standard_HeaderFile #include #endif @@ -58,6 +57,8 @@ class SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger; #include #endif +#include + class SALOME_DataMapOfIOMapOfInteger : public TCollection_BasicMap { public: @@ -74,10 +75,7 @@ public: { if (anAddress) Standard::Free((Standard_Address&)anAddress); } -// inline void operator delete(void *anAddress, size_t size) -// { -// if (anAddress) Standard::Free((Standard_Address&)anAddress,size); -// } + // Methods PUBLIC // Standard_EXPORT SALOME_DataMapOfIOMapOfInteger(const Standard_Integer NbBuckets = 1); @@ -109,40 +107,16 @@ Standard_EXPORT TColStd_IndexedMapOfInteger& ChangeFind(const Handle(SALOME_In 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 Handle(SALOME_InteractiveObject)& K) const; +Standard_EXPORT Standard_Address ChangeFind1 (const Handle(SALOME_InteractiveObject)& K); +#endif private: - - // Methods PRIVATE - // Standard_EXPORT SALOME_DataMapOfIOMapOfInteger(const SALOME_DataMapOfIOMapOfInteger& Other); - - - // Fields PRIVATE - // - - }; - - - - // other inline functions and methods (like "C++: function call" methods) // - #endif -- 2.39.2