summaryrefslogtreecommitdiff
path: root/ACE/ace/CORBA_macros.h
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2021-06-06 18:04:12 +0200
committerJohnny Willemsen <jwillemsen@remedy.nl>2021-06-06 18:04:12 +0200
commita436568e52a5a78afe7b039b4c6b1e089369eba6 (patch)
treec8c6807d415468364d64c4989fd8a24fa7146f05 /ACE/ace/CORBA_macros.h
parent1652ce786e3f76875cfa9008ac83682c4828d6a6 (diff)
downloadATCD-a436568e52a5a78afe7b039b4c6b1e089369eba6.tar.gz
Make use of std::nothrow/std::nothrow_t/std::badalloc, ACE macros for these are kept for backward compatiblity
* ACE/ace/CORBA_macros.h: * ACE/ace/OS_Memory.h: * ACE/ace/Svc_Handler.cpp: * ACE/ace/Svc_Handler.h: * ACE/examples/DLL/Newsweek.cpp: * ACE/examples/DLL/Newsweek.h: * ACE/examples/DLL/Today.cpp: * ACE/examples/DLL/Today.h: * ACE/examples/Shared_Malloc/test_persistence.cpp: * ACE/tests/DLL_Test_Impl.cpp: * ACE/tests/DLL_Test_Impl.h: * ACE/tests/Dynamic_Test.cpp: * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp: * TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context_Factory.cpp: * TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp: * TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context_Factory.cpp: * TAO/tao/Var_Size_Argument_T.cpp: * TAO/tests/POA/DSI/Database_i.cpp: * TAO/tests/POA/DSI/Database_i.h:
Diffstat (limited to 'ACE/ace/CORBA_macros.h')
-rw-r--r--ACE/ace/CORBA_macros.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/ace/CORBA_macros.h b/ACE/ace/CORBA_macros.h
index 06da1889ace..88b8fcffe50 100644
--- a/ACE/ace/CORBA_macros.h
+++ b/ACE/ace/CORBA_macros.h
@@ -42,8 +42,8 @@
#endif
#define ACE_NEW_THROW_EX(POINTER,CONSTRUCTOR,EXCEPTION) \
- do { POINTER = new (ACE_nothrow) CONSTRUCTOR; \
- if (POINTER == 0) { throw EXCEPTION; } \
+ do { POINTER = new (std::nothrow) CONSTRUCTOR; \
+ if (!POINTER) { throw EXCEPTION; } \
} while (0)
// FUZZ: disable check_for_ACE_Guard