summaryrefslogtreecommitdiff
path: root/ACE/tests/Recursive_Condition_Test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ACE/tests/Recursive_Condition_Test.cpp')
-rw-r--r--ACE/tests/Recursive_Condition_Test.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/ACE/tests/Recursive_Condition_Test.cpp b/ACE/tests/Recursive_Condition_Test.cpp
index e1e596edf71..b7b30248c4b 100644
--- a/ACE/tests/Recursive_Condition_Test.cpp
+++ b/ACE/tests/Recursive_Condition_Test.cpp
@@ -22,16 +22,16 @@
#if defined (ACE_HAS_THREADS)
-typedef ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap> Thread_Timer_Queue;
+using Thread_Timer_Queue = ACE_Thread_Timer_Queue_Adapter<ACE_Timer_Heap>;
class Test_Handler : public ACE_Event_Handler
{
public:
- Test_Handler (void) : nr_expirations_ (0) {}
- int nr_expirations (void) { return this->nr_expirations_; }
+ Test_Handler () : nr_expirations_ (0) {}
+ int nr_expirations () { return this->nr_expirations_; }
- virtual int handle_timeout (const ACE_Time_Value &,
- const void *arg)
+ int handle_timeout (const ACE_Time_Value &,
+ const void *arg) override
{
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Test_Handler::handle_timeout\n")));
++this->nr_expirations_;
@@ -87,7 +87,7 @@ waiter (void *)
}
static int
-test_1 (void)
+test_1 ()
{
protected_int = 1;
if (ACE_Thread_Manager::instance()->spawn (waiter) == -1)
@@ -116,7 +116,7 @@ test_1 (void)
}
static int
-test_2 (void)
+test_2 ()
{
protected_int = 1;
if (ACE_Thread_Manager::instance()->spawn (waiter) == -1)
@@ -146,7 +146,7 @@ test_2 (void)
}
static int
-test_3 (void)
+test_3 ()
{
protected_int = 1;
if (ACE_Thread_Manager::instance()->spawn_n (4, waiter) == -1)
@@ -174,7 +174,7 @@ test_3 (void)
}
static int
-test_4 (void)
+test_4 ()
{
const int recurse_count = 3;