=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/gc/Attic/test_cpp.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -p -r1.1.1.1 -r1.2 --- OpenXM_contrib2/asir2000/gc/Attic/test_cpp.cc 1999/12/03 07:39:10 1.1.1.1 +++ OpenXM_contrib2/asir2000/gc/Attic/test_cpp.cc 2000/12/01 09:26:13 1.2 @@ -37,6 +37,12 @@ extern "C" { #ifdef MSWIN32 # include #endif +#ifdef GC_NAME_CONFLICT +# define USE_GC UseGC + struct foo * GC; +#else +# define USE_GC GC +#endif #define my_assert( e ) \ @@ -214,7 +220,7 @@ int APIENTRY WinMain( for (i = 0; i < 1000; i++) { C* c = new C( 2 ); C c1( 2 ); /* stack allocation should work too */ - D* d = ::new (GC, D::CleanUp, (void*) i) D( i ); + D* d = ::new (USE_GC, D::CleanUp, (void*) i) D( i ); F* f = new F; if (0 == i % 10) delete c;} @@ -222,9 +228,9 @@ int APIENTRY WinMain( drop the references to them immediately, forcing many collections. */ for (i = 0; i < 1000000; i++) { - A* a = new (GC) A( i ); + A* a = new (USE_GC) A( i ); B* b = new B( i ); - b = new (GC) B( i ); + b = new (USE_GC) B( i ); if (0 == i % 10) { B::Deleting( 1 ); delete b;