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:

3 files changed, 9 insertions, 9 deletions

diff --git a/ACE/tests/DLL_Test_Impl.cpp b/ACE/tests/DLL_Test_Impl.cpp
index 8d323651131..8457a82623f 100644
--- a/ACE/tests/DLL_Test_Impl.cpp
+++ b/ACE/tests/DLL_Test_Impl.cpp
@@ -54,14 +54,14 @@ Hello_Impl::operator new (size_t bytes)
 
 /// Overloaded new operator, nothrow_t variant.
 void *
-Hello_Impl::operator new (size_t bytes, const ACE_nothrow_t &nt)
+Hello_Impl::operator new (size_t bytes, const std::nothrow_t &nt)
 {
   ACE_DEBUG ((LM_INFO, "Hello_Impl::new\n"));
   return ::new (nt) char[bytes];
 }
 
 void
-Hello_Impl::operator delete (void *ptr, const ACE_nothrow_t&) throw ()
+Hello_Impl::operator delete (void *ptr, const std::nothrow_t&) throw ()
 {
   ACE_DEBUG ((LM_INFO, "Hello_Impl::delete\n"));
   ::delete [] static_cast<char *> (ptr);
diff --git a/ACE/tests/DLL_Test_Impl.h b/ACE/tests/DLL_Test_Impl.h
index 4ba42e5763b..97db4904e42 100644
--- a/ACE/tests/DLL_Test_Impl.h
+++ b/ACE/tests/DLL_Test_Impl.h
@@ -51,8 +51,8 @@ public:
   void *operator new (size_t bytes);
 
   /// Overloaded new operator, nothrow_t variant.
-  void *operator new (size_t bytes, const ACE_nothrow_t &nt);
-  void operator delete (void *p, const ACE_nothrow_t&) throw ();
+  void *operator new (size_t bytes, const std::nothrow_t &nt);
+  void operator delete (void *p, const std::nothrow_t&) throw ();
 
   void operator delete (void *ptr);
 };
diff --git a/ACE/tests/Dynamic_Test.cpp b/ACE/tests/Dynamic_Test.cpp
index 62d7080ea0e..958ac6fa10e 100644
--- a/ACE/tests/Dynamic_Test.cpp
+++ b/ACE/tests/Dynamic_Test.cpp
@@ -24,8 +24,8 @@ public:
 
   void *operator new (size_t n);
 
-  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 ();
   void * operator new (size_t n, void *p);
 
   void operator delete (void *);
@@ -61,7 +61,7 @@ A::operator new (size_t n)
 }
 
 void*
-A::operator new (size_t n, const ACE_nothrow_t&) throw()
+A::operator new (size_t n, const std::nothrow_t&) throw()
 {
   ACE_Dynamic *const dynamic_instance = ACE_Dynamic::instance ();
 
@@ -80,12 +80,12 @@ A::operator new (size_t n, const ACE_nothrow_t&) throw()
       // storage, depending on config flags).
       dynamic_instance->set ();
 
-      return ::new(ACE_nothrow) char[n];
+      return ::new(std::nothrow) char[n];
     }
 }
 
 void
-A::operator delete (void *p, const ACE_nothrow_t&) throw()
+A::operator delete (void *p, const std::nothrow_t&) throw()
 {
   ::delete [] static_cast <char *> (p);
 }