diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-05-21 08:35:14 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-05-21 08:35:14 +0000 |
| commit | f8c1da573b1b2b72501630f18fc1452e6b9e9c0c (patch) | |
| tree | 67e9db3b367c46dfbcccda8278d06da72494187d /boehm-gc/gc_cpp.cc | |
| parent | 1826adcc0c69a1dd8d750b1bf7cb5657d8403ae1 (diff) | |
| download | ppe42-gcc-f8c1da573b1b2b72501630f18fc1452e6b9e9c0c.tar.gz ppe42-gcc-f8c1da573b1b2b72501630f18fc1452e6b9e9c0c.zip | |
Imported version version 6.0alpha7.
* README, README.Mac, README.OS2, README.QUICK, README.alpha,
README.amiga, README.debugging, README.dj, README.hp, README.linux,
README.rs6000, README.sgi, README.solaris2, README.uts,
README.win32, SCoptions.amiga, backptr.h, barrett_diagram,
dbg_mlc.h, gc.h, gc.man, gc_alloc.h, gc_cpp.h, gc_hdrs.h, gc_mark.h,
gc_priv.h, gc_private.h, gc_typed.h, gcconfig.h,
hpux_irix_threads.c, makefile.depend, nursery.c,
solaris_threads.h, test.c, test_cpp.cc, weakpointer.h, cord/README,
cord/SCOPTIONS.amiga, cord/SMakefile.amiga, cord/cord.h,
cord/ec.h, cord/gc.h, cord/private/cord_pos.h, include/backptr.h,
include/gc_copy_descr.h, include/gc_nursery.h: Remove obsolete/moved
files.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42379 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'boehm-gc/gc_cpp.cc')
| -rw-r--r-- | boehm-gc/gc_cpp.cc | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/boehm-gc/gc_cpp.cc b/boehm-gc/gc_cpp.cc index 547c56f96a1..a97091c817c 100644 --- a/boehm-gc/gc_cpp.cc +++ b/boehm-gc/gc_cpp.cc @@ -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 */ + |
