summaryrefslogtreecommitdiff
path: root/TAO/tests/Faults/test_i.cpp
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2021-01-05 18:05:19 +0100
committerGitHub <noreply@github.com>2021-01-05 18:05:19 +0100
commit7c231c23bf5f368789166d234f91e2be5c39bb54 (patch)
tree4d953af6237c36bfe3bf0689d5d4b3a8a2ae44d0 /TAO/tests/Faults/test_i.cpp
parent975aedf61a4f751e76e4abfa7d8235e608ae37cb (diff)
parent169c93b6746c3a9591b58cfb7404d14dde3df2f8 (diff)
downloadATCD-7c231c23bf5f368789166d234f91e2be5c39bb54.tar.gz
Merge branch 'master' into jwi-ACE_HAS_CPLUSPLUS_HEADERS
Diffstat (limited to 'TAO/tests/Faults/test_i.cpp')
-rw-r--r--TAO/tests/Faults/test_i.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp
index 449e6db1780..a55e19ca977 100644
--- a/TAO/tests/Faults/test_i.cpp
+++ b/TAO/tests/Faults/test_i.cpp
@@ -15,7 +15,7 @@ Callback_i::shutdown (CORBA::Boolean is_clean)
// OpenVMS seems to hang and not abort and dump core when abort() is called
// here. This needs further investigation.
-#if defined (DEC_CXX) || defined (ACE_OPENVMS)
+#if defined (ACE_OPENVMS)
ACE_OS::_exit();
#else
ACE_OS::abort();
@@ -51,7 +51,7 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean)
if (is_clean == 0)
{
ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown\n"));
-#if defined (DEC_CXX) || defined (ACE_OPENVMS)
+#if defined (ACE_OPENVMS)
ACE_OS::_exit();
#else
ACE_OS::abort();