Merge branch 'master' into jwi-ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB

1 files changed, 3 insertions, 6 deletions

diff --git a/ACE/tests/DLL_Test_Impl.cpp b/ACE/tests/DLL_Test_Impl.cpp
index 06b093a852d..8457a82623f 100644
--- a/ACE/tests/DLL_Test_Impl.cpp
+++ b/ACE/tests/DLL_Test_Impl.cpp
@@ -52,24 +52,21 @@ Hello_Impl::operator new (size_t bytes)
   return ::new char[bytes];
 }
 
-#if defined (ACE_HAS_NEW_NOTHROW)
-  /// Overloaded new operator, nothrow_t variant.
+/// 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);
 }
 
-#endif /* ACE_HAS_NEW_NOTHROW */
-
 void
 Hello_Impl::operator delete (void *ptr)
 {