diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-11-01 23:15:51 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-11-01 23:15:51 +0000 |
| commit | 9bc8642e1f366a35c305b9abe9e01bf934b584b9 (patch) | |
| tree | 9c24ba1ebabff472b9caddbff07ef957dbf2c24c /boehm-gc/gc_cpp.cc | |
| parent | 79eaf784f16b0e8079d9dca062a0fc959d289d18 (diff) | |
| download | gcc-9bc8642e1f366a35c305b9abe9e01bf934b584b9.tar.gz | |
Merged GC 5.0alpha4 with local changes, plus:
* Makefile.in: Rebuilt.
* Makefile.am (gctest_LDADD): Added THREADLIB.
(TESTS): New macro.
* configure: Rebuilt.
* configure.in (INCLUDES): New subst.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@30332 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'boehm-gc/gc_cpp.cc')
| -rw-r--r-- | boehm-gc/gc_cpp.cc | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/boehm-gc/gc_cpp.cc b/boehm-gc/gc_cpp.cc index a766a01a328..547c56f96a1 100644 --- a/boehm-gc/gc_cpp.cc +++ b/boehm-gc/gc_cpp.cc @@ -32,6 +32,20 @@ void* operator new( size_t 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 |