summaryrefslogtreecommitdiff
path: root/TAO/tao
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 /TAO/tao
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 'TAO/tao')
-rw-r--r--TAO/tao/Var_Size_Argument_T.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/TAO/tao/Var_Size_Argument_T.cpp b/TAO/tao/Var_Size_Argument_T.cpp
index 666a4831cd2..a736630c989 100644
--- a/TAO/tao/Var_Size_Argument_T.cpp
+++ b/TAO/tao/Var_Size_Argument_T.cpp
@@ -98,7 +98,7 @@ TAO::Out_Var_Size_Argument_T<S,Insert_Policy>::demarshal (
TAO_InputCDR & cdr
)
{
- this->x_ = new (ACE_nothrow) S;
+ this->x_ = new (std::nothrow) S;
return cdr >> *this->x_;
}