diff options
author | Ivan Maidanski <ivmai@mail.ru> | 2011-07-26 16:56:55 +0400 |
---|---|---|
committer | Ivan Maidanski <ivmai@mail.ru> | 2011-07-26 17:03:41 +0400 |
commit | 9f27ae7aee7a12b3c99d0ce7dc4c7384e3189fa2 (patch) | |
tree | c22825cb48bbafbb34e67ef1900280e4d1d7aded /gc_cpp.cc | |
parent | 29be14a4aa2f73bf89396e50e5f5322fa9264b00 (diff) | |
download | bdwgc-9f27ae7aee7a12b3c99d0ce7dc4c7384e3189fa2.tar.gz |
gc6.0 tarball importgc6_0
Diffstat (limited to 'gc_cpp.cc')
-rw-r--r-- | gc_cpp.cc | 19 |
1 files changed, 4 insertions, 15 deletions
@@ -26,27 +26,14 @@ Authors: John R. Ellis and Jesse Hull #include "gc_cpp.h" +#ifndef _MSC_VER +/* In the Visual C++ case, we moved this into the header. */ void* operator new( size_t size ) { return GC_MALLOC_UNCOLLECTABLE( size );} void operator delete( void* obj ) { GC_FREE( obj );} -#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 - #ifdef OPERATOR_NEW_ARRAY void* operator new[]( size_t size ) { @@ -57,4 +44,6 @@ void operator delete[]( void* obj ) { #endif /* OPERATOR_NEW_ARRAY */ +#endif /* _MSC_VER */ + |