Fixed merge conflicts

4 files changed, 8 insertions, 8 deletions

diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.cpp b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
index df1cd5a53b2..9846d0ba5d6 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.cpp
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
@@ -44,7 +44,7 @@ Client_Task::ID () const
 }
 
 int
-Client_Task::svc (void)
+Client_Task::svc ()
 {
   ++tasks_running_;
   if (TAO_debug_level > 0)
@@ -138,7 +138,7 @@ Client_Task::svc (void)
 }
 
 void
-Client_Task::validate_connection (void)
+Client_Task::validate_connection ()
 {
   try
     {
diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.h b/TAO/tests/Big_Request_Muxing/Client_Task.h
index 0b130075d98..1ab52fa9b08 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.h
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.h
@@ -28,7 +28,7 @@ public:
                const ACE_CString& ident);
 
   /// Thread entry point
-  int svc (void);
+  int svc ();
 
   bool done() const;
   const char *ID () const;
@@ -36,7 +36,7 @@ public:
 private:
   /// Make sure that all threads have connections available to
   /// workaround bug 189
-  void validate_connection (void);
+  void validate_connection ();
 
 private:
   /// Reference to the test interface
diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
index b55f11f3bfc..f901863619d 100644
--- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
+++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp
@@ -1,6 +1,6 @@
 #include "Payload_Receiver.h"
 
-Payload_Receiver::Payload_Receiver (void)
+Payload_Receiver::Payload_Receiver ()
   : message_count_ (0)
   , maybe_lost_count_ (0)
 {
@@ -25,7 +25,7 @@ Payload_Receiver::more_data (
 }
 
 void
-Payload_Receiver::ping (void)
+Payload_Receiver::ping ()
 {
 }
 
diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
index de55d042079..706ee6371ed 100644
--- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
+++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h
@@ -13,13 +13,13 @@ class Payload_Receiver
   : public virtual POA_Test::Payload_Receiver
 {
 public:
-  Payload_Receiver (void);
+  Payload_Receiver ();
 
   // = The skeleton methods
   virtual void more_data (const Test::Payload &payload,
                           CORBA::Boolean maybe_lost);
 
-  virtual void ping (void);
+  virtual void ping ();
 
   int count (bool maybe_lost = false) const;