diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-01-05 15:03:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-05 15:03:21 +0100 |
| commit | cfd227009a4548b82cd3099709d8fafdf6a06207 (patch) | |
| tree | ef033d5707f1756156fb02e9c3c808140165d9e6 | |
| parent | 93d1fcfa85a94cd0579b25641348879d03519553 (diff) | |
| parent | ef581b6d38d0feba6956cacb3e409c271a302f72 (diff) | |
| download | ATCD-cfd227009a4548b82cd3099709d8fafdf6a06207.tar.gz | |
Merge pull request #1375 from jwillemsen/jwi-DEC_CXX
Removed checks for DEC_CXX
| -rw-r--r-- | TAO/tests/Crashed_Callback/Crashed_Callback.cpp | 2 | ||||
| -rw-r--r-- | TAO/tests/Faults/test_i.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp index bd41b09e3f9..b76d85f7670 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp @@ -17,7 +17,7 @@ Crashed_Callback::crash_now_please (void) "(%P|%t) Crashed_Callback - crashing application\n")); // OpenVMS seems to hang and not abort and dump core when abort() is called // here. This needs further -#if defined (DEC_CXX) || defined (ACE_OPENVMS) +#if defined (ACE_OPENVMS) ACE_OS::_exit(); #else ACE_OS::abort(); 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(); |