Remove redundant void

3 files changed, 86 insertions, 86 deletions

diff --git a/ACE/ace/ETCL/ETCL_Constraint.h b/ACE/ace/ETCL/ETCL_Constraint.h
index 2c97e27c657..1e4ddf7aac7 100644
--- a/ACE/ace/ETCL/ETCL_Constraint.h
+++ b/ACE/ace/ETCL/ETCL_Constraint.h
@@ -34,8 +34,8 @@ class ACE_ETCL_Export ETCL_Constraint
 {
 public:
   /// Constructor and destructor
-  ETCL_Constraint (void);
-  virtual ~ETCL_Constraint (void);
+  ETCL_Constraint ();
+  virtual ~ETCL_Constraint ();
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -59,7 +59,7 @@ class ACE_ETCL_Export ETCL_Literal_Constraint
   : public ETCL_Constraint
 {
 public:
-  ETCL_Literal_Constraint (void);
+  ETCL_Literal_Constraint ();
 
   // = Constructors for each of the various types of literals.
   explicit ETCL_Literal_Constraint (ACE_CDR::ULong uinteger);
@@ -72,22 +72,22 @@ public:
   ETCL_Literal_Constraint (const ETCL_Literal_Constraint& lit);
 
   /// Destructor.
-  virtual ~ETCL_Literal_Constraint(void);
+  virtual ~ETCL_Literal_Constraint();
 
   /// Visitor accept method.
   virtual int accept (ETCL_Constraint_Visitor* visitor);
 
-  Literal_Type expr_type (void) const;
+  Literal_Type expr_type () const;
 
   /// Assignment operator.
   void operator= (const ETCL_Literal_Constraint& co);
 
   // Conversion routines.
-  operator ACE_CDR::Boolean (void) const;
-  operator ACE_CDR::ULong (void) const;
-  operator ACE_CDR::Long (void) const;
-  operator ACE_CDR::Double (void) const;
-  operator const char* (void) const;
+  operator ACE_CDR::Boolean () const;
+  operator ACE_CDR::ULong () const;
+  operator ACE_CDR::Long () const;
+  operator ACE_CDR::Double () const;
+  operator const char* () const;
 
   // Return the type represented by this MysteryOperand.
 
@@ -127,7 +127,7 @@ public:
 
   // Unary minus.
   ETCL_Literal_Constraint
-  operator- (void);
+  operator- ();
 
   /// Ensure both operands are of the same simple numeric type.
   virtual Literal_Type
@@ -159,7 +159,7 @@ public:
   ETCL_Identifier (const char *value);
 
   /// Get the value
-  const char *value (void) const;
+  const char *value () const;
 
   // = The Constraint methods.
   int accept (ETCL_Constraint_Visitor *visitor);
@@ -177,11 +177,11 @@ public:
   ETCL_Union_Value (int sign,
                     ETCL_Constraint *integer);
   explicit ETCL_Union_Value (ETCL_Constraint *string = 0);
-  virtual ~ETCL_Union_Value (void);
+  virtual ~ETCL_Union_Value ();
 
-  int sign (void) const;
-  ETCL_Literal_Constraint *integer (void) const;
-  ETCL_Literal_Constraint *string (void) const;
+  int sign () const;
+  ETCL_Literal_Constraint *integer () const;
+  ETCL_Literal_Constraint *string () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -196,10 +196,10 @@ class ACE_ETCL_Export ETCL_Union_Pos : public ETCL_Constraint
 public:
   ETCL_Union_Pos (ETCL_Constraint *union_value = 0,
                   ETCL_Constraint *component = 0);
-  virtual ~ETCL_Union_Pos (void);
+  virtual ~ETCL_Union_Pos ();
 
-  ETCL_Union_Value *union_value (void) const;
-  ETCL_Constraint *component (void) const;
+  ETCL_Union_Value *union_value () const;
+  ETCL_Constraint *component () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -213,10 +213,10 @@ class ACE_ETCL_Export ETCL_Component_Pos : public ETCL_Constraint
 public:
   ETCL_Component_Pos (ETCL_Constraint *integer = 0,
                       ETCL_Constraint *component = 0);
-  virtual ~ETCL_Component_Pos (void);
+  virtual ~ETCL_Component_Pos ();
 
-  ETCL_Literal_Constraint *integer (void) const;
-  ETCL_Constraint *component (void) const;
+  ETCL_Literal_Constraint *integer () const;
+  ETCL_Constraint *component () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -230,10 +230,10 @@ class ACE_ETCL_Export ETCL_Component_Assoc : public ETCL_Constraint
 public:
   ETCL_Component_Assoc (ETCL_Constraint *identifier = 0,
                         ETCL_Constraint *component = 0);
-  virtual ~ETCL_Component_Assoc (void);
+  virtual ~ETCL_Component_Assoc ();
 
-  ETCL_Identifier *identifier (void) const;
-  ETCL_Constraint *component (void) const;
+  ETCL_Identifier *identifier () const;
+  ETCL_Constraint *component () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -247,10 +247,10 @@ class ACE_ETCL_Export ETCL_Component_Array : public ETCL_Constraint
 public:
   ETCL_Component_Array (ETCL_Constraint *integer = 0,
                         ETCL_Constraint *component = 0);
-  virtual ~ETCL_Component_Array (void);
+  virtual ~ETCL_Component_Array ();
 
-  ETCL_Literal_Constraint *integer (void) const;
-  ETCL_Constraint *component (void) const;
+  ETCL_Literal_Constraint *integer () const;
+  ETCL_Constraint *component () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -262,11 +262,11 @@ private:
 class ACE_ETCL_Export ETCL_Special : public ETCL_Constraint
 {
 public:
-  ETCL_Special (void);
+  ETCL_Special ();
   ETCL_Special (int type);
-  virtual ~ETCL_Special (void);
+  virtual ~ETCL_Special ();
 
-  int type (void) const;
+  int type () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -279,10 +279,10 @@ class ACE_ETCL_Export ETCL_Component : public ETCL_Constraint
 public:
   ETCL_Component (ETCL_Constraint *identifier = 0,
                   ETCL_Constraint *component = 0);
-  virtual ~ETCL_Component (void);
+  virtual ~ETCL_Component ();
 
-  ETCL_Identifier *identifier (void) const;
-  ETCL_Constraint *component (void) const;
+  ETCL_Identifier *identifier () const;
+  ETCL_Constraint *component () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -295,9 +295,9 @@ class ACE_ETCL_Export ETCL_Dot : public ETCL_Constraint
 {
 public:
   explicit ETCL_Dot (ETCL_Constraint *component = 0);
-  virtual ~ETCL_Dot (void);
+  virtual ~ETCL_Dot ();
 
-  ETCL_Constraint *component (void) const;
+  ETCL_Constraint *component () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -309,9 +309,9 @@ class ACE_ETCL_Export ETCL_Eval : public ETCL_Constraint
 {
 public:
   explicit ETCL_Eval (ETCL_Constraint *component = 0);
-  virtual ~ETCL_Eval (void);
+  virtual ~ETCL_Eval ();
 
-  ETCL_Constraint *component (void) const;
+  ETCL_Constraint *component () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -323,9 +323,9 @@ class ACE_ETCL_Export ETCL_Default : public ETCL_Constraint
 {
 public:
   explicit ETCL_Default (ETCL_Constraint *component = 0);
-  virtual ~ETCL_Default (void);
+  virtual ~ETCL_Default ();
 
-  ETCL_Constraint *component (void) const;
+  ETCL_Constraint *component () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -337,9 +337,9 @@ class ACE_ETCL_Export ETCL_Exist : public ETCL_Constraint
 {
 public:
   explicit ETCL_Exist (ETCL_Constraint *component = 0);
-  virtual ~ETCL_Exist (void);
+  virtual ~ETCL_Exist ();
 
-  ETCL_Constraint *component (void) const;
+  ETCL_Constraint *component () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -352,10 +352,10 @@ class ACE_ETCL_Export ETCL_Unary_Expr : public ETCL_Constraint
 public:
   ETCL_Unary_Expr (int type,
                    ETCL_Constraint *subexpr);
-  virtual ~ETCL_Unary_Expr (void);
+  virtual ~ETCL_Unary_Expr ();
 
-  int type (void) const;
-  ETCL_Constraint *subexpr (void) const;
+  int type () const;
+  ETCL_Constraint *subexpr () const;
 
   int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -370,11 +370,11 @@ public:
   ETCL_Binary_Expr (int type,
                     ETCL_Constraint *lhs,
                     ETCL_Constraint *rhs);
-  virtual ~ETCL_Binary_Expr (void);
+  virtual ~ETCL_Binary_Expr ();
 
-  int type (void) const;
-  ETCL_Constraint *rhs (void) const;
-  ETCL_Constraint *lhs (void) const;
+  int type () const;
+  ETCL_Constraint *rhs () const;
+  ETCL_Constraint *lhs () const;
 
   int accept (ETCL_Constraint_Visitor *visitor);
 
@@ -387,13 +387,13 @@ private:
 class ACE_ETCL_Export ETCL_Preference : public ETCL_Constraint
 {
 public:
-  ETCL_Preference (void);
+  ETCL_Preference ();
   ETCL_Preference (int type,
                    ETCL_Constraint *subexpr = 0);
-  virtual ~ETCL_Preference (void);
+  virtual ~ETCL_Preference ();
 
-  int type (void) const;
-  ETCL_Constraint *subexpr (void) const;
+  int type () const;
+  ETCL_Constraint *subexpr () const;
 
   virtual int accept (ETCL_Constraint_Visitor *visitor);
 
diff --git a/ACE/ace/ETCL/ETCL_Constraint.inl b/ACE/ace/ETCL/ETCL_Constraint.inl
index 2ee32f420c6..b10fd67cd31 100644
--- a/ACE/ace/ETCL/ETCL_Constraint.inl
+++ b/ACE/ace/ETCL/ETCL_Constraint.inl
@@ -2,7 +2,7 @@
 // ****************************************************************
 
 ACE_INLINE
-ETCL_Literal_Constraint::ETCL_Literal_Constraint (void)
+ETCL_Literal_Constraint::ETCL_Literal_Constraint ()
   : type_ (ACE_ETCL_UNKNOWN)
 {
 }
@@ -16,7 +16,7 @@ ETCL_Identifier::ETCL_Identifier (const char *value)
 }
 
 ACE_INLINE const char *
-ETCL_Identifier::value (void) const
+ETCL_Identifier::value () const
 {
   return this->string_.c_str ();
 }
@@ -44,19 +44,19 @@ ETCL_Union_Value::ETCL_Union_Value (ETCL_Constraint *string)
 }
 
 ACE_INLINE int
-ETCL_Union_Value::sign (void) const
+ETCL_Union_Value::sign () const
 {
   return this->sign_;
 }
 
 ACE_INLINE ETCL_Literal_Constraint *
-ETCL_Union_Value::integer (void) const
+ETCL_Union_Value::integer () const
 {
   return this->integer_;
 }
 
 ACE_INLINE ETCL_Literal_Constraint *
-ETCL_Union_Value::string (void) const
+ETCL_Union_Value::string () const
 {
   return this->string_;
 }
@@ -73,13 +73,13 @@ ETCL_Union_Pos::ETCL_Union_Pos (ETCL_Constraint *union_value,
 }
 
 ACE_INLINE ETCL_Union_Value *
-ETCL_Union_Pos::union_value (void) const
+ETCL_Union_Pos::union_value () const
 {
   return this->union_value_;
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Union_Pos::component (void) const
+ETCL_Union_Pos::component () const
 {
   return this->component_;
 }
@@ -97,13 +97,13 @@ ETCL_Component_Pos::ETCL_Component_Pos (
 }
 
 ACE_INLINE ETCL_Literal_Constraint *
-ETCL_Component_Pos::integer (void) const
+ETCL_Component_Pos::integer () const
 {
   return this->integer_;
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Component_Pos::component (void) const
+ETCL_Component_Pos::component () const
 {
   return this->component_;
 }
@@ -121,13 +121,13 @@ ETCL_Component_Assoc::ETCL_Component_Assoc (
 }
 
 ACE_INLINE ETCL_Identifier *
-ETCL_Component_Assoc::identifier (void) const
+ETCL_Component_Assoc::identifier () const
 {
   return this->identifier_;
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Component_Assoc::component (void) const
+ETCL_Component_Assoc::component () const
 {
   return this->component_;
 }
@@ -145,13 +145,13 @@ ETCL_Component_Array::ETCL_Component_Array (
 }
 
 ACE_INLINE ETCL_Literal_Constraint *
-ETCL_Component_Array::integer (void) const
+ETCL_Component_Array::integer () const
 {
   return this->integer_;
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Component_Array::component (void) const
+ETCL_Component_Array::component () const
 {
   return this->component_;
 }
@@ -159,7 +159,7 @@ ETCL_Component_Array::component (void) const
 // ****************************************************************
 
 ACE_INLINE
-ETCL_Special::ETCL_Special (void)
+ETCL_Special::ETCL_Special ()
   : type_ (0)
 {}
 
@@ -169,7 +169,7 @@ ETCL_Special::ETCL_Special (int type)
 {}
 
 ACE_INLINE int
-ETCL_Special::type (void) const
+ETCL_Special::type () const
 {
   return this->type_;
 }
@@ -186,13 +186,13 @@ ETCL_Component::ETCL_Component (ETCL_Constraint *identifier,
 }
 
 ACE_INLINE ETCL_Identifier *
-ETCL_Component::identifier (void) const
+ETCL_Component::identifier () const
 {
   return this->identifier_;
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Component::component (void) const
+ETCL_Component::component () const
 {
   return this->component_;
 }
@@ -206,7 +206,7 @@ ETCL_Dot::ETCL_Dot (ETCL_Constraint *component)
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Dot::component (void) const
+ETCL_Dot::component () const
 {
   return this->component_;
 }
@@ -220,7 +220,7 @@ ETCL_Eval::ETCL_Eval (ETCL_Constraint *component)
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Eval::component (void) const
+ETCL_Eval::component () const
 {
   return this->component_;
 }
@@ -234,7 +234,7 @@ ETCL_Default::ETCL_Default (ETCL_Constraint *component)
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Default::component (void) const
+ETCL_Default::component () const
 {
   return this->component_;
 }
@@ -248,7 +248,7 @@ ETCL_Exist::ETCL_Exist (ETCL_Constraint *component)
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Exist::component (void) const
+ETCL_Exist::component () const
 {
   return this->component_;
 }
@@ -263,13 +263,13 @@ ETCL_Unary_Expr::ETCL_Unary_Expr (int type,
 {}
 
 ACE_INLINE int
-ETCL_Unary_Expr::type (void) const
+ETCL_Unary_Expr::type () const
 {
   return this->type_;
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Unary_Expr::subexpr (void) const
+ETCL_Unary_Expr::subexpr () const
 {
   return this->subexpr_;
 }
@@ -286,19 +286,19 @@ ETCL_Binary_Expr::ETCL_Binary_Expr (int type,
 {}
 
 ACE_INLINE int
-ETCL_Binary_Expr::type (void) const
+ETCL_Binary_Expr::type () const
 {
   return this->type_;
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Binary_Expr::rhs (void) const
+ETCL_Binary_Expr::rhs () const
 {
   return this->rhs_;
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Binary_Expr::lhs (void) const
+ETCL_Binary_Expr::lhs () const
 {
   return this->lhs_;
 }
@@ -306,7 +306,7 @@ ETCL_Binary_Expr::lhs (void) const
 // ****************************************************************
 
 ACE_INLINE
-ETCL_Preference::ETCL_Preference (void)
+ETCL_Preference::ETCL_Preference ()
   : type_ (0),
     subexpr_ (0)
 {}
@@ -319,13 +319,13 @@ ETCL_Preference::ETCL_Preference (int type,
 {}
 
 ACE_INLINE int
-ETCL_Preference::type (void) const
+ETCL_Preference::type () const
 {
   return this->type_;
 }
 
 ACE_INLINE ETCL_Constraint *
-ETCL_Preference::subexpr (void) const
+ETCL_Preference::subexpr () const
 {
   return this->subexpr_;
 }
diff --git a/ACE/ace/ETCL/ETCL_Interpreter.h b/ACE/ace/ETCL/ETCL_Interpreter.h
index 517ffb239f2..b5f57b570ab 100644
--- a/ACE/ace/ETCL/ETCL_Interpreter.h
+++ b/ACE/ace/ETCL/ETCL_Interpreter.h
@@ -44,10 +44,10 @@ class ETCL_Parser_Export ETCL_Interpreter
 {
 protected:
   /// Constructor.
-  ETCL_Interpreter (void);
+  ETCL_Interpreter ();
 
   /// Destructor.
-  virtual ~ETCL_Interpreter (void);
+  virtual ~ETCL_Interpreter ();
 
   /// Using the Yacc generated parser, construct an expression tree
   /// representing @a constraints from the tokens returned by it.
@@ -65,9 +65,9 @@ private:
 
 
 // Functions we need for parsing.
-extern int yyparse (void);
+extern int yyparse ();
 extern void yyrestart (FILE*);
-extern int yylex (void);
+extern int yylex ();
 
 // Have yylex read from the constraint string, not from stdin.
 #undef YY_INPUT