diff options
Diffstat (limited to 'ACE/include/makeinclude/wrapper_macros.GNU')
| -rw-r--r-- | ACE/include/makeinclude/wrapper_macros.GNU | 25 |
1 files changed, 1 insertions, 24 deletions
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 = |