=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/gc/include/new_gc_alloc.h,v retrieving revision 1.3 retrieving revision 1.6 diff -u -p -r1.3 -r1.6 --- OpenXM_contrib2/asir2000/gc/include/new_gc_alloc.h 2001/04/20 07:39:25 1.3 +++ OpenXM_contrib2/asir2000/gc/include/new_gc_alloc.h 2003/06/24 05:11:41 1.6 @@ -50,7 +50,28 @@ #ifndef GC_ALLOC_H #include "gc.h" -#include // A more portable way to get stl_alloc.h . + +#if (__GNUC__ < 3) +# include // A more portable way to get stl_alloc.h . +#else +# include +# ifndef __STL_BEGIN_NAMESPACE +# define __STL_BEGIN_NAMESPACE namespace std { +# define __STL_END_NAMESPACE }; +# endif +#ifndef __STL_USE_STD_ALLOCATORS +#define __STL_USE_STD_ALLOCATORS +#endif +#endif + +/* A hack to deal with gcc 3.1. If you are using gcc3.1 and later, */ +/* you should probably really use gc_allocator.h instead. */ +#if defined (__GNUC__) && \ + (__GNUC > 3 || (__GNUC__ == 3 && (__GNUC_MINOR__ >= 1))) +# define simple_alloc __simple_alloc +#endif + + #define GC_ALLOC_H