Fixed merge conflicts

1 files changed, 18 insertions, 18 deletions

diff --git a/TAO/tests/CSD_Collocation/Diamond_i.h b/TAO/tests/CSD_Collocation/Diamond_i.h
index 9c40c7fe247..f4f21c6fa5e 100644
--- a/TAO/tests/CSD_Collocation/Diamond_i.h
+++ b/TAO/tests/CSD_Collocation/Diamond_i.h
@@ -11,62 +11,62 @@
 class Top_i : public POA_Diamond::Top
 {
 public:
-  Top_i (void);
-  ~Top_i (void);
+  Top_i ();
+  ~Top_i ();
   // Ctor and dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 };
 
 class Left_i : public POA_Diamond::Left
 {
 public:
-  Left_i (void);
-  ~Left_i (void);
+  Left_i ();
+  ~Left_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 };
 
 class Right_i : public POA_Diamond::Right
 {
 public:
-  Right_i (void);
-  ~Right_i (void);
+  Right_i ();
+  ~Right_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void);
+  virtual CORBA::Long width ();
   // Return the width of the stuff.
 };
 
 class Buttom_i : public POA_Diamond::Buttom
 {
 public:
-  Buttom_i (void);
-  ~Buttom_i (void);
+  Buttom_i ();
+  ~Buttom_i ();
   // Ctor, dtor.
 
-  virtual char * shape (void);
+  virtual char * shape ();
   // Return the shape of this object (interface.)
 
-  virtual char * color (void);
+  virtual char * color ();
   // Return the color of this object (interface.)
 
-  virtual CORBA::Long width (void);
+  virtual CORBA::Long width ();
   // Return the width of the stuff.
 
-  virtual char * name (void);
+  virtual char * name ();
   // Return the name of the object.
 };