diff options
Diffstat (limited to 'ace/config-g++-common.h')
| -rw-r--r-- | ace/config-g++-common.h | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/ace/config-g++-common.h b/ace/config-g++-common.h index 46de4084b34..d3d1bd384da 100644 --- a/ace/config-g++-common.h +++ b/ace/config-g++-common.h @@ -11,11 +11,21 @@ #if __GNUC__ > 2 || ( __GNUC__ == 2 && __GNUC_MINOR__ >= 8) // egcs or g++ >= 2.8.0 -# define ACE_HAS_ANSI_CASTS -# define ACE_HAS_CPLUSPLUS_HEADERS -# define ACE_HAS_STDCPP_STL_INCLUDES -# define ACE_HAS_TEMPLATE_TYPEDEFS -# define ACE_HAS_TYPENAME_KEYWORD +# if __GNUC__ == 2 && __GNUC_MINOR__ >= 90 + // egcs or really modern g++. Do these work with g++ 2.8.0? +# define ACE_HAS_ANSI_CASTS +# define ACE_HAS_CPLUSPLUS_HEADERS +# define ACE_HAS_STDCPP_STL_INCLUDES +# define ACE_HAS_TEMPLATE_TYPEDEFS +# define ACE_HAS_TYPENAME_KEYWORD +# else + // Let's find out +# define ACE_HAS_ANSI_CASTS +# define ACE_HAS_CPLUSPLUS_HEADERS +# define ACE_HAS_STDCPP_STL_INCLUDES +# define ACE_HAS_TEMPLATE_TYPEDEFS +# define ACE_HAS_TYPENAME_KEYWORD +# endif /* __GNUC__ >= 2.90 */ # if __GNUC__ == 2 && __GNUC_MINOR__ >= 91 # define ACE_HAS_USING_KEYWORD @@ -42,10 +52,6 @@ # define ACE_HAS_EXCEPTIONS # endif /* __EXCEPTIONS && ! ACE_HAS_EXCEPTIONS */ -# if defined (ACE_HAS_EXCEPTIONS) -# define ACE_NEW_THROWS_EXCEPTIONS -# endif /* ACE_HAS_EXCEPTIONS */ - #else /* ! egcs */ // Plain old g++. # define ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES @@ -59,10 +65,10 @@ #if defined (i386) || defined (__i386__) // If running an Intel, assume that it's a Pentium so that - // ACE_OS::gethrtime () can use the RDTSC instruction. If running a - // 486 or lower, be sure to comment this out. (If not running an - // Intel CPU, this #define will not be seen because of the i386 - // protection, so it can be ignored.) + // ACE_OS::gethrtime () can use the RDTSC instruction. If + // running a 486 or lower, be sure to comment this out. + // (If not running an Intel CPU, this #define will not be seen + // because of the i386 protection, so it can be ignored.) # define ACE_HAS_PENTIUM #endif /* i386 */ |