diff options
Diffstat (limited to 'ACE/tests/Timer_Queue_Reference_Counting_Test.cpp')
| -rw-r--r-- | ACE/tests/Timer_Queue_Reference_Counting_Test.cpp | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp b/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp index 223681ccd20..94f7f395e85 100644 --- a/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp +++ b/ACE/tests/Timer_Queue_Reference_Counting_Test.cpp @@ -48,13 +48,13 @@ public: Reference_Counted_Event_Handler (int expected_number_of_handle_close_calls); - ~Reference_Counted_Event_Handler (void); + ~Reference_Counted_Event_Handler () override; int handle_timeout (const ACE_Time_Value &, - const void *); + const void *) override; int handle_close (ACE_HANDLE handle, - ACE_Reactor_Mask masks); + ACE_Reactor_Mask masks) override; int expected_number_of_handle_close_calls_; int number_of_handle_close_calls_; @@ -70,15 +70,15 @@ Reference_Counted_Event_Handler::Reference_Counted_Event_Handler (int expected_n if (debug) ACE_DEBUG ((LM_DEBUG, "Reference count in Reference_Counted_Event_Handler() is %d\n", - this->reference_count_.value ())); + this->reference_count_.load ())); } -Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler (void) +Reference_Counted_Event_Handler::~Reference_Counted_Event_Handler () { if (debug) ACE_DEBUG ((LM_DEBUG, "Reference count in ~Reference_Counted_Event_Handler() is %d\n", - this->reference_count_.value ())); + this->reference_count_.load ())); if (this->expected_number_of_handle_close_calls_ != -1) ACE_TEST_ASSERT (this->number_of_handle_close_calls_ == @@ -93,7 +93,7 @@ Reference_Counted_Event_Handler::handle_timeout (const ACE_Time_Value &, ACE_DEBUG ((LM_DEBUG, "Reference count in Reference_Counted_Event_Handler::handle_timeout() for arg = %C is %d\n", (const char *) arg, - this->reference_count_.value ())); + this->reference_count_.load ())); return 0; } @@ -108,7 +108,7 @@ Reference_Counted_Event_Handler::handle_close (ACE_HANDLE handle, "Reference count is %d\n", handle, masks, - this->reference_count_.value ())); + this->reference_count_.load ())); ++this->number_of_handle_close_calls_; @@ -249,7 +249,7 @@ cancellation_test<TIMER_QUEUE>::cancellation_test (const char *timer_queue_type) } } -typedef int (*Expire_Function) (ACE_Timer_Queue &timer_queue); +using Expire_Function = int (*)(ACE_Timer_Queue &); int invoke_expire (ACE_Timer_Queue &timer_queue) @@ -350,25 +350,25 @@ class Simple_Event_Handler : public ACE_Event_Handler { public: - Simple_Event_Handler (void); + Simple_Event_Handler (); - ~Simple_Event_Handler (void); + ~Simple_Event_Handler () override; int handle_timeout (const ACE_Time_Value &, - const void *); + const void *) override; int handle_close (ACE_HANDLE, - ACE_Reactor_Mask); + ACE_Reactor_Mask) override; }; -Simple_Event_Handler::Simple_Event_Handler (void) +Simple_Event_Handler::Simple_Event_Handler () { if (debug) ACE_DEBUG ((LM_DEBUG, "Simple_Event_Handler()\n")); } -Simple_Event_Handler::~Simple_Event_Handler (void) +Simple_Event_Handler::~Simple_Event_Handler () { if (debug) ACE_DEBUG ((LM_DEBUG, |