From 409c50c53074dad27f042c7da24d8cf53f52c2c6 Mon Sep 17 00:00:00 2001 From: cas Date: Mon, 6 Mar 2000 17:10:31 +0000 Subject: [PATCH] No comments --- src/CPPExt/CPPExt_Template.edl | 40 +++++++++++++++++++++-------- src/CPPExt/CPPExt_TemplateCSFDB.edl | 20 ++++++++++----- 2 files changed, 44 insertions(+), 16 deletions(-) diff --git a/src/CPPExt/CPPExt_Template.edl b/src/CPPExt/CPPExt_Template.edl index b117c14..e7aa4ff 100755 --- a/src/CPPExt/CPPExt_Template.edl +++ b/src/CPPExt/CPPExt_Template.edl @@ -56,10 +56,14 @@ $ inline void* operator new(size_t size) $ { $ return Standard::Allocate(size); $ } -$ inline void operator delete(void *anAddress, size_t size) +$ inline void operator delete(void *anAddress) $ { -$ if (anAddress) Standard::Free((Standard_Address&)anAddress,size); +$ if (anAddress) Standard::Free((Standard_Address&)anAddress); $ } +$// inline void operator delete(void *anAddress, size_t size) +$// { +$// if (anAddress) Standard::Free((Standard_Address&)anAddress,size); +$// } $ Handle(%HTName)():Handle(%HTInherits)() {} $ Handle(%HTName)(const Handle(%HTName)& aHandle) : Handle(%HTInherits)(aHandle) $ { @@ -156,10 +160,14 @@ $ inline void* operator new(size_t size) $ { $ return Standard::Allocate(size); $ } -$ inline void operator delete(void *anAddress, size_t size) +$ inline void operator delete(void *anAddress) $ { -$ if (anAddress) Standard::Free((Standard_Address&)anAddress,size); +$ 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 $ // $%TICPublicmets @@ -289,10 +297,14 @@ $ inline void* operator new(size_t size) $ { $ return Standard::Allocate(size); $ } -$ inline void operator delete(void *anAddress, size_t size) +$ inline void operator delete(void *anAddress) $ { -$ if (anAddress) Standard::Free((Standard_Address&)anAddress,size); +$ 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 $ // $%TICPublicmets @@ -412,10 +424,14 @@ $ inline void* operator new(size_t size) $ { $ return Standard::Allocate(size); $ } -$ inline void operator delete(void *anAddress, size_t size) +$ inline void operator delete(void *anAddress) $ { -$ if (anAddress) Standard::Free((Standard_Address&)anAddress,size); +$ 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 $ // @@ -655,10 +671,14 @@ $ inline void* operator new(size_t size) $ { $ return Standard::Allocate(size); $ } -$ inline void operator delete(void *anAddress, size_t size) +$ inline void operator delete(void *anAddress) $ { -$ if (anAddress) Standard::Free((Standard_Address&)anAddress,size); +$ if (anAddress) Standard::Free((Standard_Address&)anAddress); $ } +$// inline void operator delete(void *anAddress, size_t size) +$// { +$// if (anAddress) Standard::Free((Standard_Address&)anAddress,size); +$// } $public: $ Standard_EXPORT static void Raise(const Standard_CString aMessage = ""); $ Standard_EXPORT static void Raise(Standard_SStream& aReason); diff --git a/src/CPPExt/CPPExt_TemplateCSFDB.edl b/src/CPPExt/CPPExt_TemplateCSFDB.edl index 3b213cd..aeb0dff 100755 --- a/src/CPPExt/CPPExt_TemplateCSFDB.edl +++ b/src/CPPExt/CPPExt_TemplateCSFDB.edl @@ -39,10 +39,14 @@ $ inline void* operator new(size_t size) $ { $ return StandardCSFDB_Allocate(size); $ } -$ inline void operator delete(void *anAddress, size_t size) +$ inline void operator delete(void *anAddress) $ { -$ if (anAddress) StandardCSFDB_Free((Standard_Address&)anAddress,size); +$ if (anAddress) Standard::Free((Standard_Address&)anAddress); $ } +$// inline void operator delete(void *anAddress, size_t size) +$// { +$// if (anAddress) StandardCSFDB_Free((Standard_Address&)anAddress,size); +$// } $ $ Handle(%HPName)():Handle(%HPInherits)() {} $ Handle(%HPName)(const Handle(%HPName)& aHandle) : Handle(%HPInherits)(aHandle) @@ -124,10 +128,14 @@ $ inline void* operator new(size_t size) $ { $ return StandardCSFDB_Allocate(size); $ } -$ inline void operator delete(void *anAddress, size_t size) -$ { -$ if (anAddress) StandardCSFDB_Free((Standard_Address&)anAddress,size); -$ } +$ inline void operator delete(void *anAddress) +$ { +$ if (anAddress) Standard::Free((Standard_Address&)anAddress); +$ } +$// inline void operator delete(void *anAddress, size_t size) +$// { +$// if (anAddress) StandardCSFDB_Free((Standard_Address&)anAddress,size); +$// } $ $ // Methods PUBLIC $ // -- 2.39.5