diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-08-05 08:29:30 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-08-05 08:29:30 +0000 |
| commit | feb5365130ff6351d5b08caa333fb96001aec132 (patch) | |
| tree | 15c34167a452dafaf428ca52ccaba65fe9e93630 | |
| parent | 8aa0970323254155175a4e4d2632382db3336c6f (diff) | |
| download | ATCD-feb5365130ff6351d5b08caa333fb96001aec132.tar.gz | |
Thu Aug 5 08:13:51 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/CORBA_macros.h:
* ace/Global_Macros.h:
* ace/Vector_T.h:
* ace/ace_wchar.h:
* ace/config-cxx-common.h:
* ace/config-doxygen.h:
* ace/config-g++-common.h:
* ace/config-hpux-11.00.h:
* ace/config-icc-common.h:
* ace/config-integritySCA.h:
* ace/config-macros.h:
* ace/config-netbsd.h:
* ace/config-openvms.h:
* ace/config-suncc-common.h:
* ace/config-sunos5.4-sunc++-4.x.h:
* ace/config-sunos5.5.h:
* ace/config-tandem-nsk-mips-v2.h:
* ace/config-tandem-nsk-mips-v3.h:
* ace/config-unixware-7.1.0.h:
* ace/config-unixware-7.1.0.udk.h:
* ace/config-win32-borland.h:
* ace/config-win32-dmc.h:
* ace/config-win32-ghs.h:
* ace/config-win32-interix.h:
* ace/config-win32-msvc-10.h:
* ace/config-win32-msvc-7.h:
* ace/config-win32-msvc-8.h:
* ace/config-win32-msvc-9.h:
* include/makeinclude/platform_aix.GNU:
* include/makeinclude/platform_aix_g++.GNU:
* include/makeinclude/platform_aix_ibm.GNU:
* include/makeinclude/platform_cray.GNU:
* include/makeinclude/platform_freebsd.GNU:
* include/makeinclude/platform_gnuwin32_common.GNU:
* include/makeinclude/platform_hpux_aCC.GNU:
* include/makeinclude/platform_hpux_gcc.GNU:
* include/makeinclude/platform_integrity_ghs.GNU:
* include/makeinclude/platform_irix6.x_common.GNU:
* include/makeinclude/platform_linux_common.GNU:
* include/makeinclude/platform_lynxos.GNU:
* include/makeinclude/platform_macosx.GNU:
* include/makeinclude/platform_macosx_common.GNU:
* include/makeinclude/platform_macosx_icc.GNU:
* include/makeinclude/platform_macosx_panther.GNU:
* include/makeinclude/platform_netbsd.GNU:
* include/makeinclude/platform_openbsd.GNU:
* include/makeinclude/platform_openvms.GNU:
* include/makeinclude/platform_qnx_rtp_gcc.GNU:
* include/makeinclude/platform_rtems.x_g++.GNU:
* include/makeinclude/platform_sunos5_g++.GNU:
* include/makeinclude/platform_sunos5_sunc++.GNU:
* include/makeinclude/platform_tandem.GNU:
* include/makeinclude/platform_tru64_cxx.GNU:
* include/makeinclude/platform_tru64_g++.GNU:
* include/makeinclude/platform_unixware_g++.GNU:
* include/makeinclude/platform_vxworks5.5.x.GNU:
* include/makeinclude/platform_vxworks6.2.GNU:
* include/makeinclude/platform_vxworks6.3.GNU:
* include/makeinclude/platform_win32_dmc.GNU:
* include/makeinclude/platform_win32_icc.GNU:
* include/makeinclude/platform_win32_interix.GNU:
* include/makeinclude/wrapper_macros.GNU:
* tests/Bug_3673_Regression_Test.cpp:
* tests/Reactor_Exceptions_Test.cpp:
Removed support for non exception builds, ACE_HAS_EXCEPTIONS is
now always defined
* rpmbuild/ace-tao.spec:
Small updates
* ace/Exception_Macros.h:
* bin/MakeProjectCreator/config/exceptions.mpb:
Removed these files.
69 files changed, 114 insertions, 683 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 819dae97a2a..1d7729e45fd 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,81 @@ +Thu Aug 5 08:13:51 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * ace/CORBA_macros.h: + * ace/Global_Macros.h: + * ace/Vector_T.h: + * ace/ace_wchar.h: + * ace/config-cxx-common.h: + * ace/config-doxygen.h: + * ace/config-g++-common.h: + * ace/config-hpux-11.00.h: + * ace/config-icc-common.h: + * ace/config-integritySCA.h: + * ace/config-macros.h: + * ace/config-netbsd.h: + * ace/config-openvms.h: + * ace/config-suncc-common.h: + * ace/config-sunos5.4-sunc++-4.x.h: + * ace/config-sunos5.5.h: + * ace/config-tandem-nsk-mips-v2.h: + * ace/config-tandem-nsk-mips-v3.h: + * ace/config-unixware-7.1.0.h: + * ace/config-unixware-7.1.0.udk.h: + * ace/config-win32-borland.h: + * ace/config-win32-dmc.h: + * ace/config-win32-ghs.h: + * ace/config-win32-interix.h: + * ace/config-win32-msvc-10.h: + * ace/config-win32-msvc-7.h: + * ace/config-win32-msvc-8.h: + * ace/config-win32-msvc-9.h: + + * include/makeinclude/platform_aix.GNU: + * include/makeinclude/platform_aix_g++.GNU: + * include/makeinclude/platform_aix_ibm.GNU: + * include/makeinclude/platform_cray.GNU: + * include/makeinclude/platform_freebsd.GNU: + * include/makeinclude/platform_gnuwin32_common.GNU: + * include/makeinclude/platform_hpux_aCC.GNU: + * include/makeinclude/platform_hpux_gcc.GNU: + * include/makeinclude/platform_integrity_ghs.GNU: + * include/makeinclude/platform_irix6.x_common.GNU: + * include/makeinclude/platform_linux_common.GNU: + * include/makeinclude/platform_lynxos.GNU: + * include/makeinclude/platform_macosx.GNU: + * include/makeinclude/platform_macosx_common.GNU: + * include/makeinclude/platform_macosx_icc.GNU: + * include/makeinclude/platform_macosx_panther.GNU: + * include/makeinclude/platform_netbsd.GNU: + * include/makeinclude/platform_openbsd.GNU: + * include/makeinclude/platform_openvms.GNU: + * include/makeinclude/platform_qnx_rtp_gcc.GNU: + * include/makeinclude/platform_rtems.x_g++.GNU: + * include/makeinclude/platform_sunos5_g++.GNU: + * include/makeinclude/platform_sunos5_sunc++.GNU: + * include/makeinclude/platform_tandem.GNU: + * include/makeinclude/platform_tru64_cxx.GNU: + * include/makeinclude/platform_tru64_g++.GNU: + * include/makeinclude/platform_unixware_g++.GNU: + * include/makeinclude/platform_vxworks5.5.x.GNU: + * include/makeinclude/platform_vxworks6.2.GNU: + * include/makeinclude/platform_vxworks6.3.GNU: + * include/makeinclude/platform_win32_dmc.GNU: + * include/makeinclude/platform_win32_icc.GNU: + * include/makeinclude/platform_win32_interix.GNU: + * include/makeinclude/wrapper_macros.GNU: + + * rpmbuild/ace-tao.spec: + + * tests/Bug_3673_Regression_Test.cpp: + * tests/Reactor_Exceptions_Test.cpp: + * tests/tests.mpc: + + * ace/Exception_Macros.h: + + * bin/MakeProjectCreator/config/exceptions.mpb: + + Removed these files. + Thu Aug 5 07:40:00 UTC 2010 Build CZar <buildczar at prismtech dot com> * ace/OS_NS_Thread.cpp: diff --git a/ACE/ace/CORBA_macros.h b/ACE/ace/CORBA_macros.h index 22ded9a54b3..af2f2ccb598 100644 --- a/ACE/ace/CORBA_macros.h +++ b/ACE/ace/CORBA_macros.h @@ -30,10 +30,6 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#define ACE_ENV_POLLUTE_NAMES - -#include "ace/Exception_Macros.h" - // The Windows MFC exception mechanism requires that a caught CException // (including the CMemoryException in use here) be freed using its Delete() // method. Thus, when MFC is in use and we're catching exceptions as a result @@ -450,126 +446,6 @@ ACE_Write_Guard< MUTEX > OBJ (LOCK); \ if (OBJ.locked () == 0) throw EXCEPTION; -#if !defined (ACE_LACKS_DEPRECATED_MACROS) - -//@{ -/** - * @name Native C++ exceptions portability macros. - * - * The following macros are used to write code portable between platforms - * with and without native C++ exception support. Their main goal is to - * hide the presence of the ACE_ENV_TYPE argument, but they collaborate - * with the ACE_TRY_* macros to emulate the try/catch blocks. - */ - -/// Define a macro to emit code only when ACE_ENV_TYPE is used -#if !defined (ACE_USES_NATIVE_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT) -# define ACE_ENV_EMIT_CODE(X) X -#else -# define ACE_ENV_EMIT_CODE(X) -#endif /* ACE_USES_NATIVE_EXCEPTIONS && ! ACE_ENV_BKWD_COMPAT */ - -/// Another macro to emit code only when ACE_ENV_TYPE is used -#if !defined (ACE_USES_NATIVE_EXCEPTIONS) || defined (ACE_ENV_BKWD_COMPAT) -# define ACE_ENV_EMIT_CODE2(X,Y) X,Y -#else -# define ACE_ENV_EMIT_CODE2(X,Y) -#endif /* ACE_USES_NATIVE_EXCEPTIONS && ! ACE_ENV_BKWD_COMPAT */ - -/// Helper macro -#define ACE_ENV_EMIT_DUMMY - -/// Declare a ACE_ENV_TYPE argument as the last argument of a -/// function -/** - * Normally this macro is used as follows: - * - * <CODE>void my_funct (int x, int y ACE_ENV_ARG_DECL);</CODE> - * - * Its purpose is to provide developers (and users) with a mechanism to - * write code that is portable to platforms with and without native C++ - * exceptions. - */ -#define ACE_ENV_ARG_DECL \ - ACE_ENV_EMIT_CODE2(ACE_ENV_EMIT_DUMMY, \ - ACE_ENV_TYPE &ACE_TRY_ENV) - -/// Declare a ACE_ENV_TYPE argument with the default value obtained from -/// the ORB/application. -/** - * It is similar to ACE_ENV_ARG_DECL. The name of the default environment - * getter method needs to be changed when switching ORBs or when used with - * another application. - */ -#define ACE_ENV_ARG_DECL_WITH_DEFAULTS \ - ACE_ENV_EMIT_CODE2(ACE_ENV_EMIT_DUMMY, \ - ACE_ENV_TYPE &ACE_TRY_ENV = \ - ACE_DEFAULT_GET_ENV_METHOD ()) - -/// Declare a ACE_ENV_TYPE argument that is not used by the -/// function definition. -/** - * Similar to ACE_ENV_ARG_DECL, but the formal parameter name is dropped to - * avoid warnings about unused parameters - */ -#define ACE_ENV_ARG_DECL_NOT_USED \ - ACE_ENV_EMIT_CODE2(ACE_ENV_EMIT_DUMMY, \ - ACE_ENV_TYPE &) - -/// Declare a ACE_ENV_TYPE argument for methods that do not take any other -/// parameters -#define ACE_ENV_SINGLE_ARG_DECL \ - ACE_ENV_EMIT_CODE(ACE_ENV_TYPE &ACE_TRY_ENV) - -/// Declare a ACE_ENV_TYPE argument with a default value for methods that -/// do not take any other parameters. The name of the default environment -/// getter method needs to be changed when switching ORBs or when used in -/// another application. -#define ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS \ - ACE_ENV_EMIT_CODE(ACE_ENV_TYPE &ACE_TRY_ENV = \ - ACE_DEFAULT_GET_ENV_METHOD ()) - -/// Declare a ACE_ENV_TYPE argument for methods which don't use it. -#define ACE_ENV_SINGLE_ARG_DECL_NOT_USED \ - ACE_ENV_EMIT_CODE(ACE_ENV_TYPE &) - -/// Use the ACE_ENV_TYPE argument in a nested call -#define ACE_ENV_ARG_PARAMETER \ - ACE_ENV_EMIT_CODE2(ACE_ENV_EMIT_DUMMY, \ - ACE_TRY_ENV) - -/// Use the ACE_ENV_TYPE argument in a nested call, assuming that the -/// called function takes only the ACE_TRY_ENV argument. -#define ACE_ENV_SINGLE_ARG_PARAMETER \ - ACE_ENV_EMIT_CODE(ACE_TRY_ENV) - -/// Eliminate unused argument warnings about ACE_TRY_ENV -#define ACE_ENV_ARG_NOT_USED \ - ACE_ENV_EMIT_CODE(ACE_UNUSED_ARG(ACE_TRY_ENV)) -//@} - -#if !defined (ACE_USES_NATIVE_EXCEPTIONS) -// This thing can be moved above when we drop ACE_ENV_BKWD_COMPAT. -# define ACE_ENV_RAISE(ex) ACE_TRY_ENV.exception (ex) -#else -# define ACE_ENV_RAISE(ex) (ex)->_raise () -#endif /* ACE_USES_NATIVE_EXCEPTIONS */ - -// ============================================================ - -// Print out a TAO exception. This is not CORBA compliant. -# define ACE_PRINT_TAO_EXCEPTION(EX,INFO) \ - EX._tao_print_exception (INFO) - -// Print out a CORBA exception. There is not portable way to -// dump a CORBA exception. If you are using other ORB implementation, -// redefine the macro to get what you want. -# if !defined ACE_PRINT_EXCEPTION -# define ACE_PRINT_EXCEPTION(EX,INFO) ACE_PRINT_TAO_EXCEPTION(EX,INFO) -# endif /* ACE_PRINT_EXCEPTION */ - -#endif /* !ACE_LACKS_DEPRECATED_MACROS */ - #include /**/ "ace/post.h" #endif /* ACE_CORBA_MACROS_H */ diff --git a/ACE/ace/Exception_Macros.h b/ACE/ace/Exception_Macros.h deleted file mode 100644 index 7efc532f93a..00000000000 --- a/ACE/ace/Exception_Macros.h +++ /dev/null @@ -1,55 +0,0 @@ -// -*- C++ -*- - -// ============================================================================ -/** - * @file Exception_Macros.h - * - * $Id$ - * - * Writing code that is portable between platforms with or without - * native C++ exceptions is hard. The following macros offer some - * help on this task. - * - * @author Nanbor Wang <nanbor@cs.wustl.edu> - * @author Aniruddha Gokhale <gokhale@sahyadri.research.bell-labs.com> - * @author Carlos O'Ryan <coryan@uci.edu> - * @author Krishnakumar B <kitty@cs.wustl.edu>, et al. - */ -// ============================================================================ - -// Macros for handling exceptions. - -#ifndef ACE_EXCEPTION_MACROS_H -#define ACE_EXCEPTION_MACROS_H - -#include /**/ "ace/pre.h" - -#include /**/ "ace/config-all.h" - -# if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -# endif /* ACE_LACKS_PRAGMA_ONCE */ - -// By default, if the compiler supports native exception handling, assume -// CORBA also support native exception handling. But it can be disabled by -// defining ACE_CORBA_HAS_EXCEPTIONS=0. If the compiler does not support -// exceptions handling, make sure native exception handling is disabled. -#if defined (ACE_HAS_EXCEPTIONS) -# if defined (ACE_CORBA_HAS_EXCEPTIONS) -# if (ACE_CORBA_HAS_EXCEPTIONS == 0) -# undef ACE_USES_NATIVE_EXCEPTIONS -# else /* ACE_CORBA_HAS_EXCEPTIONS != 0 */ -# define ACE_USES_NATIVE_EXCEPTIONS -# endif /* ACE_CORBA_HAS_EXCEPTIONS == 0 */ -# else -# define ACE_USES_NATIVE_EXCEPTIONS -# define ACE_CORBA_HAS_EXCEPTIONS -# endif /* ACE_CORBA_HAS_EXCEPTIONS */ -#else /* ! ACE_HAS_EXCEPTIONS */ -# undef ACE_CORBA_HAS_EXCEPTIONS -# undef ACE_USES_NATIVE_EXCEPTIONS -#endif /* ACE_HAS_EXCEPTIONS */ - -#include /**/ "ace/post.h" - -#endif /* ACE_EXCEPTION_MACROS_H */ diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index 458c909a9ff..fa1f2c69283 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -104,64 +104,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL # define ACE_UNIMPLEMENTED_FUNC(f) f; # endif /* ACE_NEEDS_FUNC_DEFINITIONS */ -#if !defined (ACE_LACKS_DEPRECATED_MACROS) - // Easy way to designate that a class is used as a pseudo-namespace. - // Insures that g++ "friendship" anamolies are properly handled. - # define ACE_CLASS_IS_NAMESPACE(CLASSNAME) \ - private: \ - CLASSNAME (void); \ - CLASSNAME (const CLASSNAME&); \ - friend class ace_dewarn_gplusplus -#endif /* ACE_LACKS_DEPRECATED_MACROS */ - -// ---------------------------------------------------------------- - -//FUZZ: disable check_for_exception_sepc -#if !defined (ACE_LACKS_DEPRECATED_MACROS) - #if defined (ACE_HAS_NO_THROW_SPEC) - # define ACE_THROW_SPEC(X) - #else - # if defined (ACE_HAS_EXCEPTIONS) - # if defined (ACE_WIN32) && defined (_MSC_VER) && \ - (_MSC_VER >= 1400) && (_MSC_VER <= 1500) - # define ACE_THROW_SPEC(X) throw(...) - # else - # define ACE_THROW_SPEC(X) throw X - # endif /* ACE_WIN32 && VC8 */ - # else /* ! ACE_HAS_EXCEPTIONS */ - # define ACE_THROW_SPEC(X) - # endif /* ! ACE_HAS_EXCEPTIONS */ - #endif /*ACE_HAS_NO_THROW_SPEC*/ -#endif /* ACE_LACKS_DEPRECATED_MACROS */ -//FUZZ: enable check_for_exception_sepc - -// ---------------------------------------------------------------- - -#if !defined (ACE_LACKS_DEPRECATED_MACROS) - /** - * This macro is deprecated - */ - #define ACE_NESTED_CLASS(TYPE, NAME) TYPE::NAME -#endif /* ACE_LACKS_DEPRECATED_MACROS */ - -#if !defined (ACE_LACKS_DEPRECATED_MACROS) - /** - * @name CORBA namespace macros. - * - * CORBA namespace macros. - * - * @deprecated These macros were formerly used by TAO but are now - * deprecated, and only remain to retain some backward - * compatibility. They will be removed in a future ACE - * release. - */ - //@{ - #define ACE_CORBA_1(NAME) CORBA::NAME - #define ACE_CORBA_2(TYPE, NAME) CORBA::TYPE::NAME - #define ACE_CORBA_3(TYPE, NAME) CORBA::TYPE::NAME - //@} -#endif /* ACE_LACKS_DEPRECATED_MACROS */ - // ---------------------------------------------------------------- // Convenient macro for testing for deadlock, as well as for detecting diff --git a/ACE/ace/Vector_T.h b/ACE/ace/Vector_T.h index 0327c07beff..fac8683117b 100644 --- a/ACE/ace/Vector_T.h +++ b/ACE/ace/Vector_T.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "ace/Array.h" +#include "ace/Containers_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/ACE/ace/ace_wchar.h b/ACE/ace/ace_wchar.h index a985f5cc28a..892863a6ca8 100644 --- a/ACE/ace/ace_wchar.h +++ b/ACE/ace/ace_wchar.h @@ -123,9 +123,6 @@ using std::size_t; typedef wchar_t ACE_TCHAR; typedef char ACE_ANTI_TCHAR; # define ACE_TEXT(STRING) ACE_TEXT_WIDE (STRING) -# if !defined (ACE_LACKS_DEPRECATED_MACROS) -# define ACE_LIB_TEXT(STRING) ACE_TEXT_WIDE (STRING) -# endif # define ACE_TEXT_ALWAYS_CHAR(STRING) ACE_Wide_To_Ascii (STRING).char_rep () # define ACE_TEXT_ALWAYS_WCHAR(STRING) STRING # define ACE_TEXT_CHAR_TO_TCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep () @@ -135,9 +132,6 @@ typedef char ACE_ANTI_TCHAR; typedef char ACE_TCHAR; typedef wchar_t ACE_ANTI_TCHAR; # define ACE_TEXT(STRING) STRING -# if !defined (ACE_LACKS_DEPRECATED_MACROS) -# define ACE_LIB_TEXT(STRING) STRING -# endif # define ACE_TEXT_ALWAYS_CHAR(STRING) STRING # define ACE_TEXT_ALWAYS_WCHAR(STRING) ACE_Ascii_To_Wide (STRING).wchar_rep () # define ACE_TEXT_CHAR_TO_TCHAR(STRING) STRING diff --git a/ACE/ace/config-cxx-common.h b/ACE/ace/config-cxx-common.h index 8c6b727502c..f096788984d 100644 --- a/ACE/ace/config-cxx-common.h +++ b/ACE/ace/config-cxx-common.h @@ -27,9 +27,7 @@ # if (__DECCXX_VER >= 60090010) // DEC CXX 6.0 supports exceptions, etc., by default. Exceptions // are enabled by platform_osf1_4.x.GNU/wrapper_macros.GNU. -# if defined (ACE_HAS_EXCEPTIONS) -# define ACE_NEW_THROWS_EXCEPTIONS -# endif /* ACE_HAS_EXCEPTIONS */ +# define ACE_NEW_THROWS_EXCEPTIONS # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_HAS_TEMPLATE_TYPEDEFS diff --git a/ACE/ace/config-doxygen.h b/ACE/ace/config-doxygen.h index 7da0a8007b8..f4331947a37 100644 --- a/ACE/ace/config-doxygen.h +++ b/ACE/ace/config-doxygen.h @@ -58,9 +58,6 @@ /// Enable support for the SSL wrappers #define ACE_HAS_SSL 1 -/// Enable exceptions -#define ACE_HAS_EXCEPTIONS - /// Enable timeprobes #define ACE_COMPILE_TIMEPROBES diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h index 51b02144e3b..8ec44f47bbf 100644 --- a/ACE/ace/config-g++-common.h +++ b/ACE/ace/config-g++-common.h @@ -32,22 +32,11 @@ # define ACE_LACKS_NUMERIC_LIMITS #endif /* __GNUC__ < 3 */ -// __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 -# if (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) +#define ACE_NEW_THROWS_EXCEPTIONS +#if (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) // Versions of g++ prior to 3.3 had a buggy operator // new(nothrow)[](). -# define ACE_HAS_NEW_NOTHROW -# endif /* __GNUC__ >= 3.3 */ -#endif /* ACE_HAS_EXCEPTIONS */ +# define ACE_HAS_NEW_NOTHROW +#endif /* __GNUC__ >= 3.3 */ #if (defined (i386) || defined (__i386__)) && !defined (ACE_SIZEOF_LONG_DOUBLE) # define ACE_SIZEOF_LONG_DOUBLE 12 diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h index 8be52fe880a..36db80b553d 100644 --- a/ACE/ace/config-hpux-11.00.h +++ b/ACE/ace/config-hpux-11.00.h @@ -27,12 +27,6 @@ # ifndef ACE_USING_MCPP_PREPROCESSOR # define ACE_CC_PREPROCESSOR_ARGS "-E +W 67" # endif -// Compiler supports C++ exception handling. It's on by default. If the -// +noeh compiler option is used to disable exceptions, the compiler defines -// __HPACC_NOEH. -# if !defined (__HPACC_NOEH) -# define ACE_HAS_EXCEPTIONS 1 -# endif // If the -AA compile option is used, the compiler defines _HP_NAMESPACE_STD. // The -AA option enables the 2.0 standard C++ library. If not used, then diff --git a/ACE/ace/config-icc-common.h b/ACE/ace/config-icc-common.h index 7d66c02ac6e..5197c35135e 100644 --- a/ACE/ace/config-icc-common.h +++ b/ACE/ace/config-icc-common.h @@ -61,18 +61,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 diff --git a/ACE/ace/config-integritySCA.h b/ACE/ace/config-integritySCA.h index 7103e9c8b2b..20077382b46 100644 --- a/ACE/ace/config-integritySCA.h +++ b/ACE/ace/config-integritySCA.h @@ -26,9 +26,6 @@ #define ACE_LACKS_GETEGID #define ACE_LACKS_GETGID -#ifndef ACE_HAS_EXCEPTIONS - #define ACE_HAS_EXCEPTIONS -#endif #define ACE_NEW_THROWS_EXCEPTIONS #define ACE_HAS_STANDARD_CPP_LIBRARY 1 #define ACE_TEMPLATES_REQUIRE_SOURCE 1 diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index 175fb171e5a..7f5af7c8fc9 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -26,6 +26,8 @@ #include "ace/Version.h" #include "ace/Versioned_Namespace.h" +#define ACE_HAS_EXCEPTIONS + // ACE_HAS_TLI is used to decide whether to try any XTI/TLI functionality // so if it isn't set, set it. Capabilities and differences between // XTI and TLI favor XTI, but when deciding to do anything, as opposed to @@ -54,19 +56,6 @@ # endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ #endif /* ! ACE_DEFAULT_LOG_STREAM */ -// These two are only for backward compatibility. You should avoid -// using them if not necessary. -#if !defined (ACE_LACKS_DEPRECATED_MACROS) -/** - * @deprecated The ACE_SYNCH_1 macro is deprecated - */ -# define ACE_SYNCH_1 ACE_SYNCH_DECL -/** - * @deprecated The ACE_SYNCH_2 macro is deprecated - */ -# define ACE_SYNCH_2 ACE_SYNCH_USE -#endif - // For Win32 compatibility... # if !defined (ACE_WSOCK_VERSION) # define ACE_WSOCK_VERSION 0, 0 @@ -89,32 +78,6 @@ # define ACE_INITIALIZE_MEMORY_BEFORE_USE # endif /* ACE_HAS_VALGRIND */ -#if !defined (ACE_LACKS_DEPRECATED_MACROS) -/** - * @deprecated The @c ACE_HAS_USING macros are deprecated - */ -# define ACE_USING using -#endif /* !ACE_LACKS_DEPRECATED_MACROS */ - -#if !defined (ACE_LACKS_DEPRECATED_MACROS) -/** - * @deprecated The @c ACE_TYPENAME macros is deprecated. Use standard - * C++ keyword typename instead. - */ -# define ACE_TYPENAME typename -#endif /* !ACE_LACKS_DEPRECATED_MACROS */ - -#if !defined (ACE_LACKS_DEPRECATED_MACROS) -/** - * @deprecated The @c ACE_TEMPLATE_SPECIALIZATION and - * @c ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION macros are - * deprecated. Use standard C++ template specialization - * syntax instead. - */ -# define ACE_TEMPLATE_SPECIALIZATION template<> -# define ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION -#endif /* !ACE_LACKS_DEPRECATED_MACROS */ - // ========================================================================= // Perfect Multicast filting refers to RFC 3376, where a socket is only // delivered dgrams for groups joined even if it didn't bind the group @@ -218,31 +181,6 @@ # define ACE_INLINE #endif /* __ACE_INLINE__ */ -#if !defined (ACE_LACKS_DEPRECATED_MACROS) - // ========================================================================= - // EXPLICIT macro - // ========================================================================= - - /** - * @deprecated explicit is deprecated. ACE requires C++ - * "explicit" keyword support. - */ - # define ACE_EXPLICIT explicit -#endif /* ACE_LACKS_DEPRECATED_MACROS */ - -#if !defined (ACE_LACKS_DEPRECATED_MACROS) - // ========================================================================= - // MUTABLE macro - // ========================================================================= - - /** - * @deprecated ACE_MUTABLE is deprecated. ACE requires C++ "mutable" - * keyword support. - */ - # define ACE_MUTABLE mutable - # define ACE_CONST_WHEN_MUTABLE const -#endif /* ACE_LACKS_DEPRECATED_MACROS */ - // ============================================================================ // EXPORT macros // @@ -305,60 +243,6 @@ # define ACE_sap_any_cast(TYPE) reinterpret_cast<TYPE> (const_cast<ACE_Addr &> (ACE_Addr::sap_any)) -#if !defined (ACE_LACKS_DEPRECATED_MACROS) - /** - * @deprecated ACE_{static,reinterpret,dynamic,const}_cast@<@> is - * deprecated. Directly use standard C++ casts instead. - */ - # define ACE_static_cast(TYPE, EXPR) static_cast<TYPE> (EXPR) - # define ACE_static_cast_1_ptr(TYPE, T1, EXPR) static_cast<TYPE<T1> *> (EXPR) - # define ACE_static_cast_2_ptr(TYPE, T1, T2, EXPR) static_cast<TYPE<T1, T2> *> (EXPR) - # define ACE_static_cast_3_ptr(TYPE, T1, T2, T3, EXPR) static_cast<TYPE<T1, T2, T3> *> (EXPR) - # define ACE_static_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) static_cast<TYPE<T1, T2, T3, T4> *> (EXPR) - # define ACE_static_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) static_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR) - # define ACE_static_cast_1_ref(TYPE, T1, EXPR) static_cast<TYPE<T1> &> (EXPR) - # define ACE_static_cast_2_ref(TYPE, T1, T2, EXPR) static_cast<TYPE<T1, T2> &> (EXPR) - # define ACE_static_cast_3_ref(TYPE, T1, T2, T3, EXPR) static_cast<TYPE<T1, T2, T3> &> (EXPR) - # define ACE_static_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) static_cast<TYPE<T1, T2, T3, T4> &> (EXPR) - # define ACE_static_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) static_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR) - - # define ACE_const_cast(TYPE, EXPR) const_cast<TYPE> (EXPR) - # define ACE_const_cast_1_ptr(TYPE, T1, EXPR) const_cast<TYPE<T1> *> (EXPR) - # define ACE_const_cast_2_ptr(TYPE, T1, T2, EXPR) const_cast<TYPE<T1, T2> *> (EXPR) - # define ACE_const_cast_3_ptr(TYPE, T1, T2, T3, EXPR) const_cast<TYPE<T1, T2, T3> *> (EXPR) - # define ACE_const_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) const_cast<TYPE<T1, T2, T3, T4> *> (EXPR) - # define ACE_const_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) const_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR) - # define ACE_const_cast_1_ref(TYPE, T1, EXPR) const_cast<TYPE<T1> &> (EXPR) - # define ACE_const_cast_2_ref(TYPE, T1, T2, EXPR) const_cast<TYPE<T1, T2> &> (EXPR) - # define ACE_const_cast_3_ref(TYPE, T1, T2, T3, EXPR) const_cast<TYPE<T1, T2, T3> &> (EXPR) - # define ACE_const_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) const_cast<TYPE<T1, T2, T3, T4> &> (EXPR) - # define ACE_const_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) const_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR) - - # define ACE_reinterpret_cast(TYPE, EXPR) reinterpret_cast<TYPE> (EXPR) - # define ACE_reinterpret_cast_1_ptr(TYPE, T1, EXPR) reinterpret_cast<TYPE<T1> *> (EXPR) - # define ACE_reinterpret_cast_2_ptr(TYPE, T1, T2, EXPR) reinterpret_cast<TYPE<T1, T2> *> (EXPR) - # define ACE_reinterpret_cast_3_ptr(TYPE, T1, T2, T3, EXPR) reinterpret_cast<TYPE<T1, T2, T3> *> (EXPR) - # define ACE_reinterpret_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) reinterpret_cast<TYPE<T1, T2, T3, T4> *> (EXPR) - # define ACE_reinterpret_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) reinterpret_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR) - # define ACE_reinterpret_cast_1_ref(TYPE, T1, EXPR) reinterpret_cast<TYPE<T1> &> (EXPR) - # define ACE_reinterpret_cast_2_ref(TYPE, T1, T2, EXPR) reinterpret_cast<TYPE<T1, T2> &> (EXPR) - # define ACE_reinterpret_cast_3_ref(TYPE, T1, T2, T3, EXPR) reinterpret_cast<TYPE<T1, T2, T3> &> (EXPR) - # define ACE_reinterpret_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) reinterpret_cast<TYPE<T1, T2, T3, T4> &> (EXPR) - # define ACE_reinterpret_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) reinterpret_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR) - - # define ACE_dynamic_cast(TYPE, EXPR) dynamic_cast<TYPE> (EXPR) - # define ACE_dynamic_cast_1_ptr(TYPE, T1, EXPR) dynamic_cast<TYPE<T1> *> (EXPR) - # define ACE_dynamic_cast_2_ptr(TYPE, T1, T2, EXPR) dynamic_cast<TYPE<T1, T2> *> (EXPR) - # define ACE_dynamic_cast_3_ptr(TYPE, T1, T2, T3, EXPR) dynamic_cast<TYPE<T1, T2, T3> *> (EXPR) - # define ACE_dynamic_cast_4_ptr(TYPE, T1, T2, T3, T4, EXPR) dynamic_cast<TYPE<T1, T2, T3, T4> *> (EXPR) - # define ACE_dynamic_cast_5_ptr(TYPE, T1, T2, T3, T4, T5, EXPR) dynamic_cast<TYPE<T1, T2, T3, T4, T5> *> (EXPR) - # define ACE_dynamic_cast_1_ref(TYPE, T1, EXPR) dynamic_cast<TYPE<T1> &> (EXPR) - # define ACE_dynamic_cast_2_ref(TYPE, T1, T2, EXPR) dynamic_cast<TYPE<T1, T2> &> (EXPR) - # define ACE_dynamic_cast_3_ref(TYPE, T1, T2, T3, EXPR) dynamic_cast<TYPE<T1, T2, T3> &> (EXPR) - # define ACE_dynamic_cast_4_ref(TYPE, T1, T2, T3, T4, EXPR) dynamic_cast<TYPE<T1, T2, T3, T4> &> (EXPR) - # define ACE_dynamic_cast_5_ref(TYPE, T1, T2, T3, T4, T5, EXPR) dynamic_cast<TYPE<T1, T2, T3, T4, T5> &> (EXPR) -#endif /* ACE_LACKS_DEPRECATED_MACROS */ - # if !defined (ACE_CAST_CONST) // Sun CC 4.2, for example, requires const in reinterpret casts of // data members in const member functions. But, other compilers diff --git a/ACE/ace/config-netbsd.h b/ACE/ace/config-netbsd.h index 583055b38e2..e60bf3974b0 100644 --- a/ACE/ace/config-netbsd.h +++ b/ACE/ace/config-netbsd.h @@ -35,7 +35,6 @@ #define ACE_HAS_CLOCK_GETTIME 1 #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 1 #define ACE_HAS_DIRENT 1 -#define ACE_HAS_EXCEPTIONS 1 #define ACE_HAS_GETIFADDRS 1 #define ACE_HAS_GETPAGESIZE 1 #define ACE_HAS_GETPROGNAME 1 diff --git a/ACE/ace/config-openvms.h b/ACE/ace/config-openvms.h index 2f7f514ad78..26f9d540f52 100644 --- a/ACE/ace/config-openvms.h +++ b/ACE/ace/config-openvms.h @@ -170,7 +170,6 @@ #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES 1 #define ACE_HAS_CPLUSPLUS_HEADERS 1 -#define ACE_HAS_EXCEPTIONS 1 #define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 #define ACE_HAS_GPERF 1 diff --git a/ACE/ace/config-suncc-common.h b/ACE/ace/config-suncc-common.h index 2a6046a867f..e7f7c107d54 100644 --- a/ACE/ace/config-suncc-common.h +++ b/ACE/ace/config-suncc-common.h @@ -30,18 +30,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 diff --git a/ACE/ace/config-sunos5.4-sunc++-4.x.h b/ACE/ace/config-sunos5.4-sunc++-4.x.h index 5fe8e41efde..dd13d97ba5c 100644 --- a/ACE/ace/config-sunos5.4-sunc++-4.x.h +++ b/ACE/ace/config-sunos5.4-sunc++-4.x.h @@ -176,11 +176,9 @@ #define ACE_HAS_GPERF #define ACE_HAS_DIRENT -# if defined (ACE_HAS_EXCEPTIONS) - // If exceptions are enabled and we are using Sun/CC then - // <operator new> throws an exception instead of returning 0. -# define ACE_NEW_THROWS_EXCEPTIONS -# endif /* ACE_HAS_EXCEPTIONS */ +// If exceptions are enabled and we are using Sun/CC then +// <operator new> throws an exception instead of returning 0. +#define ACE_NEW_THROWS_EXCEPTIONS #include /**/ "ace/post.h" #endif /* ACE_CONFIG_H */ diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h index 592567c8803..793a1ed4195 100644 --- a/ACE/ace/config-sunos5.5.h +++ b/ACE/ace/config-sunos5.5.h @@ -63,12 +63,8 @@ # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_HAS_THR_C_DEST # endif /* __SUNPRO_CC_COMPAT >= 5 */ -# if defined (ACE_HAS_EXCEPTIONS) -# define ACE_HAS_NEW_NOTHROW -# else - // See /opt/SUNWspro_5.0/SC5.0/include/CC/stdcomp.h: -# define _RWSTD_NO_EXCEPTIONS 1 -# endif /* ! ACE_HAS_EXCEPTIONS */ +# define ACE_HAS_NEW_NOTHROW +# endif # elif (__SUNPRO_CC == 0x420) || (__SUNPRO_CC == 0x410) # define ACE_LACKS_PLACEMENT_OPERATOR_DELETE # endif /* __SUNPRO_CC >= 0x500 */ @@ -81,24 +77,9 @@ # define ACE_LACKS_LINEBUFFERED_STREAMBUF # define ACE_LACKS_SIGNED_CHAR - // ACE_HAS_EXCEPTIONS precludes -noex in - // include/makeinclude/platform_macros.GNU. But beware, we have - // seen problems with exception handling on multiprocessor - // UltraSparcs: threaded executables core dump when threads exit. - // This problem does not seem to appear on single-processor UltraSparcs. - // And, it is solved with the application of patch - // 104631-02 "C++ 4.2: Jumbo Patch for C++ 4.2 on Solaris SPARC" - // to Sun C++ 4.2. - // To provide optimum performance, ACE_HAS_EXCEPTIONS is disabled by - // default. It can be enabled by adding "exceptions=1" to the "make" - // invocation. See include/makeinclude/platform_sunos5_sunc++.GNU - // for details. - -# if defined (ACE_HAS_EXCEPTIONS) - // If exceptions are enabled and we are using Sun/CC then - // <operator new> throws an exception instead of returning 0. -# define ACE_NEW_THROWS_EXCEPTIONS -# endif /* ACE_HAS_EXCEPTIONS */ +// If exceptions are enabled and we are using Sun/CC then +// <operator new> throws an exception instead of returning 0. +#define ACE_NEW_THROWS_EXCEPTIONS /* If you want to disable threading with Sun CC, remove -mt from your CFLAGS, e.g., using make threads=0. */ diff --git a/ACE/ace/config-tandem-nsk-mips-v2.h b/ACE/ace/config-tandem-nsk-mips-v2.h index ad3a8f92180..39600cb93e2 100644 --- a/ACE/ace/config-tandem-nsk-mips-v2.h +++ b/ACE/ace/config-tandem-nsk-mips-v2.h @@ -336,9 +336,6 @@ typedef enum CMA_T_SCHED_POLICY { // Compiler specific parts //========================================================================= -// Compiler supports C++ exception handling -#define ACE_HAS_EXCEPTIONS - // Compiler/platform has correctly prototyped header files #define ACE_HAS_CPLUSPLUS_HEADERS diff --git a/ACE/ace/config-tandem-nsk-mips-v3.h b/ACE/ace/config-tandem-nsk-mips-v3.h index 793c3c2d6d1..e38dcae072b 100644 --- a/ACE/ace/config-tandem-nsk-mips-v3.h +++ b/ACE/ace/config-tandem-nsk-mips-v3.h @@ -371,9 +371,6 @@ typedef enum CMA_T_SCHED_POLICY { // Compiler specific parts //========================================================================= -// Compiler supports C++ exception handling -#define ACE_HAS_EXCEPTIONS 1 - // Compiler/platform has correctly prototyped header files #define ACE_HAS_CPLUSPLUS_HEADERS diff --git a/ACE/ace/config-unixware-7.1.0.h b/ACE/ace/config-unixware-7.1.0.h index 7249b634298..e140072bf31 100644 --- a/ACE/ace/config-unixware-7.1.0.h +++ b/ACE/ace/config-unixware-7.1.0.h @@ -89,13 +89,6 @@ readdir_r, etc. */ #define ACE_HAS_DIRENT 1 -/* Compiler supports C++ exception handling */ -// MM-Graz if ! defined inserted, to prevent warnings, because it is already -// defined in config-g++common.h -# if !defined (ACE_HAS_EXCEPTIONS) -#define ACE_HAS_EXCEPTIONS 1 -# endif - /* Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must be defined, except on Win32) */ #define ACE_HAS_GETPAGESIZE 1 diff --git a/ACE/ace/config-unixware-7.1.0.udk.h b/ACE/ace/config-unixware-7.1.0.udk.h index 350f6af8021..d2ef1ddea5e 100644 --- a/ACE/ace/config-unixware-7.1.0.udk.h +++ b/ACE/ace/config-unixware-7.1.0.udk.h @@ -114,11 +114,6 @@ readdir_r, etc. */ #define ACE_HAS_DIRENT -/* Compiler supports C++ exception handling */ -# if !defined (ACE_HAS_EXCEPTIONS) -#define ACE_HAS_EXCEPTIONS -# endif - /* Platform supports getpagesize() call (otherwise, ACE_PAGE_SIZE must be defined, except on Win32) */ #define ACE_HAS_GETPAGESIZE diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index ff62e5d3874..6af4b729f6c 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -110,7 +110,6 @@ #define ACE_EXPORT_NESTED_CLASSES 1 #define ACE_HAS_CPLUSPLUS_HEADERS 1 -#define ACE_HAS_EXCEPTIONS #define ACE_HAS_NONCONST_SELECT_TIMEVAL #define ACE_HAS_SIG_ATOMIC_T #define ACE_HAS_STANDARD_CPP_LIBRARY 1 diff --git a/ACE/ace/config-win32-dmc.h b/ACE/ace/config-win32-dmc.h index ec48e1b6422..e3cd739860a 100644 --- a/ACE/ace/config-win32-dmc.h +++ b/ACE/ace/config-win32-dmc.h @@ -48,7 +48,6 @@ # define ACE_EXPORT_NESTED_CLASSES 1 # define ACE_HAS_CPLUSPLUS_HEADERS 1 -//# define ACE_HAS_EXCEPTIONS 1 # define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 # define ACE_HAS_SIG_ATOMIC_T 1 # define ACE_HAS_STANDARD_CPP_LIBRARY 0 diff --git a/ACE/ace/config-win32-ghs.h b/ACE/ace/config-win32-ghs.h index 937bcf1f479..e25bc39d37a 100644 --- a/ACE/ace/config-win32-ghs.h +++ b/ACE/ace/config-win32-ghs.h @@ -56,7 +56,6 @@ # define ACE_EXPORT_NESTED_CLASSES 1 # define ACE_HAS_CPLUSPLUS_HEADERS 1 -//# define ACE_HAS_EXCEPTIONS 1 # define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 # define ACE_HAS_SIG_ATOMIC_T 1 # define ACE_HAS_STANDARD_CPP_LIBRARY 1 diff --git a/ACE/ace/config-win32-interix.h b/ACE/ace/config-win32-interix.h index e8188fbf3b8..f824274d79f 100644 --- a/ACE/ace/config-win32-interix.h +++ b/ACE/ace/config-win32-interix.h @@ -18,7 +18,6 @@ #define ACE_HAS_BROKEN_T_ERROR #define ACE_HAS_CONSISTENT_SIGNAL_PROTOTYPES #define ACE_HAS_DIRENT -#define ACE_HAS_EXCEPTIONS #define ACE_HAS_GETPAGESIZE #define ACE_HAS_GETRUSAGE #define ACE_HAS_GETRUSAGE_PROTOTYPE diff --git a/ACE/ace/config-win32-msvc-10.h b/ACE/ace/config-win32-msvc-10.h index 2a9ce4338f4..f7c3d69d170 100644 --- a/ACE/ace/config-win32-msvc-10.h +++ b/ACE/ace/config-win32-msvc-10.h @@ -57,10 +57,6 @@ # define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) #endif -#ifndef ACE_HAS_EXCEPTIONS -# define ACE_HAS_EXCEPTIONS -#endif - // Windows Mobile 6 doesn't do sig_atomic_t, but maybe future versions will. # if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x601) # define ACE_HAS_SIG_ATOMIC_T diff --git a/ACE/ace/config-win32-msvc-7.h b/ACE/ace/config-win32-msvc-7.h index 4c6a153a63d..bfc43d9ad72 100644 --- a/ACE/ace/config-win32-msvc-7.h +++ b/ACE/ace/config-win32-msvc-7.h @@ -46,10 +46,6 @@ #define ACE_STRNCASECMP_EQUIVALENT ::_strnicmp #define ACE_WCSDUP_EQUIVALENT ::_wcsdup -#if !defined (ACE_HAS_WINCE) && !defined (ACE_HAS_EXCEPTIONS) -#define ACE_HAS_EXCEPTIONS -#endif /* ACE_HAS_WINCE */ - #define ACE_LACKS_STRPTIME #define ACE_HAS_SIG_ATOMIC_T diff --git a/ACE/ace/config-win32-msvc-8.h b/ACE/ace/config-win32-msvc-8.h index 4720103c862..e44f377ed66 100644 --- a/ACE/ace/config-win32-msvc-8.h +++ b/ACE/ace/config-win32-msvc-8.h @@ -59,10 +59,6 @@ # define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) #endif -#ifndef ACE_HAS_EXCEPTIONS -# define ACE_HAS_EXCEPTIONS -#endif - // Windows Mobile 6 doesn't do sig_atomic_t, but maybe future versions will. // This has been true up thrugh the versions. We don't have any indication // that this might be supported in the future, but it is an easy enough fix diff --git a/ACE/ace/config-win32-msvc-9.h b/ACE/ace/config-win32-msvc-9.h index 76167dc78db..7e06a1717fe 100644 --- a/ACE/ace/config-win32-msvc-9.h +++ b/ACE/ace/config-win32-msvc-9.h @@ -57,10 +57,6 @@ # define ACE_FILENO_EQUIVALENT(X) (_get_osfhandle (::_fileno (X))) #endif -#ifndef ACE_HAS_EXCEPTIONS -# define ACE_HAS_EXCEPTIONS -#endif - // Windows Mobile 6 doesn't do sig_atomic_t, but maybe future versions will. # if !defined (_WIN32_WCE) || (_WIN32_WCE > 0x601) # define ACE_HAS_SIG_ATOMIC_T diff --git a/ACE/bin/MakeProjectCreator/config/exceptions.mpb b/ACE/bin/MakeProjectCreator/config/exceptions.mpb deleted file mode 100644 index 912530f5cfb..00000000000 --- a/ACE/bin/MakeProjectCreator/config/exceptions.mpb +++ /dev/null @@ -1,6 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project { - requires += exceptions -} diff --git a/ACE/include/makeinclude/platform_aix.GNU b/ACE/include/makeinclude/platform_aix.GNU index 33e9c785263..9e355abfc60 100644 --- a/ACE/include/makeinclude/platform_aix.GNU +++ b/ACE/include/makeinclude/platform_aix.GNU @@ -27,15 +27,9 @@ debug ?= 1 distrib ?= 0 -exceptions ?= 1 optimize ?= 0 threads ?= 1 -# There's no way to turn off exceptions with IBM C/C++ -ifeq (0,$(exceptions)) - exceptions = 1 -endif - # In case anything here or in the config depends on OS version number, # grab it here and pass it all to the compiler as well. AIX_MAJOR_VERS := $(shell uname -v) diff --git a/ACE/include/makeinclude/platform_aix_g++.GNU b/ACE/include/makeinclude/platform_aix_g++.GNU index c892df15647..ac08dafc180 100644 --- a/ACE/include/makeinclude/platform_aix_g++.GNU +++ b/ACE/include/makeinclude/platform_aix_g++.GNU @@ -9,7 +9,6 @@ debug ?= 1 distrib ?= 0 -exceptions ?= 1 optimize ?= 1 threads ?= 1 buildbits ?= 32 diff --git a/ACE/include/makeinclude/platform_aix_ibm.GNU b/ACE/include/makeinclude/platform_aix_ibm.GNU index d675201759b..110db9cf5c2 100644 --- a/ACE/include/makeinclude/platform_aix_ibm.GNU +++ b/ACE/include/makeinclude/platform_aix_ibm.GNU @@ -5,7 +5,6 @@ debug ?= 1 distrib ?= 0 -exceptions ?= 1 optimize ?= 0 threads ?= 1 buildbits ?= 32 @@ -36,13 +35,6 @@ AIX_MAJOR_VERS := $(shell uname -v) AIX_MINOR_VERS := $(shell uname -r) AIX_VERS := $(AIX_MAJOR_VERS)0$(AIX_MINOR_VERS) -# Use of exceptions should be a compiler-specific setting, but for now it's -# not. IBM C/C++ doesn't have a way to turn exceptions off, and Visual -# Age C++ V5 building ACE without exception handling causes segv on startup -# of every test. Until this is straightened out, force exceptions=1 for -# both compilers. -exceptions=1 - SOEXT = so SOFLAGS += -G LDFLAGS += -brtl @@ -105,9 +97,7 @@ else # According to documentation, default is -qeh, which is equivalent # to -qeh=v5. Apparently 6.0 fixed some problems with nested # try-catch blocks. - ifeq ($(exceptions),1) - CCFLAGS += -qeh=v6 - endif + CCFLAGS += -qeh=v6 else ifeq ($(XLCVERSION),0x0800) CCFLAGS += -qflag=w:w @@ -119,9 +109,7 @@ else # According to documentation, default is -qeh, which is equivalent # to -qeh=v5. Apparently 6.0 fixed some problems with nested # try-catch blocks. - ifeq ($(exceptions),1) - CCFLAGS += -qeh=v6 - endif + CCFLAGS += -qeh=v6 else ifeq ($(XLCVERSION),0x0900) CCFLAGS += -qflag=w:w @@ -133,9 +121,7 @@ else # According to documentation, default is -qeh, which is equivalent # to -qeh=v5. Apparently 6.0 fixed some problems with nested # try-catch blocks. - ifeq ($(exceptions),1) - CCFLAGS += -qeh=v6 - endif + CCFLAGS += -qeh=v6 else CXX = echo "Unrecognized compiler version $(XLCVERSION)\n" endif diff --git a/ACE/include/makeinclude/platform_cray.GNU b/ACE/include/makeinclude/platform_cray.GNU index af4c700010a..001e16a1e46 100644 --- a/ACE/include/makeinclude/platform_cray.GNU +++ b/ACE/include/makeinclude/platform_cray.GNU @@ -10,7 +10,6 @@ # Contributed by Doug Anderson <dla@home.com> debug = 1 -exceptions = 1 static_libs_only = 1 quantify = purify = @@ -28,11 +27,7 @@ DCCFLAGS += $(DCFLAGS) OCFLAGS += -O2 OCCFLAGS += $(OCFLAGS) -ifeq (1,$(exceptions)) - CCFLAGS += -h exceptions -else - CCFLAGS += -h noexceptions -endif # exceptions +CCFLAGS += -h exceptions DLD = $(CXX) LD = $(CXX) diff --git a/ACE/include/makeinclude/platform_freebsd.GNU b/ACE/include/makeinclude/platform_freebsd.GNU index f08842ad483..3f637056de3 100644 --- a/ACE/include/makeinclude/platform_freebsd.GNU +++ b/ACE/include/makeinclude/platform_freebsd.GNU @@ -14,7 +14,6 @@ ifeq ($(RET),1) versioned_so = 1 endif -exceptions ?= 1 threads ?= 1 debug ?= 1 optimize ?= 1 diff --git a/ACE/include/makeinclude/platform_gnuwin32_common.GNU b/ACE/include/makeinclude/platform_gnuwin32_common.GNU index 22810d88f22..4f799811eac 100644 --- a/ACE/include/makeinclude/platform_gnuwin32_common.GNU +++ b/ACE/include/makeinclude/platform_gnuwin32_common.GNU @@ -16,7 +16,6 @@ no_hidden_visibility ?= 1 GNUWIN32_CXX_VERSION := $(shell $(CXX) -dumpversion) winsock2 ?= 1 -exceptions ?= 1 debug ?= 1 optimize ?= 1 threads ?= 1 diff --git a/ACE/include/makeinclude/platform_hpux_aCC.GNU b/ACE/include/makeinclude/platform_hpux_aCC.GNU index 21c10254d0b..f9cee037ace 100644 --- a/ACE/include/makeinclude/platform_hpux_aCC.GNU +++ b/ACE/include/makeinclude/platform_hpux_aCC.GNU @@ -13,7 +13,6 @@ buildbits ?= 0 debug ?= 1 distrib ?= 0 -exceptions ?= 1 optimize ?= 0 stdcpplib ?= 1 threads ?= 1 @@ -59,8 +58,6 @@ ifeq (1,$(stdcpplib)) endif # Compile errors using -AA and +noeh together - HP problem report # JAGad12608, fix slated for Dec 2001 Release -- Steve Huston, April 10, 2001. -# If you still have problems with this area, uncomment the following line: -# exceptions = 1 else CCFLAGS += -AP endif @@ -140,12 +137,6 @@ endif CPPFLAGS += $(THR_DEFS) -D_HPUX_SOURCE -DHPUX_VERS=$(HPUX_VERS) -DACE_LACKS_PRAGMA_ONCE CCFLAGS += $(CC_THR_DEFS) -# If exception support is explicitly disabled, tell the compiler. -# This is not recommended since the run-time library can throw exceptions. -ifneq ($(exceptions),1) - CCFLAGS += +noeh -endif - DCCFLAGS += -g DLD = $(CXX) $(CCFLAGS) LD = $(CXX) diff --git a/ACE/include/makeinclude/platform_hpux_gcc.GNU b/ACE/include/makeinclude/platform_hpux_gcc.GNU index bf7c5207448..7fc87b4936d 100644 --- a/ACE/include/makeinclude/platform_hpux_gcc.GNU +++ b/ACE/include/makeinclude/platform_hpux_gcc.GNU @@ -4,7 +4,6 @@ buildbits ?= 64 debug ?= 1 distrib ?= 0 -exceptions ?= 1 optimize ?= 1 stdcpplib ?= 1 threads ?= 1 diff --git a/ACE/include/makeinclude/platform_integrity_ghs.GNU b/ACE/include/makeinclude/platform_integrity_ghs.GNU index 358020bc1fd..4d4da7dbdc0 100644 --- a/ACE/include/makeinclude/platform_integrity_ghs.GNU +++ b/ACE/include/makeinclude/platform_integrity_ghs.GNU @@ -6,7 +6,6 @@ optimize ?= 1 shared_libs = static_libs = 1 -exceptions ?= 1 #### CPU type ifndef CPU @@ -54,9 +53,7 @@ CXX = $(GHSROOT)/cx$(CPU) # undefine "vector" because it's predefined for 7400 boards IOPS = -bspname=$(RTOSROOT)/target/$(BSP).bld -os_dir $(RTOSROOT) --one_instantiation_per_object -non_shared -Uvector -ifeq (1, $(exceptions)) - IOPS += --exceptions -endif # exceptions +IOPS += --exceptions CCFLAGS += $(CFLAGS) -integrate -dynamic -I$(RTOSROOT)/INTEGRITY-include-SCA $(IOPS) -bspfile=$(TARGET_BSP) $(TARGET_LD) DCFLAGS += -G diff --git a/ACE/include/makeinclude/platform_irix6.x_common.GNU b/ACE/include/makeinclude/platform_irix6.x_common.GNU index c0af65aa353..a43bfc0818b 100644 --- a/ACE/include/makeinclude/platform_irix6.x_common.GNU +++ b/ACE/include/makeinclude/platform_irix6.x_common.GNU @@ -1,7 +1,6 @@ # $Id$ xt_reactor ?= 1 -exceptions ?= 1 debug ?= 1 optimize ?= 1 diff --git a/ACE/include/makeinclude/platform_linux_common.GNU b/ACE/include/makeinclude/platform_linux_common.GNU index f30576fcd34..1695532fd3a 100644 --- a/ACE/include/makeinclude/platform_linux_common.GNU +++ b/ACE/include/makeinclude/platform_linux_common.GNU @@ -4,7 +4,6 @@ # We always include config-linux.h on Linux platforms. ACE_PLATFORM_CONFIG ?= config-linux.h -exceptions ?= 1 debug ?= 1 optimize ?= 1 threads ?= 1 diff --git a/ACE/include/makeinclude/platform_lynxos.GNU b/ACE/include/makeinclude/platform_lynxos.GNU index 1991f459382..ebcebe8ad08 100644 --- a/ACE/include/makeinclude/platform_lynxos.GNU +++ b/ACE/include/makeinclude/platform_lynxos.GNU @@ -41,7 +41,6 @@ optimize ?= 1 debug ?= 1 pipes ?= 1 threads ?= 1 -exceptions ?= 1 ifeq ($(threads),1) CFLAGS += -mthreads diff --git a/ACE/include/makeinclude/platform_macosx.GNU b/ACE/include/makeinclude/platform_macosx.GNU index 582164ac98b..6d97044285b 100644 --- a/ACE/include/makeinclude/platform_macosx.GNU +++ b/ACE/include/makeinclude/platform_macosx.GNU @@ -5,7 +5,6 @@ # users. Non-Fink users should simply create these directories to # eliminate the warnings. -exceptions ?= 1 threads ?= 1 debug ?= 1 optimize ?= 0 diff --git a/ACE/include/makeinclude/platform_macosx_common.GNU b/ACE/include/makeinclude/platform_macosx_common.GNU index 26a0d565d66..3b15e1167ac 100644 --- a/ACE/include/makeinclude/platform_macosx_common.GNU +++ b/ACE/include/makeinclude/platform_macosx_common.GNU @@ -3,11 +3,9 @@ # support for Mac OS X 10.4 (Tiger) # By default, this uses the default compiler selected using gcc_select. -cidl = 1 boost = 1 zzip = 1 zlib = 1 -exceptions ?= 1 threads ?= 1 debug ?= 1 optimize ?= 0 diff --git a/ACE/include/makeinclude/platform_macosx_icc.GNU b/ACE/include/makeinclude/platform_macosx_icc.GNU index 472b5801eb3..05fb528c3dd 100644 --- a/ACE/include/makeinclude/platform_macosx_icc.GNU +++ b/ACE/include/makeinclude/platform_macosx_icc.GNU @@ -1,6 +1,5 @@ # $Id$ -exceptions ?= 1 threads ?= 1 debug ?= 1 optimize ?= 0 diff --git a/ACE/include/makeinclude/platform_macosx_panther.GNU b/ACE/include/makeinclude/platform_macosx_panther.GNU index c542054de1a..daf25409b68 100644 --- a/ACE/include/makeinclude/platform_macosx_panther.GNU +++ b/ACE/include/makeinclude/platform_macosx_panther.GNU @@ -2,7 +2,6 @@ # platform_macosx.GNU # support for Mac OS X 10.3 (Panther) -exceptions ?= 1 threads ?= 1 debug ?= 1 optimize ?= 0 diff --git a/ACE/include/makeinclude/platform_netbsd.GNU b/ACE/include/makeinclude/platform_netbsd.GNU index 7395d52ae89..f584ce8a239 100644 --- a/ACE/include/makeinclude/platform_netbsd.GNU +++ b/ACE/include/makeinclude/platform_netbsd.GNU @@ -4,7 +4,6 @@ versioned_so = 1 -exceptions ?= 1 debug ?= 1 optimize ?= 1 threads ?= 1 diff --git a/ACE/include/makeinclude/platform_openbsd.GNU b/ACE/include/makeinclude/platform_openbsd.GNU index 328f3e013e2..93d0ce95087 100644 --- a/ACE/include/makeinclude/platform_openbsd.GNU +++ b/ACE/include/makeinclude/platform_openbsd.GNU @@ -4,7 +4,6 @@ versioned_so = 1 -exceptions ?= 1 debug ?= 1 optimize ?= 1 threads ?= 1 diff --git a/ACE/include/makeinclude/platform_openvms.GNU b/ACE/include/makeinclude/platform_openvms.GNU index 0cd65627312..e6491ee0f44 100644 --- a/ACE/include/makeinclude/platform_openvms.GNU +++ b/ACE/include/makeinclude/platform_openvms.GNU @@ -4,7 +4,6 @@ ACE_OPENVMS = 1 versioned_so ?= 0 -exceptions ?= 1 debug ?= 1 optimize ?= 0 threads ?= 1 diff --git a/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU b/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU index cc0a6db11aa..08618ddc28a 100644 --- a/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU +++ b/ACE/include/makeinclude/platform_qnx_rtp_gcc.GNU @@ -5,15 +5,9 @@ inline ?= 1 debug ?= 1 optimize ?= 0 -exceptions ?= 1 threads ?= 1 -ifeq ($(exceptions),1) - CCFLAGS += -fexceptions - LDFLAGS += -fexceptions -else - CCFLAGS += -fno-exceptions - LDFLAGS += -fno-exceptions -endif # ! exceptions +CCFLAGS += -fexceptions +LDFLAGS += -fexceptions ifeq ($(inline),1) CCFLAGS += -finline-functions diff --git a/ACE/include/makeinclude/platform_rtems.x_g++.GNU b/ACE/include/makeinclude/platform_rtems.x_g++.GNU index f9fae61e4e2..12b934018be 100644 --- a/ACE/include/makeinclude/platform_rtems.x_g++.GNU +++ b/ACE/include/makeinclude/platform_rtems.x_g++.GNU @@ -6,7 +6,6 @@ CROSS-COMPILE = 1 debug ?= 1 optimize ?= 1 -exceptions ?= 1 threads ?= 1 pipes ?= 1 diff --git a/ACE/include/makeinclude/platform_sunos5_g++.GNU b/ACE/include/makeinclude/platform_sunos5_g++.GNU index a4ac385ab02..03bf3c0c750 100644 --- a/ACE/include/makeinclude/platform_sunos5_g++.GNU +++ b/ACE/include/makeinclude/platform_sunos5_g++.GNU @@ -10,14 +10,9 @@ debug ?= 1 optimize ?= 1 threads ?= 1 -exceptions ?= 1 pipes ?= 1 buildbits ?= 32 -ifeq ($(exceptions),0) - CCFLAGS += -fno-exceptions -endif # exceptions - ifeq ($(buildbits),64) FLAGS_C_CC += -m64 LDFLAGS += -m64 diff --git a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU b/ACE/include/makeinclude/platform_sunos5_sunc++.GNU index e9aefe30832..299f2261f94 100644 --- a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU +++ b/ACE/include/makeinclude/platform_sunos5_sunc++.GNU @@ -112,7 +112,6 @@ ifeq (C++ 5,$(findstring C++ 5,$(CC_VERSION))) inline = 0 else # ! 5.1 inline ?= 1 - exceptions ?= 1 endif # 5.2 or greater endif #! 5.0 @@ -168,24 +167,6 @@ CCFLAGS += $(TEMPLATES_FLAG) #### XXX: Shouldn't this go into a compiler version specific guard ??? CPPFLAGS += -DSUN_CC_HAS_PVFC_BUG -#### Exception handling breaks on MP machines prior to Sun C++ 4.2 -#### with jumbo patch 104631-02, see ace/config-sunos5.5.h. -#### If you are using a version of Sun C++ prior to 4,2, or haven't -#### applied that jumbo patch to your 4.2, or don't want to pay the -#### performance penalty of exception handling, then use the default -#### of no exceptions. If you want to enable exception handling, -#### add "exceptions=1" to your "make" invocation. -ifeq (0,$(exceptions)) - CCFLAGS += -noex - ifeq (C++ 5.6,$(findstring C++ 5.6,$(CC_VERSION))) - override stlport = 1 - else - ifeq (C++ 5.7,$(findstring C++ 5.7,$(CC_VERSION))) - override stlport = 1 - endif - endif -endif # ! exceptions - ifeq ($(shared_libs), 1) ifneq ($(static_libs_only), 1) diff --git a/ACE/include/makeinclude/platform_tandem.GNU b/ACE/include/makeinclude/platform_tandem.GNU index 7081e560849..c5aace6eb97 100644 --- a/ACE/include/makeinclude/platform_tandem.GNU +++ b/ACE/include/makeinclude/platform_tandem.GNU @@ -11,7 +11,6 @@ CC = cc CXX = NCC DLD = $(CXX) LD = $(CXX) -CPPFLAGS += -no_exceptions CPPFLAGS += -I/usr/include3.18 CPPFLAGS += -D_REENTRANT #CPPFLAGS += -ptused -prelink @@ -58,9 +57,9 @@ SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \ #INCDIR += -I/usr/include -I/usr/include3.18 # -I /usr/ucbinclude #### No threads -#CCFLAGS += -no_exceptions -pta $(WARNOFF) $(INCDIR) +#CCFLAGS += -pta $(WARNOFF) $(INCDIR) #### Threads -#CCFLAGS += -D_REENTRANT -no_exceptions -pta $(WARNOFF) +#CCFLAGS += -D_REENTRANT -pta $(WARNOFF) #DLD = $(CXX) #LD = $(CXX) diff --git a/ACE/include/makeinclude/platform_tru64_cxx.GNU b/ACE/include/makeinclude/platform_tru64_cxx.GNU index 0d43f8cc114..fd6f264cd1c 100644 --- a/ACE/include/makeinclude/platform_tru64_cxx.GNU +++ b/ACE/include/makeinclude/platform_tru64_cxx.GNU @@ -11,11 +11,6 @@ include $(ACE_ROOT)/include/makeinclude/platform_tru64_pre.GNU # you should be careful when turning off debug. debug ?= 1 -# exceptions=1 is the default on this platform. exceptions=0 has not -# been tested. See the bottom of this file for more. Turning off exceptions -# on this platform can cause bad things to happen. -exceptions ?= 1 - threads ?= 1 # Use of Standard C++ Library requires some flags to be added to the @@ -119,15 +114,6 @@ LIBS := $(LIBS) SOBUILD = $(RM) $@; $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $< && \ ln $(VSHDIR)$*.o $@ -ifeq (0,$(exceptions)) - #### Disable the default exception handling of cxx >= 6.0. - #### This is untested. exceptions=1 is the default, so it's not used - #### by default. - ifeq (6.,$(findstring 6.,$(CXX_VERSION))) - CCFLAGS += -nocleanup - endif # 6.x -endif # ! exceptions - ### There is a bug with pthreads header file shipped with v1885 of ### V5.1. We need to turn this flag to get asm () inline for ### compilation. diff --git a/ACE/include/makeinclude/platform_tru64_g++.GNU b/ACE/include/makeinclude/platform_tru64_g++.GNU index aec60768660..06ff43506d7 100644 --- a/ACE/include/makeinclude/platform_tru64_g++.GNU +++ b/ACE/include/makeinclude/platform_tru64_g++.GNU @@ -12,7 +12,6 @@ include $(ACE_ROOT)/include/makeinclude/platform_tru64_pre.GNU debug ?= 1 -exceptions ?= 1 threads ?= 1 optimize ?= 1 diff --git a/ACE/include/makeinclude/platform_unixware_g++.GNU b/ACE/include/makeinclude/platform_unixware_g++.GNU index 08a5ca29f13..4871fd8ac47 100644 --- a/ACE/include/makeinclude/platform_unixware_g++.GNU +++ b/ACE/include/makeinclude/platform_unixware_g++.GNU @@ -3,7 +3,6 @@ # UnixWare V2.2.1.2 with g++ version 2.7.2.2 debug ?= 0 -exceptions ?= 1 threads ?= 1 CC = gcc @@ -11,9 +10,7 @@ CXX = g++ ACE_GNUG_ON_UNIXWARE = 1 -#ifeq ($(exceptions),1) - CCFLAGS += -fexceptions -#endif +CCFLAGS += -fexceptions DCFLAGS += -g #DCFLAGS += -g diff --git a/ACE/include/makeinclude/platform_vxworks5.5.x.GNU b/ACE/include/makeinclude/platform_vxworks5.5.x.GNU index e34e9b44a67..718dd37ae2a 100644 --- a/ACE/include/makeinclude/platform_vxworks5.5.x.GNU +++ b/ACE/include/makeinclude/platform_vxworks5.5.x.GNU @@ -32,7 +32,6 @@ endif debug ?= 1 optimize ?= 1 threads ?= 1 -exceptions ?= 1 xerces ?= 0 versioned_so ?= 0 @@ -276,19 +275,12 @@ endif endif # TOOL == gnu ifeq ("$(TOOL)","diab") -ifeq ($(exceptions),1) C++FLAGS += -Xexceptions -else - C++FLAGS += -Xexceptions-off endif else ifeq ("$(TOOL)","gnu") C++FLAGS += -ftemplate-depth-50 -ifeq ($(exceptions),1) - C++FLAGS += -fexceptions -else - C++FLAGS += -fno-exceptions -endif +C++FLAGS += -fexceptions endif endif diff --git a/ACE/include/makeinclude/platform_vxworks6.2.GNU b/ACE/include/makeinclude/platform_vxworks6.2.GNU index 57d715c79fa..37080a0382c 100644 --- a/ACE/include/makeinclude/platform_vxworks6.2.GNU +++ b/ACE/include/makeinclude/platform_vxworks6.2.GNU @@ -20,7 +20,6 @@ CROSS-COMPILE = 1 debug ?= 1 optimize ?= 1 threads ?= 1 -exceptions ?= 1 rtp ?= 1 ifeq ($(rtp),0) pthread ?= 0 @@ -307,18 +306,10 @@ endif endif # TOOL_FAMILY == gnu ifeq ("$(TOOL_FAMILY)","diab") -ifeq ($(exceptions),1) C++FLAGS += -Xexceptions else - C++FLAGS += -Xexceptions-off -endif -else ifeq ("$(TOOL_FAMILY)","gnu") -ifeq ($(exceptions),1) C++FLAGS += -fexceptions -else - C++FLAGS += -fno-exceptions -endif endif endif diff --git a/ACE/include/makeinclude/platform_vxworks6.3.GNU b/ACE/include/makeinclude/platform_vxworks6.3.GNU index 397f39482f7..069a68975c2 100644 --- a/ACE/include/makeinclude/platform_vxworks6.3.GNU +++ b/ACE/include/makeinclude/platform_vxworks6.3.GNU @@ -20,7 +20,6 @@ CROSS-COMPILE = 1 debug ?= 1 optimize ?= 1 threads ?= 1 -exceptions ?= 1 rtp ?= 1 ifeq ($(rtp),0) pthread ?= 0 @@ -340,18 +339,10 @@ endif endif # TOOL_FAMILY == gnu ifeq ("$(TOOL_FAMILY)","diab") -ifeq ($(exceptions),1) C++FLAGS += -Xexceptions else - C++FLAGS += -Xexceptions-off -endif -else ifeq ("$(TOOL_FAMILY)","gnu") -ifeq ($(exceptions),1) C++FLAGS += -fexceptions -else - C++FLAGS += -fno-exceptions -endif endif endif diff --git a/ACE/include/makeinclude/platform_win32_dmc.GNU b/ACE/include/makeinclude/platform_win32_dmc.GNU index 038f553ef25..2c6c3abfcf0 100644 --- a/ACE/include/makeinclude/platform_win32_dmc.GNU +++ b/ACE/include/makeinclude/platform_win32_dmc.GNU @@ -2,10 +2,8 @@ # debug = 1 # optimize = 1 -# exceptions = 0 winsock2 ?= 1 -exceptions ?= 0 debug ?= 1 optimize ?= 1 threads ?= 1 diff --git a/ACE/include/makeinclude/platform_win32_icc.GNU b/ACE/include/makeinclude/platform_win32_icc.GNU index e0079956735..28d68f630fc 100644 --- a/ACE/include/makeinclude/platform_win32_icc.GNU +++ b/ACE/include/makeinclude/platform_win32_icc.GNU @@ -2,10 +2,8 @@ # debug = 1 # optimize = 1 -# exceptions = 0 winsock2 ?= 1 -exceptions ?= 1 debug ?= 1 optimize ?= 1 threads ?= 1 diff --git a/ACE/include/makeinclude/platform_win32_interix.GNU b/ACE/include/makeinclude/platform_win32_interix.GNU index 7f514b4eb40..18a9461b2e0 100644 --- a/ACE/include/makeinclude/platform_win32_interix.GNU +++ b/ACE/include/makeinclude/platform_win32_interix.GNU @@ -4,7 +4,6 @@ versioned_so ?= 0 -exceptions ?= 1 debug ?= 1 optimize ?= 1 threads ?= 1 diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU index fa98869dceb..74d7b600f07 100644 --- a/ACE/include/makeinclude/wrapper_macros.GNU +++ b/ACE/include/makeinclude/wrapper_macros.GNU @@ -26,11 +26,7 @@ # to CPPFLAGS, PLATFORM_DMALLOC_LDFLAGS to LDFLAGS, and # PLATFORM_DMALLOC_LIBS to LIBS. For more information on # dmalloc, see http://dmalloc.com. -# exceptions Enable exception handling (not supported by all platforms). # fast Enable -fast option, e.g., with Sun C++. -# include_env Enable usage of CORBA::Environment parameters that is -# compatible with TAO versions before 1.2.2. Default: -# disabled. Has no effect when building with exceptions=0 # inline Enable ACE inlining. Some platforms enable inlining by # default, others do not. If platform_macros.GNU does not # set this, inline is enabled. @@ -234,10 +230,9 @@ ifeq ($(threads),0) endif # threads #### -#### Defaults are exceptions on (1), fast off (0), threads on (1) +#### Defaults are fast off (0), threads on (1) #### and versioned_so on (1). #### -exceptions ?= 1 fast ?= 0 versioned_so ?= 1 use_dep_libs ?= 1 @@ -682,24 +677,6 @@ endif ec_typed_events ?= 1 zlib ?= 1 -ifeq ($(exceptions),0) - #### Disable the default exception handling of g++ >= 2.8.0. - ifneq ($(ACE_GNUG_ON_UNIXWARE),) - CCFLAGS += -fcheck-new - else - CCFLAGS += -fno-exceptions -fcheck-new - endif # ! ACE_GNUG_ON_UNIXWARE -else # exceptions - CPPFLAGS += -DACE_HAS_EXCEPTIONS - ifndef include_env - include_env ?= - endif - ifeq ($(include_env),1) - CPPFLAGS += -DACE_ENV_BKWD_COMPAT - endif - ACE_MAKE_OPTIONS += exceptions -endif # exceptions - profile ?= ifeq ($(profile),0) override profile = diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec index 6b5f52e77c3..e6819f44b95 100644 --- a/ACE/rpmbuild/ace-tao.spec +++ b/ACE/rpmbuild/ace-tao.spec @@ -88,6 +88,10 @@ PreReq: %install_info_prereq %insserv_prereq %fillup_prereq PreReq: pwdutils %endif +%if 0%{?mdkversion} +BuildRequires: sendmail +%endif + BuildRequires: openssl-devel BuildRequires: gcc-c++ BuildRequires: libstdc++-devel @@ -101,10 +105,6 @@ BuildRequires: zlib-devel BuildRequires: bzip2 %endif -%if 0%{?mdkversion} -BuildRequires: sendmail -%endif - BuildRequires: perl %if %{?_with_fltk:1}%{!?_with_fltk:0} @@ -1393,7 +1393,7 @@ ln -sfn %{_datadir}/ace/bin/mwc.pl %{buildroot}%{_bindir}/mwc.pl install -d %{buildroot}%{_mandir} install -d %{buildroot}%{_mandir}/man1 install ${TAO_ROOT}/TAO_IDL/tao_idl.1 %{buildroot}%{_mandir}/man1 -install ${ACE_ROOT}/apps/gperf/ace_gperf.1 %{buildroot}%{_mandir}/man1 +install ${ACE_ROOT}/apps/gperf/ACE_gperf.1 %{buildroot}%{_mandir}/man1 install -d %{buildroot}%{_infodir} install ${ACE_ROOT}/apps/gperf/ace_gperf.info %{buildroot}%{_infodir} @@ -2037,7 +2037,6 @@ fi %files -n ace-gperf %defattr(-,root,root,-) %{_bindir}/ace_gperf -%{_libdir}/libACE_gperf_lib.so.%{ACEVERSO} %attr(0644,root,root) %{_mandir}/man1/ace_gperf.1%{_extension} %attr(0644,root,root) %{_infodir}/ace_gperf.info%{_extension} diff --git a/ACE/tests/Bug_3673_Regression_Test.cpp b/ACE/tests/Bug_3673_Regression_Test.cpp index c074edbd1c9..cae18afda88 100644 --- a/ACE/tests/Bug_3673_Regression_Test.cpp +++ b/ACE/tests/Bug_3673_Regression_Test.cpp @@ -15,7 +15,6 @@ ACE_RCSID (tests, Bug_3673_Regression_Test, "$Id$") -#if defined (ACE_HAS_EXCEPTIONS) static bool construct_alpha = false; static bool destruct_alpha = false; static bool construct_beta = false; @@ -41,7 +40,6 @@ struct Test Test() { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("throw oops\n"))); throw "oops"; } }; -#endif int run_main (int, ACE_TCHAR *[]) @@ -49,7 +47,6 @@ run_main (int, ACE_TCHAR *[]) ACE_START_TEST (ACE_TEXT ("Bug_3673_Regression_Test")); int result = 0; -#if defined (ACE_HAS_EXCEPTIONS) bool caught_excep = false; try { @@ -86,10 +83,6 @@ run_main (int, ACE_TCHAR *[]) ACE_ERROR ((LM_ERROR, ACE_TEXT ("Destructor beta not called\n"))); ++result; } -#else - ACE_ERROR ((LM_INFO, - ACE_TEXT ("C++ exception support not enabled on this platform\n"))); -#endif /* ACE_HAS_EXCEPTIONS */ ACE_END_TEST; diff --git a/ACE/tests/Reactor_Exceptions_Test.cpp b/ACE/tests/Reactor_Exceptions_Test.cpp index eda68c3630e..be34ca436cf 100644 --- a/ACE/tests/Reactor_Exceptions_Test.cpp +++ b/ACE/tests/Reactor_Exceptions_Test.cpp @@ -26,8 +26,6 @@ ACE_RCSID(tests, Reactor_Exceptions_Test, "$Id$") -#if defined (ACE_HAS_EXCEPTIONS) - // Just need a simple exception class. class Except {}; @@ -129,14 +127,11 @@ worker (void) } #endif /* ACE_HAS_THREADS */ -#endif /* ACE_HAS_EXCEPTIONS */ - int run_main (int argc, ACE_TCHAR *argv[]) { ACE_START_TEST (ACE_TEXT ("Reactor_Exceptions_Test")); -#if defined (ACE_HAS_EXCEPTIONS) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting tracing\n"))); @@ -186,12 +181,6 @@ run_main (int argc, ACE_TCHAR *argv[]) ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%t) exiting main\n"))); -#else - ACE_UNUSED_ARG (argc); - ACE_UNUSED_ARG (argv); - ACE_ERROR ((LM_INFO, - ACE_TEXT ("C++ exception support not enabled on this platform\n"))); -#endif /* ACE_HAS_EXCEPTIONS */ ACE_END_TEST; return 0; diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc index 9e22984adc1..83b88815ebe 100644 --- a/ACE/tests/tests.mpc +++ b/ACE/tests/tests.mpc @@ -110,6 +110,7 @@ project(ACE Init Test) : acetest { exename = ACE_Init_Test Source_Files { ACE_Init_Test.cpp + ACE_Init_TestDlg.cpp } Resource_Files { ACE_Init_Test.rc |