X-Git-Url: http://git.dev.opencascade.org/gitweb/?p=occt.git;a=blobdiff_plain;f=src%2FStandard%2FStandard_Persistent_proto.hxx;h=1867e7276c747854a621d0027f879e7ccff531d0;hp=cc8e68708793253f94e4528992b71e7f62584456;hb=5640d65355d1da3f48c9e3b3b7c5e4114b70f050;hpb=34781c33afbed361417a1f378a301a6bc55d9960

diff --git a/src/Standard/Standard_Persistent_proto.hxx b/src/Standard/Standard_Persistent_proto.hxx
old mode 100755
new mode 100644
index cc8e687087..1867e7276c
--- a/src/Standard/Standard_Persistent_proto.hxx
+++ b/src/Standard/Standard_Persistent_proto.hxx
@@ -1,9 +1,26 @@
+// Copyright (c) 1998-1999 Matra Datavision
+// Copyright (c) 1999-2014 OPEN CASCADE SAS
+//
+// This file is part of Open CASCADE Technology software library.
+//
+// This library is free software; you can redistribute it and / or modify it
+// under the terms of the GNU Lesser General Public version 2.1 as published
+// by the Free Software Foundation, with special exception defined in the file
+// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+// distribution for complete text of the license and disclaimer of any warranty.
+//
+// Alternatively, this file may be used under the terms of Open CASCADE
+// commercial license or contractual agreement.
+
 #ifndef _Standard_Persistent_proto_HeaderFile
 #define _Standard_Persistent_proto_HeaderFile
 
 #ifndef _Standard_Macro_HeaderFile
 #include <Standard_Macro.hxx>
 #endif
+#ifndef _Standard_DefineAlloc_HeaderFile
+#include <Standard_DefineAlloc.hxx>
+#endif
 #ifndef _Standard_PrimitiveTypes_HeaderFile
 #include <Standard_PrimitiveTypes.hxx>
 #endif
@@ -17,8 +34,6 @@ class Handle_Standard_Type;
 class Standard_Type;
 
 class Storage_stCONSTclCOM;
-Standard_EXPORT Standard_Address StandardCSFDB_Allocate(const Standard_Size);
-Standard_EXPORT void StandardCSFDB_Free(Standard_Address&);
 Standard_EXPORT const Handle_Standard_Type& Standard_Persistent_Type_();
 
 class Standard_Persistent
@@ -31,28 +46,17 @@ private:
   Standard_Integer _typenum;
   Standard_Integer _refnum;
 public:
-  // MEMORY MANAGER
-  //
-  void*   operator new (size_t s) {
-    return StandardCSFDB_Allocate(s);
-  }
-
-  void    operator delete (void* p) {
-    StandardCSFDB_Free(p);
-  }
-
-  void* operator new(size_t,void* anAddress) {
-    return anAddress;
-  }
- 
+  
+  DEFINE_STANDARD_ALLOC
+
   Standard_EXPORT virtual Handle_Standard_Persistent This() const;
   Standard_EXPORT virtual Handle_Standard_Persistent ShallowCopy () const;
   Standard_EXPORT virtual void Delete() const;
   Standard_EXPORT virtual ~Standard_Persistent();
   
   Standard_EXPORT Standard_Persistent& operator= (const Standard_Persistent&);
-                  Standard_Persistent() : count(0),_typenum(0),_refnum(0) {};
-                  Standard_Persistent(const Standard_Persistent&) : count(0),_typenum(0),_refnum(0) {};
+                  Standard_Persistent() : count(0),_typenum(0),_refnum(0) {}
+                  Standard_Persistent(const Standard_Persistent&) : count(0),_typenum(0),_refnum(0) {}
                   Standard_Persistent(const Storage_stCONSTclCOM&) : count(0),_typenum(0),_refnum(0) {}
 
   Standard_EXPORT virtual const Handle_Standard_Type& DynamicType() const;