diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-06-18 14:49:17 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-06-18 14:49:17 +0200 |
| commit | 2871e2a915aaec15988365222766e5f7227603d4 (patch) | |
| tree | 4e983e6dafc64b60580a6bcd23ebed352ddd1f70 | |
| parent | 7a4b933220109962afd6ed72fe4e352184536e69 (diff) | |
| download | ATCD-2871e2a915aaec15988365222766e5f7227603d4.tar.gz | |
No need to check for ACE_WIN32 in combination with ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS
* ACE/ace/Global_Macros.h:
* ACE/ace/OS_Log_Msg_Attributes.inl:
* ACE/tests/Compiler_Features_39_Test.cpp:
| -rw-r--r-- | ACE/ace/Global_Macros.h | 6 | ||||
| -rw-r--r-- | ACE/ace/OS_Log_Msg_Attributes.inl | 4 | ||||
| -rw-r--r-- | ACE/tests/Compiler_Features_39_Test.cpp | 1 |
3 files changed, 5 insertions, 6 deletions
diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index 4ce34487b4f..8918947791a 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -811,15 +811,15 @@ ACE_MAKE_SVC_CONFIG_FACTORY_NAME(ACE_VERSIONED_NAMESPACE_NAME,SERVICE_CLASS) (AC # define ACE_NOOP(x) -#if defined (ACE_WIN32) && defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) # define ACE_SEH_TRY __try # define ACE_SEH_EXCEPT(X) __except(X) # define ACE_SEH_FINALLY __finally -#else /* !ACE_WIN32 */ +#else /* !ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ # define ACE_SEH_TRY if (1) # define ACE_SEH_EXCEPT(X) while (0) # define ACE_SEH_FINALLY if (1) -#endif /* ACE_WIN32 */ +#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ // Handle ACE_Message_Queue. # define ACE_SYNCH_DECL typename _ACE_SYNCH diff --git a/ACE/ace/OS_Log_Msg_Attributes.inl b/ACE/ace/OS_Log_Msg_Attributes.inl index 744ac94870f..0fa53f421be 100644 --- a/ACE/ace/OS_Log_Msg_Attributes.inl +++ b/ACE/ace/OS_Log_Msg_Attributes.inl @@ -9,10 +9,10 @@ ACE_OS_Log_Msg_Attributes::ACE_OS_Log_Msg_Attributes () : tracing_enabled_ (0), restart_ (true), trace_depth_ (0) -# if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) , seh_except_selector_ (0), seh_except_handler_ (0) -# endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ { } diff --git a/ACE/tests/Compiler_Features_39_Test.cpp b/ACE/tests/Compiler_Features_39_Test.cpp index 2050475f247..7942f4d21af 100644 --- a/ACE/tests/Compiler_Features_39_Test.cpp +++ b/ACE/tests/Compiler_Features_39_Test.cpp @@ -4,7 +4,6 @@ */ #include "test_config.h" -#include "ace/CDR_Base.h" #if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) int ExFilter(EXCEPTION_POINTERS *ep, DWORD code_arg) |