summaryrefslogtreecommitdiff
path: root/TAO/tests/Collocated_Best/Collocated_Best_Direct
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/tests/Collocated_Best/Collocated_Best_Direct')
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp3
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h4
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp4
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h4
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp2
-rw-r--r--TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h2
6 files changed, 8 insertions, 11 deletions
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp
index 94c6a6a242a..d8c07c14341 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp
@@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior,
}
int
-Client_Task::svc (void)
+Client_Task::svc ()
{
int status = 0;
try
@@ -56,5 +56,4 @@ Client_Task::svc (void)
}
return status;
-
}
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h
index cc58f128c58..15511cd7a02 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h
@@ -14,20 +14,18 @@
class Client_Task : public ACE_Task_Base
{
public:
-
/// Constructor
Client_Task (const ACE_TCHAR *input,
CORBA::ORB_ptr corb,
ACE_Thread_Manager *thr_mgr);
/// Thread entry point
- int svc (void);
+ int svc ();
private:
const ACE_TCHAR *input_;
CORBA::ORB_var corb_;
-
};
#include /**/ "ace/post.h"
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp
index 15951f28767..5e21009c3e4 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp
@@ -11,7 +11,7 @@
}
char *
-Hello::get_string (void)
+Hello::get_string ()
{
ACE_DEBUG ((LM_DEBUG,
"(%P|%t) Upcall in process ..\n"));
@@ -57,7 +57,7 @@ Hello::get_string (void)
}
void
-Hello::shutdown (void)
+Hello::shutdown ()
{
// Give the client thread time to return from the collocated
// call to this method before shutting down the ORB. We sleep
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h
index 043a6968853..e9c0f470f49 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h
@@ -15,9 +15,9 @@ public:
ACE_thread_t thr_id);
// = The skeleton methods
- virtual char * get_string (void);
+ virtual char * get_string ();
- virtual void shutdown (void);
+ virtual void shutdown ();
private:
/// Use an ORB reference to convert strings to objects and shutdown
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp
index 7a26f5fcf0c..0a0d94fee37 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output,
}
int
-Server_Task::svc (void)
+Server_Task::svc ()
{
try
{
diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h
index cea47faeb95..9f6a4ffa912 100644
--- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h
+++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h
@@ -27,7 +27,7 @@ public:
ACE_Thread_Manager *thr_mgr);
/// Thread entry point
- int svc (void);
+ int svc ();
private:
/// Output file for IOR