Merge pull request #1601 from jwillemsen/jwi-dlltest2

Further extend DLL test with exceptions

3 files changed, 18 insertions, 1 deletions

diff --git a/ACE/tests/DLL_Test_Impl.cpp b/ACE/tests/DLL_Test_Impl.cpp
index d91abff98f7..23f503e3491 100644
--- a/ACE/tests/DLL_Test_Impl.cpp
+++ b/ACE/tests/DLL_Test_Impl.cpp
@@ -76,7 +76,7 @@ Hello_Impl::operator delete (void *ptr)
 }
 
 extern "C" ACE_Svc_Export Hello *
-get_hello (void)
+get_hello ()
 {
   Hello *hello {};
 
@@ -160,6 +160,17 @@ Child::test ()
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("caught derived as base\n")));
   }
 
+  std::unique_ptr<Base> derived_excep_alloc (Derived::_alloc ());
+  try
+  {
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("throwing derived exception allocated with _alloc\n")));
+    derived_excep_base->_raise();
+  }
+  catch (const Derived&)
+  {
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("caught derived exception\n")));
+  }
+
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("testing exceptions finished\n")));
 }
 
diff --git a/ACE/tests/DLL_Test_Parent.cpp b/ACE/tests/DLL_Test_Parent.cpp
index 4f2e4aacac8..f680378c4e1 100644
--- a/ACE/tests/DLL_Test_Parent.cpp
+++ b/ACE/tests/DLL_Test_Parent.cpp
@@ -35,3 +35,8 @@ Derived::_raise () const
   throw *this;
 }
 
+Base*
+Derived::_alloc()
+{
+  return new Derived();
+}
diff --git a/ACE/tests/DLL_Test_Parent.h b/ACE/tests/DLL_Test_Parent.h
index c9c36b95b7f..bb4cf4e4e79 100644
--- a/ACE/tests/DLL_Test_Parent.h
+++ b/ACE/tests/DLL_Test_Parent.h
@@ -53,6 +53,7 @@ class DLL_Test_Parent_Export Derived : public Base
 {
 public:
   Derived ();
+  static Base* _alloc ();
   void _raise () const override;
   ~Derived () override = default;
 };