[BACK]Return to gc_cpp.cc CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / gc

Diff for /OpenXM_contrib2/asir2000/gc/gc_cpp.cc between version 1.3 and 1.4

version 1.3, 2002/07/24 07:46:17 version 1.4, 2002/07/24 08:00:09
Line 26  Authors: John R. Ellis and Jesse Hull
Line 26  Authors: John R. Ellis and Jesse Hull
   
 #include "gc_cpp.h"  #include "gc_cpp.h"
   
 #ifndef _MSC_VER  
 /* In the Visual C++ case, we moved this into the header. */  
 void* operator new( size_t size ) {  void* operator new( size_t size ) {
     return GC_MALLOC_UNCOLLECTABLE( size );}      return GC_MALLOC_UNCOLLECTABLE( size );}
   
 void operator delete( void* obj ) {  void operator delete( void* obj ) {
     GC_FREE( obj );}      GC_FREE( obj );}
   
 #ifdef OPERATOR_NEW_ARRAY  #ifdef GC_OPERATOR_NEW_ARRAY
   
 void* operator new[]( size_t size ) {  void* operator new[]( size_t size ) {
     return GC_MALLOC_UNCOLLECTABLE( size );}      return GC_MALLOC_UNCOLLECTABLE( size );}
Line 42  void* operator new[]( size_t size ) {
Line 40  void* operator new[]( size_t size ) {
 void operator delete[]( void* obj ) {  void operator delete[]( void* obj ) {
     GC_FREE( obj );}      GC_FREE( obj );}
   
 #endif /* OPERATOR_NEW_ARRAY */  #endif /* GC_OPERATOR_NEW_ARRAY */
   
 #endif /* _MSC_VER */  #ifdef _MSC_VER
   
   // This new operator is used by VC++ in case of Debug builds !
   void* operator new( size_t size,
                             int ,//nBlockUse,
                             const char * szFileName,
                             int nLine )
   {
   #ifndef GC_DEBUG
           return GC_malloc_uncollectable( size );
   #else
           return GC_debug_malloc_uncollectable(size, szFileName, nLine);
   #endif
   }
   
   #endif /* _MSC_VER */
   

Legend:
Removed from v.1.3  
changed lines
  Added in v.1.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>