From: cas Date: Fri, 9 Jun 2000 14:09:51 +0000 (+0000) Subject: No comments X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=2de108989d0890e2cc01c6a4f50d834974ffef57;p=occt-wok.git No comments --- diff --git a/src/CPPExt/CPPExt_Template.edl b/src/CPPExt/CPPExt_Template.edl index e7aa4ff..37c74ce 100755 --- a/src/CPPExt/CPPExt_Template.edl +++ b/src/CPPExt/CPPExt_Template.edl @@ -48,22 +48,18 @@ $Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(%HTName); $ $class Handle(%HTName) : public Handle(%HTInherits) { $ public: -$ inline void* operator new(size_t,void* anAddress) +$ void* operator new(size_t,void* anAddress) $ { $ return anAddress; $ } -$ inline void* operator new(size_t size) +$ void* operator new(size_t size) $ { $ return Standard::Allocate(size); $ } -$ inline void operator delete(void *anAddress) +$ void operator delete(void *anAddress) $ { $ 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) $ { @@ -152,22 +148,18 @@ $class %Class : public %Inherits { $ $public: $ -$ inline void* operator new(size_t,void* anAddress) +$ void* operator new(size_t,void* anAddress) $ { $ return anAddress; $ } -$ inline void* operator new(size_t size) +$ void* operator new(size_t size) $ { $ return Standard::Allocate(size); $ } -$ inline void operator delete(void *anAddress) +$ void operator delete(void *anAddress) $ { $ 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 @@ -206,7 +198,7 @@ $%TICDefines $%TICInlineIncludes $%TICUndefines $ -$// other inline functions and methods (like "C++: function call" methods) +$// other Inline functions and methods (like "C++: function call" methods) $// $%TICSuppMethod $ @@ -289,22 +281,18 @@ $class %Class %Inherits { $ $public: $ -$ inline void* operator new(size_t,void* anAddress) +$ void* operator new(size_t,void* anAddress) $ { $ return anAddress; $ } -$ inline void* operator new(size_t size) +$ void* operator new(size_t size) $ { $ return Standard::Allocate(size); $ } -$ inline void operator delete(void *anAddress) +$ void operator delete(void *anAddress) $ { $ 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 @@ -338,7 +326,7 @@ $%TICDefines $%TICInlineIncludes $%TICUndefines $ -$// other inline functions and methods (like "C++: function call" methods) +$// other Inline functions and methods (like "C++: function call" methods) $// $%TICSuppMethod $ @@ -416,22 +404,18 @@ $ $class %Class %Inherits { $ $public: -$ inline void* operator new(size_t,void* anAddress) +$ void* operator new(size_t,void* anAddress) $ { $ return anAddress; $ } -$ inline void* operator new(size_t size) +$ void* operator new(size_t size) $ { $ return Standard::Allocate(size); $ } -$ inline void operator delete(void *anAddress) +$ void operator delete(void *anAddress) $ { $ 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 $ // @@ -469,7 +453,7 @@ $%TICDefines $%TICInlineIncludes $%TICUndefines $ -$// other inline functions and methods (like "C++: function call" methods) +$// other Inline functions and methods (like "C++: function call" methods) $// $%TICSuppMethod $ @@ -663,22 +647,18 @@ $#endif $ $class %Class : public %Inherits { $ -$ inline void* operator new(size_t,void* anAddress) +$ void* operator new(size_t,void* anAddress) $ { $ return anAddress; $ } -$ inline void* operator new(size_t size) +$ void* operator new(size_t size) $ { $ return Standard::Allocate(size); $ } -$ inline void operator delete(void *anAddress) +$ void operator delete(void *anAddress) $ { $ 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); @@ -803,7 +783,7 @@ $%Method; @end; @template InlineMethodTemplateDec(%Method) is -$inline %Method\^ +$%Method\^ @end; @template MethodTemplateDef(%Method,%MBody) is diff --git a/src/CPPExt/CPPExt_TemplateCSFDB.edl b/src/CPPExt/CPPExt_TemplateCSFDB.edl index aeb0dff..8b541be 100755 --- a/src/CPPExt/CPPExt_TemplateCSFDB.edl +++ b/src/CPPExt/CPPExt_TemplateCSFDB.edl @@ -31,22 +31,18 @@ $ $class Handle(%HPName) : public Handle(%HPInherits) { $ public: $ -$ inline void* operator new(size_t,void* anAddress) +$ void* operator new(size_t,void* anAddress) $ { $ return anAddress; $ } -$ inline void* operator new(size_t size) +$ void* operator new(size_t size) $ { $ return StandardCSFDB_Allocate(size); $ } -$ inline void operator delete(void *anAddress) +$ 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); -$// } $ $ Handle(%HPName)():Handle(%HPInherits)() {} $ Handle(%HPName)(const Handle(%HPName)& aHandle) : Handle(%HPInherits)(aHandle) @@ -120,22 +116,18 @@ $class %Class : public %Inherits { $ $ $public: -$ inline void* operator new(size_t,void* anAddress) +$ void* operator new(size_t,void* anAddress) $ { $ return anAddress; $ } -$ inline void* operator new(size_t size) +$ void* operator new(size_t size) $ { $ return StandardCSFDB_Allocate(size); $ } -$ inline void operator delete(void *anAddress) +$ 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 $ // @@ -172,7 +164,7 @@ $%TICDefines $%TICInlineIncludes $%TICUndefines $ -$// other inline functions and methods (like "C++: function call" methods) +$// other Inline functions and methods (like "C++: function call" methods) $// $%TICSuppMethod $ diff --git a/src/CPPExt/CPPExt_TemplateOBJS.edl b/src/CPPExt/CPPExt_TemplateOBJS.edl index fee1dc6..a73f803 100755 --- a/src/CPPExt/CPPExt_TemplateOBJS.edl +++ b/src/CPPExt/CPPExt_TemplateOBJS.edl @@ -53,49 +53,49 @@ $class Handle_%HPName: public Handle_%HPInherits { $ $public: $ -$ inline Handle_%HPName(); -$ inline Handle_%HPName(const Handle_%HPName& AnObject); -$ inline Handle_%HPName(const %HPName_ptr AnObject); +$ Handle_%HPName(); +$ Handle_%HPName(const Handle_%HPName& AnObject); +$ Handle_%HPName(const %HPName_ptr AnObject); $ Standard_EXPORT ~Handle_%HPName(); -$ inline Handle_%HPName& operator=(const Handle_%HPName& AnObject); +$ Handle_%HPName& operator=(const Handle_%HPName& AnObject); $ Standard_EXPORT Handle_%HPName& operator=(const %HPName_ptr AnObject); $ Standard_EXPORT static const Handle_%HPName DownCast(const Handle_Standard_Persistent&); -$ inline Standard_Boolean operator==(const Handle_%HPName& AnObject) const ; -$ inline Standard_Boolean operator!=(const Handle_%HPName& AnObject) const; -$ inline Oid_%HPName* operator->() const; +$ Standard_Boolean operator==(const Handle_%HPName& AnObject) const ; +$ Standard_Boolean operator!=(const Handle_%HPName& AnObject) const; +$ Oid_%HPName* operator->() const; $}; $ $ -$inline Handle_%HPName::Handle_%HPName() +$Handle_%HPName::Handle_%HPName() ${ $} $ -$inline Handle_%HPName::Handle_%HPName(const Handle_%HPName& AnObject) +$Handle_%HPName::Handle_%HPName(const Handle_%HPName& AnObject) $ : Handle_%HPInherits(AnObject) ${ $} $ -$inline Handle_%HPName::Handle_%HPName(const %HPName_ptr AnObject) +$Handle_%HPName::Handle_%HPName(const %HPName_ptr AnObject) $ : Handle_%HPInherits((const %HPInherits_ptr)AnObject) ${ $} $ -$inline Handle_%HPName& Handle_%HPName::operator=(const Handle_%HPName& AnObject) +$Handle_%HPName& Handle_%HPName::operator=(const Handle_%HPName& AnObject) ${ $ Identifier=AnObject.Identifier; return *this; $} $ -$inline Standard_Boolean Handle_%HPName::operator==(const Handle_%HPName& AnObject)const +$Standard_Boolean Handle_%HPName::operator==(const Handle_%HPName& AnObject)const ${ $ return Identifier==AnObject.Identifier; $} $ -$inline Standard_Boolean Handle_%HPName::operator!=(const Handle_%HPName& AnObject)const +$Standard_Boolean Handle_%HPName::operator!=(const Handle_%HPName& AnObject)const ${ $ return Identifier!=AnObject.Identifier; $} $ -$inline Oid_%HPName* Handle_%HPName::operator->() const +$Oid_%HPName* Handle_%HPName::operator->() const ${ $ return (Oid_%HPName*)(void*)&(((Handle_%HPName_ptr)this)->Identifier); $} @@ -247,7 +247,7 @@ $%TICDefines $%TICInlineIncludes $%TICUndefines $ -$// other inline functions and methods (like "C++: function call or Oid methods" methods) +$// other Inline functions and methods (like "C++: function call or Oid methods" methods) $// $%TICSuppMethod $ diff --git a/src/CPPExt/CPPExt_TemplateOBJY.edl b/src/CPPExt/CPPExt_TemplateOBJY.edl index 9d99bf6..6856ede 100755 --- a/src/CPPExt/CPPExt_TemplateOBJY.edl +++ b/src/CPPExt/CPPExt_TemplateOBJY.edl @@ -28,16 +28,16 @@ $ $public: $ $ Handle_%HPName(const PHandle_Standard_Persistent& AnObject) : Handle_%HPInherits(AnObject) {} -$ inline Handle_%HPName(); -$ inline Handle_%HPName(const Handle_%HPName& AnObject); -$ inline Handle_%HPName(const %HPName* AnObject); +$ Handle_%HPName(); +$ Handle_%HPName(const Handle_%HPName& AnObject); +$ Handle_%HPName(const %HPName* AnObject); $ ~Handle_%HPName(); -$ inline Handle_%HPName& operator=(const Handle_%HPName& AnObject); +$ Handle_%HPName& operator=(const Handle_%HPName& AnObject); $ Handle_%HPName& operator=(const %HPName* AnObject); $ static const Handle_%HPName DownCast(const Handle_Standard_Persistent&); -$ inline Standard_Boolean operator==(const Handle_%HPName& AnObject) const ; -$ inline Standard_Boolean operator!=(const Handle_%HPName& AnObject) const; -$ inline Oid_%HPName* operator->() const; +$ Standard_Boolean operator==(const Handle_%HPName& AnObject) const ; +$ Standard_Boolean operator!=(const Handle_%HPName& AnObject) const; +$ Oid_%HPName* operator->() const; $}; $ $class PHandle_%HPName : public PHandle_%HPInherits { @@ -48,36 +48,36 @@ $ Handle(%HPName) operator->(){Handle(%HPName) p(*this);return p;} $ Handle(%HPName) operator->() const {Handle(%HPName) p(*this);return p;} $}; $ -$inline Handle_%HPName::Handle_%HPName() +$Handle_%HPName::Handle_%HPName() ${ $} $ -$inline Handle_%HPName::Handle_%HPName(const Handle_%HPName& AnObject) +$Handle_%HPName::Handle_%HPName(const Handle_%HPName& AnObject) $ : Handle_%HPInherits(AnObject) ${ $} $ -$inline Handle_%HPName::Handle_%HPName(const %HPName* AnObject) +$Handle_%HPName::Handle_%HPName(const %HPName* AnObject) $ : Handle_%HPInherits((const %HPInherits*)AnObject) ${ $} $ -$inline Handle_%HPName& Handle_%HPName::operator=(const Handle_%HPName& AnObject) +$Handle_%HPName& Handle_%HPName::operator=(const Handle_%HPName& AnObject) ${ $ Identifier=AnObject.Identifier; return *this; $} $ -$inline Standard_Boolean Handle_%HPName::operator==(const Handle_%HPName& AnObject)const +$Standard_Boolean Handle_%HPName::operator==(const Handle_%HPName& AnObject)const ${ $ return Identifier==AnObject.Identifier; $} $ -$inline Standard_Boolean Handle_%HPName::operator!=(const Handle_%HPName& AnObject)const +$Standard_Boolean Handle_%HPName::operator!=(const Handle_%HPName& AnObject)const ${ $ return Identifier!=AnObject.Identifier; $} $ -$inline Oid_%HPName* Handle_%HPName::operator->() const +$Oid_%HPName* Handle_%HPName::operator->() const ${ $ return (Oid_%HPName*)(void*)&(((Handle_%HPName *)this)->Identifier); $} @@ -183,7 +183,7 @@ $%TICDefines $%TICInlineIncludes $%TICUndefines $ -$// other inline functions and methods (like "C++: function call or Oid methods" methods) +$// other Inline functions and methods (like "C++: function call or Oid methods" methods) $// $%TICSuppMethod $