diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-06-06 10:23:38 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-06-06 10:23:38 +0200 |
| commit | 9a4de67ddf1ce60fe8e56c00ee92e52593c09973 (patch) | |
| tree | 3bc5fb24423c157eeecb398c31d9a39ab8d63795 /ACE/ace/CORBA_macros.h | |
| parent | 0c1250b0b20ca014faf977584a2586d787394ea2 (diff) | |
| download | ATCD-9a4de67ddf1ce60fe8e56c00ee92e52593c09973.tar.gz | |
All compilers we currently support throw on new so always define ACE_NEW_THROWS_EXCEPTIONS and removed code for the case it was not defined
* ACE/ace/Bound_Ptr.inl:
* ACE/ace/CORBA_macros.h:
* ACE/ace/Future.cpp:
* ACE/ace/OS_Memory.h:
* ACE/ace/README:
* ACE/ace/Refcounted_Auto_Ptr.inl:
* ACE/ace/config-all.h:
* ACE/ace/config-hpux-11.00.h:
* ACE/ace/config-icc-common.h:
* ACE/ace/config-integritySCA.h:
* ACE/ace/config-mqx.h:
* ACE/ace/config-openvms.h:
* ACE/tests/New_Fail_Test.cpp:
Diffstat (limited to 'ACE/ace/CORBA_macros.h')
| -rw-r--r-- | ACE/ace/CORBA_macros.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/ACE/ace/CORBA_macros.h b/ACE/ace/CORBA_macros.h index 995aa2e9c80..e6eef8856fc 100644 --- a/ACE/ace/CORBA_macros.h +++ b/ACE/ace/CORBA_macros.h @@ -41,9 +41,7 @@ # define ACE_del_bad_alloc #endif -#if defined(ACE_NEW_THROWS_EXCEPTIONS) - -# if defined (ACE_HAS_NEW_NOTHROW) +#if defined (ACE_HAS_NEW_NOTHROW) # define ACE_NEW_THROW_EX(POINTER,CONSTRUCTOR,EXCEPTION) \ do { POINTER = new (ACE_nothrow) CONSTRUCTOR; \ @@ -57,16 +55,7 @@ catch (ACE_bad_alloc) { ACE_del_bad_alloc throw EXCEPTION; } \ } while (0) -# endif /* ACE_HAS_NEW_NOTHROW */ - -#else /* ! ACE_NEW_THROWS_EXCEPTIONS */ - -# define ACE_NEW_THROW_EX(POINTER,CONSTRUCTOR,EXCEPTION) \ - do { POINTER = new CONSTRUCTOR; \ - if (POINTER == 0) { throw EXCEPTION; } \ - } while (0) - -#endif /* ACE_NEW_THROWS_EXCEPTIONS */ +# endif /* ACE_HAS_NEW_NOTHROW */ // FUZZ: disable check_for_ACE_Guard # define ACE_GUARD_THROW_EX(MUTEX,OBJ,LOCK,EXCEPTION) \ |