OCC13051, OCC13258 Using nonexistent objects in Standard_ForMapOfTypes class; Improve...

diff --git a/src/CPPExt/CPPExt_Standard.edl b/src/CPPExt/CPPExt_Standard.edl
index e29070d1eb0190a5e55150b00757b3102f6f5e5c..4c837fc83423bfabff1bc05c37bdb83340b3dda9 100755 (executable)
--- a/src/CPPExt/CPPExt_Standard.edl
+++ b/src/CPPExt/CPPExt_Standard.edl
@@ -82,12 +82,6 @@ $    ~Handle(Standard_Transient)();
 $
 $     void  ShallowDump(Standard_OStream&) const;
 $     
-$    Standard_Boolean IsImmutable() const {
-$      return(Standard_False);
-$    };
-$
-$    void SetImmutable() {};
-$
 $    int operator==(const Handle(Standard_Transient)& right) const
 $      {
 $       return entity == right.entity;

diff --git a/src/CPPExt/CPPExt_Template.edl b/src/CPPExt/CPPExt_Template.edl
index 8da084066e51e541dbad0f9b80620ff669ebee78..e4881d35bedb9684a1a917aa878458fc2fa01f67 100755 (executable)
--- a/src/CPPExt/CPPExt_Template.edl
+++ b/src/CPPExt/CPPExt_Template.edl
@@ -54,18 +54,6 @@ $Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(%HTName);
 $
 $class Handle(%HTName) : public Handle(%HTInherits) {
 $  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); 
-$      }
 $    Handle(%HTName)():Handle(%HTInherits)() {} 
 $    Handle(%HTName)(const Handle(%HTName)& aHandle) : Handle(%HTInherits)(aHandle) 
 $     {
@@ -87,17 +75,12 @@ $      Assign((Standard_Transient *)anItem);
 $      return *this;
 $     }
 $
-$    %HTName* operator->() 
-$     {
-$      return (%HTName *)ControlAccess();
-$     }
-$
-$    %HTName* operator->() const 
+$    %HTName* operator->() const
 $     {
 $      return (%HTName *)ControlAccess();
 $     }
 $
-$   Standard_EXPORT ~Handle(%HTName)();
+$//   Standard_EXPORT ~Handle(%HTName)();
 $ 
 $   Standard_EXPORT static const Handle(%HTName) DownCast(const Handle(Standard_Transient)& AnObject);
 $};
@@ -162,19 +145,6 @@ $%ClassComment
 $class %Class : public %Inherits {
 $
 $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
 $ // 
 $%TICPublicmets
@@ -183,9 +153,8 @@ $%TICPublicfriends
 $
 $ // Type management
 $ //
-$ Standard_EXPORT friend Handle_Standard_Type& %Class_Type_();
 $ Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
-$ Standard_EXPORT Standard_Boolean            IsKind(const Handle(Standard_Type)&) const;
+$ //Standard_EXPORT Standard_Boolean          IsKind(const Handle(Standard_Type)&) const;
 $
 $protected:
 $
@@ -736,18 +705,6 @@ $#endif
 $
 $class %Class : public %Inherits {
 $
-$    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); 
-$      }
 $#ifndef NO_CXX_EXCEPTION
 $ Standard_EXPORT virtual void Throw() const;
 $#endif
@@ -758,13 +715,13 @@ $ Standard_EXPORT static void Raise(const Standard_CString aMessage = "");
 $ Standard_EXPORT static void Raise(Standard_SStream& aReason);
 $ Standard_EXPORT static Handle(%Class) NewInstance(const Standard_CString aMessage); 
 $
-$ Standard_EXPORT ~%Class();
+$// Standard_EXPORT ~%Class();
 $
 $ // Type methods
 $ //
 $ Standard_EXPORT friend Handle_Standard_Type& %Class_Type_();
 $ Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;                    
-$ Standard_EXPORT Standard_Boolean             IsKind(const Handle(Standard_Type)&) const;
+$// Standard_EXPORT Standard_Boolean             IsKind(const Handle(Standard_Type)&) const;
 $};
 $
 $#endif
@@ -774,7 +731,7 @@ $#endif
 $#ifndef _Standard_Macro_HeaderFile
 $#include <Standard_Macro.hxx>
 $#endif
-$%Class::~%Class(){}
+$//%Class::~%Class(){}
 $
 $void %Class::Raise(Standard_SStream& aReason) 
 ${
@@ -898,15 +855,15 @@ $
 @end;
 
 @template EmptyDestructorTemplate(%Class) is
-$Standard_EXPORT ~%Class();
+$//Standard_EXPORT ~%Class();
 @end;
 
 @template FullEmptyHandleDestructorTemplate(%Class) is
-$Handle_%Class::~Handle_%Class() {}
+$//Handle_%Class::~Handle_%Class() {}
 @end;
 
 @template FullEmptyDestructorTemplate(%Class) is
-$%Class::~%Class() {}
+$//%Class::~%Class() {}
 @end;
 
 -- ===============
@@ -921,7 +878,6 @@ $aType%Nb\^
 
 @template TypeMgtAncestor(%Nb,%Ancestors) is
 $  static Handle_Standard_Type %Nb = STANDARD_TYPE(%Ancestors);
-$  if ( %Nb.IsNull()) %Nb = STANDARD_TYPE(%Ancestors);
 @end;
 
 @template TypeMgt(%Class,%Inherits,%Ancestors) is
@@ -970,8 +926,8 @@ $}
 @end;
 
 @template IsKind(%Class,%IClass) is
-$Standard_Boolean %Class::IsKind(const Handle(Standard_Type)& AType) const 
-${ 
-$  return (STANDARD_TYPE(%Class) == AType || %IClass::IsKind(AType)); 
-$}
+$//Standard_Boolean %Class::IsKind(const Handle(Standard_Type)& AType) const 
+$//{ 
+$//  return (STANDARD_TYPE(%Class) == AType || %IClass::IsKind(AType)); 
+$//}
 @end;

diff --git a/src/CPPExt/CPPExt_TemplateCSFDB.edl b/src/CPPExt/CPPExt_TemplateCSFDB.edl
index 7b01d687333192aff5c39756622227a5654ce015..72b88774cac682a63a67dd25f2208592c0a58028 100755 (executable)
--- a/src/CPPExt/CPPExt_TemplateCSFDB.edl
+++ b/src/CPPExt/CPPExt_TemplateCSFDB.edl
@@ -31,19 +31,6 @@ $
 $class Handle(%HPName) : public Handle(%HPInherits) {
 $  public:
 $
-$    void* operator new(size_t,void* anAddress) 
-$      {
-$        return anAddress;
-$      }
-$    void* operator new(size_t size) 
-$      { 
-$        return StandardCSFDB_Allocate(size); 
-$      }
-$    void  operator delete(void *anAddress) 
-$      { 
-$        if (anAddress) StandardCSFDB_Free((Standard_Address&)anAddress); 
-$      }
-$
 $    Handle(%HPName)():Handle(%HPInherits)() {} 
 $    Handle(%HPName)(const Handle(%HPName)& aHandle) : Handle(%HPInherits)(aHandle) 
 $     {
@@ -65,18 +52,11 @@ $      Assign((Standard_Persistent *)anItem);
 $      return *this;
 $     }
 $
-$    %HPName* operator->() 
-$     {
-$      return (%HPName *)ControlAccess();
-$     }
-$
 $    %HPName* operator->() const 
 $     {
 $      return (%HPName *)ControlAccess();
 $     }
 $
-$   Standard_EXPORT ~Handle(%HPName)();
-$ 
 $   Standard_EXPORT static const Handle(%HPName) DownCast(const Handle(Standard_Persistent)& AnObject);
 $};
 $#endif
@@ -98,8 +78,26 @@ $#endif
                                   %TICUndefines,
                                   %TICSuppMethod) is
 $// File generated by CPPExt (Persistent CSFDB)
-$// for CAS.CADE (copyright Matra-Datavision 1995)
 $//
+$//
+$//                     Copyright (C) 1991 - 2000 by  
+$//                      Matra Datavision SA.  All rights reserved.
+$//  
+$//                     Copyright (C) 2001 - 2004 by
+$//                     Open CASCADE SA.  All rights reserved.
+$// 
+$// This file is part of the Open CASCADE Technology software.
+$//
+$// This software may be distributed and/or modified under the terms and
+$// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
+$// and appearing in the file LICENSE included in the packaging of this file.
+$//  
+$// This software is distributed on an "AS IS" basis, without warranty of any
+$// kind, and Open CASCADE SA hereby disclaims all such warranties,
+$// including without limitation, any warranties of merchantability, fitness
+$// for a particular purpose or non-infringement. Please see the License for
+$// the specific terms and conditions governing rights and limitations under the
+$// License.
 $#ifndef _%Class_HeaderFile
 $#define _%Class_HeaderFile
 $
@@ -114,20 +112,7 @@ $%TICIncludes
 $
 $class %Class : public %Inherits {
 $
-$
 $public:
-$ void* operator new(size_t,void* anAddress) 
-$   {
-$     return anAddress;
-$   }
-$ void* operator new(size_t size) 
-$   { 
-$     return StandardCSFDB_Allocate(size); 
-$   }
-$ void  operator delete(void *anAddress) 
-$      { 
-$        if (anAddress) StandardCSFDB_Free((Standard_Address&)anAddress); 
-$      }
 $
 $ // Methods PUBLIC
 $ // 
@@ -136,9 +121,8 @@ $%TICPublicfriends
 $
 $ // Type management
 $ //
-$ Standard_EXPORT friend Handle_Standard_Type& %Class_Type_();
 $ Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
-$ Standard_EXPORT Standard_Boolean            IsKind(const Handle(Standard_Type)&) const;
+$// Standard_EXPORT Standard_Boolean          IsKind(const Handle(Standard_Type)&) const;
 $
 $protected:
 $