ChangeLogTag:Wed May 1 15:49:33 2002 Steve Huston <shuston@riverace.com>

5 files changed, 42 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index b0a6b62044d..0e13c03fdf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed May  1 15:49:33 2002  Steve Huston  <shuston@riverace.com>
+
+        * tests/DLL_Test_Impl.{h cpp}: Add a nothrow variant of operator new
+          for platforms with ACE_HAS_NEW_NOTHROW (like HP-UX, aC++). Also
+          made Hello_Impl's placement delete method conditional on
+          ACE_LACKS_PLACEMENT_OPERATOR_DELETE, also an HP aC++ attribute.
+
 Tue Apr 30 14:54:02 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* bin/auto_run_tests.lst: Added $TAO_ROOT/tests/Connection_Timeout
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index b0a6b62044d..0e13c03fdf4 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Wed May  1 15:49:33 2002  Steve Huston  <shuston@riverace.com>
+
+        * tests/DLL_Test_Impl.{h cpp}: Add a nothrow variant of operator new
+          for platforms with ACE_HAS_NEW_NOTHROW (like HP-UX, aC++). Also
+          made Hello_Impl's placement delete method conditional on
+          ACE_LACKS_PLACEMENT_OPERATOR_DELETE, also an HP aC++ attribute.
+
 Tue Apr 30 14:54:02 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* bin/auto_run_tests.lst: Added $TAO_ROOT/tests/Connection_Timeout
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index b0a6b62044d..0e13c03fdf4 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,10 @@
+Wed May  1 15:49:33 2002  Steve Huston  <shuston@riverace.com>
+
+        * tests/DLL_Test_Impl.{h cpp}: Add a nothrow variant of operator new
+          for platforms with ACE_HAS_NEW_NOTHROW (like HP-UX, aC++). Also
+          made Hello_Impl's placement delete method conditional on
+          ACE_LACKS_PLACEMENT_OPERATOR_DELETE, also an HP aC++ attribute.
+
 Tue Apr 30 14:54:02 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* bin/auto_run_tests.lst: Added $TAO_ROOT/tests/Connection_Timeout
diff --git a/tests/DLL_Test_Impl.cpp b/tests/DLL_Test_Impl.cpp
index 5e98b5d58d3..c4ef95a3d77 100644
--- a/tests/DLL_Test_Impl.cpp
+++ b/tests/DLL_Test_Impl.cpp
@@ -60,12 +60,25 @@ Hello_Impl::operator new (size_t bytes)
   ACE_DEBUG ((LM_INFO, "Hello_Impl::new\n"));
   return ::new char[bytes];
 }
+
+#if defined (ACE_HAS_NEW_NOTHROW)
+  /// Overloaded new operator, nothrow_t variant.
+void *
+Hello_Impl::operator new (size_t bytes, const ACE_nothrow_t &nt)
+{
+  ACE_DEBUG ((LM_INFO, "Hello_Impl::new\n"));
+  return ::new (nt) char[bytes];
+}
+#endif /* ACE_HAS_NEW_NOTHROW */
+
+#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE)
 void
 Hello_Impl::operator delete (void *ptr)
 {
   ACE_DEBUG ((LM_INFO, "Hello_Impl::delete\n"));
   delete [] ((char *) ptr);
 }
+#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */
 
 extern "C" ACE_Svc_Export Hello *
 get_hello (void)
diff --git a/tests/DLL_Test_Impl.h b/tests/DLL_Test_Impl.h
index 8478ce8916c..11505a5085b 100644
--- a/tests/DLL_Test_Impl.h
+++ b/tests/DLL_Test_Impl.h
@@ -51,7 +51,15 @@ public:
   // created/deleted using the memory allocator associated with the
   // DLL/SO.
   void *operator new (size_t bytes);
+
+#if defined (ACE_HAS_NEW_NOTHROW)
+  /// Overloaded new operator, nothrow_t variant.
+  void *operator new (size_t bytes, const ACE_nothrow_t &nt);
+#endif /* ACE_HAS_NEW_NOTHROW */
+#if !defined (ACE_LACKS_PLACEMENT_OPERATOR_DELETE)
   void operator delete (void *ptr);
+#endif /* ACE_LACKS_PLACEMENT_OPERATOR_DELETE */
+
 };
 
 #endif /* ACE_TESTS_DLL_TEST_IMPL_H */