diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-12-12 16:02:27 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-12-12 16:02:27 +0100 |
commit | 37a525baec16f7caaa2252394041051c949f301d (patch) | |
tree | d02343e8d3b24655b082b117d63879ff83e89e7f /TAO/tests/Stack_Recursion/Server_Task.cpp | |
parent | 87e4cdb2c157eb359d394c40115e0e6a91c68920 (diff) | |
parent | 7f58353152673a611a86843b1db6f9453675d087 (diff) | |
download | ATCD-37a525baec16f7caaa2252394041051c949f301d.tar.gz |
Fixed merge conflicts
Diffstat (limited to 'TAO/tests/Stack_Recursion/Server_Task.cpp')
-rw-r--r-- | TAO/tests/Stack_Recursion/Server_Task.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/TAO/tests/Stack_Recursion/Server_Task.cpp b/TAO/tests/Stack_Recursion/Server_Task.cpp index 5a3cf60f539..939beccbc61 100644 --- a/TAO/tests/Stack_Recursion/Server_Task.cpp +++ b/TAO/tests/Stack_Recursion/Server_Task.cpp @@ -12,7 +12,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb, } int -Server_Task::svc (void) +Server_Task::svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n")); try |