Fixed merge conflicts

4 files changed, 5 insertions, 9 deletions

diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp
index e7419b54fce..f3f43e49599 100644
--- a/TAO/tests/Leader_Followers/client.cpp
+++ b/TAO/tests/Leader_Followers/client.cpp
@@ -103,9 +103,8 @@ public:
     {
     }
 
-  int svc (void)
+  int svc ()
     {
-
       try
         {
           u_long work_from_this_thread = 0;
@@ -173,9 +172,8 @@ public:
     {
     }
 
-  int svc (void)
+  int svc ()
     {
-
       try
         {
           u_long event_loop_timeout_for_this_thread = 0;
@@ -222,7 +220,6 @@ private:
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
   try
     {
       // Initialize the ORB.
diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp
index 73a7e5f0525..10b2fa7e6dc 100644
--- a/TAO/tests/Leader_Followers/server.cpp
+++ b/TAO/tests/Leader_Followers/server.cpp
@@ -48,9 +48,8 @@ public:
     {
     }
 
-  int svc (void)
+  int svc ()
     {
-
       try
         {
           this->orb_->run ();
diff --git a/TAO/tests/Leader_Followers/test_i.cpp b/TAO/tests/Leader_Followers/test_i.cpp
index 28473ad2c12..ad20d726c35 100644
--- a/TAO/tests/Leader_Followers/test_i.cpp
+++ b/TAO/tests/Leader_Followers/test_i.cpp
@@ -7,7 +7,7 @@ test_i::test_i (CORBA::ORB_ptr orb)
 }
 
 void
-test_i::shutdown (void)
+test_i::shutdown ()
 {
   this->orb_->shutdown (false);
 }
diff --git a/TAO/tests/Leader_Followers/test_i.h b/TAO/tests/Leader_Followers/test_i.h
index 36c840e09fb..b89f7ffb683 100644
--- a/TAO/tests/Leader_Followers/test_i.h
+++ b/TAO/tests/Leader_Followers/test_i.h
@@ -24,7 +24,7 @@ public:
   // = The test interface methods.
   CORBA::ULong method (CORBA::ULong work);
 
-  void shutdown (void);
+  void shutdown ();
 
 private:
   /// The ORB.