diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-10-23 18:58:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-23 18:58:07 +0200 |
| commit | 36a9f816d472c0ba515a6a9ed3f78225994c122c (patch) | |
| tree | 90884b3696b572b5462288bc8fa264f64c4be43a /ACE/tests | |
| parent | e5b34643f7fe7a92db1659d4192f80af00abb2b6 (diff) | |
| parent | 3b9024dd16208f7f37ef545b31d6a7107bda1110 (diff) | |
| download | ATCD-36a9f816d472c0ba515a6a9ed3f78225994c122c.tar.gz | |
Merge pull request #1701 from jwillemsen/jwi-signalcleanup
Minor cleanup
Diffstat (limited to 'ACE/tests')
| -rw-r--r-- | ACE/tests/Bug_2368_Regression_Test.cpp | 14 | ||||
| -rw-r--r-- | ACE/tests/Network_Adapters_Test.cpp | 4 | ||||
| -rw-r--r-- | ACE/tests/Network_Adapters_Test.h | 4 | ||||
| -rw-r--r-- | ACE/tests/Reference_Counted_Event_Handler_Test.cpp | 7 |
4 files changed, 7 insertions, 22 deletions
diff --git a/ACE/tests/Bug_2368_Regression_Test.cpp b/ACE/tests/Bug_2368_Regression_Test.cpp index 0dbacfb4d07..f3afd214362 100644 --- a/ACE/tests/Bug_2368_Regression_Test.cpp +++ b/ACE/tests/Bug_2368_Regression_Test.cpp @@ -19,8 +19,7 @@ static bool handleB_close_called = false; class My_HandlerA : public ACE_Event_Handler { public: - int handle_close (ACE_HANDLE, - ACE_Reactor_Mask) override + int handle_close (ACE_HANDLE, ACE_Reactor_Mask) override { ACE_DEBUG ((LM_DEBUG, "Handle close called\n")); @@ -29,9 +28,7 @@ public: return 0; } - int handle_signal (int, - siginfo_t *, - ucontext_t *) override + int handle_signal (int, siginfo_t *, ucontext_t *) override { ACE_DEBUG ((LM_DEBUG, "Handle signal called\n")); @@ -43,8 +40,7 @@ public: class My_HandlerB : public ACE_Event_Handler { public: - int handle_close (ACE_HANDLE, - ACE_Reactor_Mask) override + int handle_close (ACE_HANDLE, ACE_Reactor_Mask) override { ACE_DEBUG ((LM_DEBUG, "Handle close called\n")); @@ -53,9 +49,7 @@ public: return 0; } - int handle_signal (int, - siginfo_t *, - ucontext_t *) override + int handle_signal (int, siginfo_t *, ucontext_t *) override { ACE_DEBUG ((LM_DEBUG, "Handle signal called\n")); diff --git a/ACE/tests/Network_Adapters_Test.cpp b/ACE/tests/Network_Adapters_Test.cpp index 35e417c226e..e42fc226182 100644 --- a/ACE/tests/Network_Adapters_Test.cpp +++ b/ACE/tests/Network_Adapters_Test.cpp @@ -583,9 +583,7 @@ Stop_Handler::open () } int -Stop_Handler::handle_signal (int signum, - siginfo_t * , - ucontext_t *) +Stop_Handler::handle_signal (int signum, siginfo_t * , ucontext_t *) { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Stop_Handler::handle_signal - started.\n"))); diff --git a/ACE/tests/Network_Adapters_Test.h b/ACE/tests/Network_Adapters_Test.h index 4fe8cf6dbe0..ead6e6a120a 100644 --- a/ACE/tests/Network_Adapters_Test.h +++ b/ACE/tests/Network_Adapters_Test.h @@ -185,9 +185,7 @@ public: virtual int handle_input (ACE_HANDLE); // Dispatches handle_input () notification. - virtual int handle_signal (int signum, - siginfo_t * = 0, - ucontext_t * = 0); + virtual int handle_signal (int signum, siginfo_t * = 0, ucontext_t * = 0); virtual int handle_timeout (ACE_Time_Value const & current_time, void const * act = 0); diff --git a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp index 61ab493c66c..7e2081b837d 100644 --- a/ACE/tests/Reference_Counted_Event_Handler_Test.cpp +++ b/ACE/tests/Reference_Counted_Event_Handler_Test.cpp @@ -40,7 +40,6 @@ static const char *two_second_timeout = "two second timeout"; class Reference_Counted_Event_Handler : public ACE_Event_Handler { public: - Reference_Counted_Event_Handler (int &events); ~Reference_Counted_Event_Handler () override; @@ -64,7 +63,6 @@ public: ACE_Pipe pipe_; int &events_; - }; Reference_Counted_Event_Handler::Reference_Counted_Event_Handler (int &events) @@ -470,7 +468,6 @@ reference_count_2 (ACE_Reactor_Impl *impl) class Simple_Event_Handler : public ACE_Event_Handler { public: - Simple_Event_Handler (int &events, int close_count); @@ -485,15 +482,13 @@ public: int handle_signal (int, siginfo_t *, ucontext_t *) override; - int handle_close (ACE_HANDLE, - ACE_Reactor_Mask) override; + int handle_close (ACE_HANDLE, ACE_Reactor_Mask) override; ACE_Pipe pipe_; int &events_; int close_count_; - }; Simple_Event_Handler::Simple_Event_Handler (int &events, |