1 files changed, 11 insertions, 15 deletions
diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h
index ef20c534e08..1b1a5c41e54 100644
--- a/TAO/TAO_IDL/include/utl_scope.h
+++ b/TAO/TAO_IDL/include/utl_scope.h
@@ -155,22 +155,18 @@ public:
   // Operations.
 
   // Constructor(s).
-  UTL_Scope (void);
+  UTL_Scope ();
   UTL_Scope (AST_Decl::NodeType nt);
 
   // Destructor.
-  virtual ~UTL_Scope (void);
+  virtual ~UTL_Scope ();
 
   // Data Accessors.
-  AST_Decl::NodeType scope_node_type (void)
+  AST_Decl::NodeType scope_node_type ()
   {
     return pd_scope_node_type;
   }
 
-  // Narrowing.
-
-  DEF_NARROW_FROM_SCOPE(UTL_Scope);
-
   // AST Dumping.
   virtual void dump (ACE_OSTREAM_TYPE &o);
 
@@ -210,7 +206,7 @@ public:
                                     AST_Decl *&final_parent_decl);
 
   // How many entries are used?
-  virtual unsigned long nmembers (void);
+  virtual unsigned long nmembers ();
 
   // If the Identifier string (from the scoped name which has been
   // already determined to be of length 1) matches a param,
@@ -231,11 +227,11 @@ public:
   void add_to_name_referenced (Identifier *id);
 
   // Accessors for the has_prefix_ member.
-  bool has_prefix (void);
+  bool has_prefix ();
   void has_prefix (bool val);
 
   // Cleanup function.
-  virtual void destroy (void);
+  virtual void destroy ();
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
@@ -537,19 +533,19 @@ public:
                            UTL_Scope::ScopeIterationKind ik);
 
   // Advance to next item.
-  void next (void);
+  void next ();
 
   // Get current item.
-  AST_Decl *item (void);
+  AST_Decl *item ();
 
   // Have we iterated over entire scope?
-  bool is_done (void);
+  bool is_done ();
 
   // What kind of iterator is this?
-  UTL_Scope::ScopeIterationKind iteration_kind (void);
+  UTL_Scope::ScopeIterationKind iteration_kind ();
 
   // What stage are we in with this iterator?
-  UTL_Scope::ScopeIterationKind iteration_stage (void);
+  UTL_Scope::ScopeIterationKind iteration_stage ();
 
 private:
   // Scope to iterate over.