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:

1 files changed, 2 insertions, 2 deletions

diff --git a/ACE/ace/Svc_Handler.h b/ACE/ace/Svc_Handler.h
index 9fb174e16b6..f4db11ea9a5 100644
--- a/ACE/ace/Svc_Handler.h
+++ b/ACE/ace/Svc_Handler.h
@@ -174,8 +174,8 @@ public:
   /// <Svc_Handler> is allocated dynamically, which allows it to clean
   /// itself up correctly whether or not it's allocated statically or
   /// dynamically.
-  void *operator new (size_t n, const ACE_nothrow_t&) throw();
-  void operator delete (void *p, const ACE_nothrow_t&) throw ();
+  void *operator new (size_t n, const std::nothrow_t&) throw();
+  void operator delete (void *p, const std::nothrow_t&) throw ();
 
   /// This operator permits "placement new" on a per-object basis.
   void * operator new (size_t n, void *p);