Fixed merge conflicts

1 files changed, 5 insertions, 5 deletions

diff --git a/TAO/tests/Param_Test/ub_any_seq.h b/TAO/tests/Param_Test/ub_any_seq.h
index 50e8431a480..03134228487 100644
--- a/TAO/tests/Param_Test/ub_any_seq.h
+++ b/TAO/tests/Param_Test/ub_any_seq.h
@@ -22,10 +22,10 @@ class Test_AnySeq
 {
 public:
   /// ctor
-  Test_AnySeq (void);
+  Test_AnySeq ();
 
   /// dtor
-  ~Test_AnySeq (void);
+  ~Test_AnySeq ();
 
   /// run the SII test
   int run_sii_test (Param_Test_ptr objref);
@@ -37,16 +37,16 @@ public:
   int init_parameters (Param_Test_ptr objref);
 
   /// reset values for CORBA
-  int reset_parameters (void);
+  int reset_parameters ();
 
   /// check if results are valid
-  CORBA::Boolean check_validity (void);
+  CORBA::Boolean check_validity ();
 
   /// check if results are valid. This is used for DII results
   CORBA::Boolean check_validity (CORBA::Request_ptr req);
 
   /// print all the values
-  void print_values (void);
+  void print_values ();
 
   /// invoke DII request with appropriate exception handling.
   void dii_req_invoke (CORBA::Request *);