From 6b379156a30c1e708cefc87a89dd0ad820848c1a Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Sat, 26 Jun 2021 09:11:42 +0200 Subject: Renamed ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS to ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS * ACE/NEWS: * ACE/ace/Base_Thread_Adapter.cpp: * ACE/ace/Base_Thread_Adapter.h: * ACE/ace/Global_Macros.h: * ACE/ace/Log_Msg.cpp: * ACE/ace/Log_Msg.h: * ACE/ace/MEM_IO.inl: * ACE/ace/Malloc_T.cpp: * ACE/ace/OS_Log_Msg_Attributes.h: * ACE/ace/OS_Log_Msg_Attributes.inl: * ACE/ace/OS_NS_Thread.cpp: * ACE/ace/OS_Thread_Adapter.cpp: * ACE/ace/OS_Thread_Adapter.h: * ACE/ace/Object_Manager_Base.cpp: * ACE/ace/Object_Manager_Base.h: * ACE/ace/README: * ACE/ace/Thread_Adapter.cpp: * ACE/ace/Thread_Adapter.h: * ACE/ace/Thread_Manager.cpp: * ACE/ace/config-all.h: * ACE/ace/config-lite.h: * ACE/ace/config-win32-borland.h: * ACE/ace/config-win32-msvc.h: * ACE/tests/Compiler_Features_39_Test.cpp: --- ACE/ace/Thread_Adapter.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ACE/ace/Thread_Adapter.cpp') diff --git a/ACE/ace/Thread_Adapter.cpp b/ACE/ace/Thread_Adapter.cpp index dbbd6a6f23d..ec43c7bc2d9 100644 --- a/ACE/ace/Thread_Adapter.cpp +++ b/ACE/ace/Thread_Adapter.cpp @@ -16,20 +16,20 @@ ACE_Thread_Adapter::ACE_Thread_Adapter (ACE_THR_FUNC user_func, ACE_THR_C_FUNC entry_point, ACE_Thread_Manager *tm, ACE_Thread_Descriptor *td -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) , ACE_SEH_EXCEPT_HANDLER selector, ACE_SEH_EXCEPT_HANDLER handler -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ , long cancel_flags) : ACE_Base_Thread_Adapter ( user_func , arg , entry_point , td -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) , selector , handler -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ , cancel_flags) , thr_mgr_ (tm) { @@ -159,13 +159,13 @@ ACE_Thread_Adapter::invoke_i () status = (*func) (arg); } -#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) +#if defined (ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS) ACE_SEH_EXCEPT (ACE_OS_Object_Manager::seh_except_selector ()( (void *) GetExceptionInformation ())) { ACE_OS_Object_Manager::seh_except_handler ()(0); } -#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ +#endif /* ACE_HAS_WIN32_STRUCTURED_EXCEPTIONS */ } ACE_SEH_FINALLY -- cgit v1.2.1