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:

2 files changed, 8 insertions, 9 deletions

diff --git a/TAO/tests/POA/DSI/Database_i.cpp b/TAO/tests/POA/DSI/Database_i.cpp
index f4b2088a376..79999c36573 100644
--- a/TAO/tests/POA/DSI/Database_i.cpp
+++ b/TAO/tests/POA/DSI/Database_i.cpp
@@ -353,13 +353,13 @@ DatabaseImpl::Employee::operator delete (void *pointer)
 
   /// Overloaded new operator, nothrow_t variant.
 void *
-DatabaseImpl::Employee::operator new (size_t size, const ACE_nothrow_t &)
+DatabaseImpl::Employee::operator new (size_t size, const std::nothrow_t &)
 {
   return DATABASE::instance ()->malloc (size);
 }
 
 void
-DatabaseImpl::Employee::operator delete (void *ptr, const ACE_nothrow_t&) throw ()
+DatabaseImpl::Employee::operator delete (void *ptr, const std::nothrow_t&) throw ()
 {
   DATABASE::instance ()->free (ptr);
 }
diff --git a/TAO/tests/POA/DSI/Database_i.h b/TAO/tests/POA/DSI/Database_i.h
index b9655f16600..309adea7bbd 100644
--- a/TAO/tests/POA/DSI/Database_i.h
+++ b/TAO/tests/POA/DSI/Database_i.h
@@ -101,10 +101,9 @@ public:
   class Employee
   {
   public:
-    Employee (const char* name,
-              CORBA::Long id);
+    Employee (const char* name, CORBA::Long id);
 
-    ~Employee (void);
+    ~Employee ();
 
     const char *name () const;
     void name (const char* name);
@@ -113,16 +112,16 @@ public:
     void id (CORBA::Long id);
 
     /// 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 new (size_t);
     void operator delete (void *pointer);
 
   private:
-    CORBA::Long id_;
     // Employee ID.
+    CORBA::Long id_;
 
-    char *name_;
     // Employee name.
+    char *name_;
   };
 };