diff options
Diffstat (limited to 'ACE/ace/config-icc-common.h')
| -rw-r--r-- | ACE/ace/config-icc-common.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/ACE/ace/config-icc-common.h b/ACE/ace/config-icc-common.h index 7d66c02ac6e..6d1f1ff58d3 100644 --- a/ACE/ace/config-icc-common.h +++ b/ACE/ace/config-icc-common.h @@ -8,7 +8,6 @@ # define ACE_HAS_CPLUSPLUS_HEADERS # define ACE_HAS_STDCPP_STL_INCLUDES -# define ACE_HAS_TEMPLATE_TYPEDEFS # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 @@ -61,18 +60,7 @@ # define ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) __extension__ extern template class SINGLETON_TYPE<CLASS, LOCK>; #endif /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */ -// __EXCEPTIONS is defined with -fexceptions, the egcs default. It -// is not defined with -fno-exceptions, the ACE default for g++. -// ACE_HAS_EXCEPTIONS is defined in -// include/makeinclude/wrapper_macros.GNU, so this really isn't -// necessary. Just in case . . . -# if defined (__EXCEPTIONS) && !defined (ACE_HAS_EXCEPTIONS) -# define ACE_HAS_EXCEPTIONS -# endif /* __EXCEPTIONS && ! ACE_HAS_EXCEPTIONS */ - -# if defined (ACE_HAS_EXCEPTIONS) -# define ACE_NEW_THROWS_EXCEPTIONS -# endif /* ACE_HAS_EXCEPTIONS */ +#define ACE_NEW_THROWS_EXCEPTIONS #if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE) # define ACE_SIZEOF_LONG_DOUBLE 12 |