diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-06-21 15:52:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-21 15:52:06 +0200 |
| commit | 7f52a0eb64a4847e013af14558c96184b3494081 (patch) | |
| tree | 15d64bbe81ce80fd1ed3beeb83466d1be4d18b52 /ACE | |
| parent | 7b35108cb72cd2d53cb21629c5e7962e2b61011a (diff) | |
| parent | edb65903473f95d16434895c1cc772e0f413eee5 (diff) | |
| download | ATCD-7f52a0eb64a4847e013af14558c96184b3494081.tar.gz | |
Merge pull request #1567 from jwillemsen/jwi-overridert
Use override instead of virtual
Diffstat (limited to 'ACE')
| -rw-r--r-- | ACE/ace/OS_Thread_Adapter.h | 3 | ||||
| -rw-r--r-- | ACE/ace/Object_Manager_Base.h | 4 | ||||
| -rw-r--r-- | ACE/ace/Thread_Adapter.cpp | 6 | ||||
| -rw-r--r-- | ACE/ace/Thread_Adapter.h | 3 | ||||
| -rw-r--r-- | ACE/examples/APG/Shared_Memory/Pool_Growth.cpp | 4 |
5 files changed, 8 insertions, 12 deletions
diff --git a/ACE/ace/OS_Thread_Adapter.h b/ACE/ace/OS_Thread_Adapter.h index a03c361ef4c..2b929dc5abc 100644 --- a/ACE/ace/OS_Thread_Adapter.h +++ b/ACE/ace/OS_Thread_Adapter.h @@ -48,8 +48,7 @@ public: , ACE_SEH_EXCEPT_HANDLER selector = 0 , ACE_SEH_EXCEPT_HANDLER handler = 0 #endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - , long cancel_flags = 0 - ); + , long cancel_flags = 0); /** * Execute the @a user_func_ with the @a arg. This function deletes diff --git a/ACE/ace/Object_Manager_Base.h b/ACE/ace/Object_Manager_Base.h index 619311eb249..a379a6b199e 100644 --- a/ACE/ace/Object_Manager_Base.h +++ b/ACE/ace/Object_Manager_Base.h @@ -179,10 +179,10 @@ public: #if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS) /// Get/Set TSS exception action. - static ACE_SEH_EXCEPT_HANDLER seh_except_selector (void); + static ACE_SEH_EXCEPT_HANDLER seh_except_selector (); static ACE_SEH_EXCEPT_HANDLER seh_except_selector (ACE_SEH_EXCEPT_HANDLER); - static ACE_SEH_EXCEPT_HANDLER seh_except_handler (void); + static ACE_SEH_EXCEPT_HANDLER seh_except_handler (); static ACE_SEH_EXCEPT_HANDLER seh_except_handler (ACE_SEH_EXCEPT_HANDLER); #endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ diff --git a/ACE/ace/Thread_Adapter.cpp b/ACE/ace/Thread_Adapter.cpp index 024827d01a3..dbbd6a6f23d 100644 --- a/ACE/ace/Thread_Adapter.cpp +++ b/ACE/ace/Thread_Adapter.cpp @@ -20,8 +20,7 @@ ACE_Thread_Adapter::ACE_Thread_Adapter (ACE_THR_FUNC user_func, , ACE_SEH_EXCEPT_HANDLER selector, ACE_SEH_EXCEPT_HANDLER handler #endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - , long cancel_flags - ) + , long cancel_flags) : ACE_Base_Thread_Adapter ( user_func , arg @@ -31,8 +30,7 @@ ACE_Thread_Adapter::ACE_Thread_Adapter (ACE_THR_FUNC user_func, , selector , handler #endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - , cancel_flags - ) + , cancel_flags) , thr_mgr_ (tm) { ACE_OS_TRACE ("ACE_Thread_Adapter::ACE_Thread_Adapter"); diff --git a/ACE/ace/Thread_Adapter.h b/ACE/ace/Thread_Adapter.h index 8bcda99d7ea..2ccf7f5bc89 100644 --- a/ACE/ace/Thread_Adapter.h +++ b/ACE/ace/Thread_Adapter.h @@ -54,8 +54,7 @@ public: , ACE_SEH_EXCEPT_HANDLER selector = 0, ACE_SEH_EXCEPT_HANDLER handler = 0 #endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ - , long cancel_flags = 0 - ); + , long cancel_flags = 0); /** * Execute the <user_func_> with the <arg>. This function deletes diff --git a/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp b/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp index a3d57985f87..8b3a254bf9e 100644 --- a/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp +++ b/ACE/examples/APG/Shared_Memory/Pool_Growth.cpp @@ -153,9 +153,9 @@ int processWin32Record (ALLOCATOR *shmem_allocator) { return processRecord (shmem_allocator); } - ACE_SEH_EXCEPT (handle_remap (GetExceptionInformation ())) - { } + { + } return 0; } |