Documentation, layout, C++11 changes

115 files changed, 311 insertions, 310 deletions

diff --git a/ACE/ASNMP/agent/snmp_agent.h b/ACE/ASNMP/agent/snmp_agent.h
index 4ae2328627f..b1320957282 100644
--- a/ACE/ASNMP/agent/snmp_agent.h
+++ b/ACE/ASNMP/agent/snmp_agent.h
@@ -22,9 +22,9 @@ class agent_impl;
  * Contructs agents that are capable of processing SNMPv1 requests
  * over the MIB II System group
  */
-class snmp_agent {
-
-  public:
+class snmp_agent
+{
+public:
   snmp_agent(); // uses port 161, public, private
   ~snmp_agent();
 
@@ -37,7 +37,7 @@ class snmp_agent {
   int run();
   // begin processing requests
 
-  private:
+private:
   snmp_agent(const snmp_agent&);
   agent_impl *agent_;
 };
diff --git a/ACE/ASNMP/asnmp/address.h b/ACE/ASNMP/asnmp/address.h
index 3e973772476..a46ddb66691 100644
--- a/ACE/ASNMP/asnmp/address.h
+++ b/ACE/ASNMP/asnmp/address.h
@@ -538,42 +538,42 @@ protected:
  */
 class  ASNMP_Export DecNetAddress : public Address
 {
-  public:
-   /// default constructor with string arg
-   DecNetAddress( const char *inaddr = "");
+public:
+  /// default constructor with string arg
+  DecNetAddress( const char *inaddr = "");
 
-   /// copy constructor
-   DecNetAddress( const DecNetAddress& decaddr);
+  /// copy constructor
+  DecNetAddress( const DecNetAddress& decaddr);
 
-   /// construct with a GenAddress
-   DecNetAddress( const GenAddress& genaddr);
+  /// construct with a GenAddress
+  DecNetAddress( const GenAddress& genaddr);
 
-   ~DecNetAddress();
+  ~DecNetAddress();
 
-   virtual const char *to_string();
+  virtual const char *to_string();
 
-   DecNetAddress& operator=( const DecNetAddress &decaddr);
+  DecNetAddress& operator=( const DecNetAddress &decaddr);
 
-   /// convert address into octet string format 2 bytes of decnet address
-   virtual void to_octet(OctetStr& octet) const;
+  /// convert address into octet string format 2 bytes of decnet address
+  virtual void to_octet(OctetStr& octet) const;
 
-   /// const char * operator overloaded for streaming output
-   virtual operator const char *() const;
+  /// const char * operator overloaded for streaming output
+  virtual operator const char *() const;
 
-   /// syntax type
-   virtual SmiUINT32 get_syntax();
+  /// syntax type
+  virtual SmiUINT32 get_syntax();
 
-   /// copy an instance of this Value
-   SnmpSyntax& operator=( SnmpSyntax &val);
+  /// copy an instance of this Value
+  SnmpSyntax& operator=( SnmpSyntax &val);
 
-   /// create a new instance of this Value
-   SnmpSyntax *clone() const;
+  /// create a new instance of this Value
+  SnmpSyntax *clone() const;
 
-   protected:
-   virtual int parse_address( const char *inaddr);
-   virtual addr_type get_type() const;
-   virtual void format_output();
-   char output_buffer[MAX_DISPLAY_SZ];
+protected:
+  virtual int parse_address( const char *inaddr);
+  virtual addr_type get_type() const;
+  virtual void format_output();
+  char output_buffer[MAX_DISPLAY_SZ];
 };
 
 //------------------------------------------------------------------------
@@ -587,54 +587,54 @@ class  ASNMP_Export DecNetAddress : public Address
  */
 class  ASNMP_Export AppleTalkAddress :  public Address
 {
-  public:
-   /// default constructor with string arg
+public:
+  /// default constructor with string arg
   AppleTalkAddress( const char *inaddr = "");
 
-   /// copy constructor
-   AppleTalkAddress( const AppleTalkAddress& atkaddr);
+  /// copy constructor
+  AppleTalkAddress( const AppleTalkAddress& atkaddr);
 
-   /// construct with a GenAddress
-   AppleTalkAddress( const GenAddress& genaddr);
+  /// construct with a GenAddress
+  AppleTalkAddress( const GenAddress& genaddr);
 
-   ~AppleTalkAddress();
+  ~AppleTalkAddress();
 
-   virtual const char *to_string();
+  virtual const char *to_string();
 
-   AppleTalkAddress& operator=( const AppleTalkAddress &atkaddr);
+  AppleTalkAddress& operator=( const AppleTalkAddress &atkaddr);
 
-   /// convert address into octet string format 3 bytes of atk address
-   virtual void to_octet(OctetStr& octet) const;
+  /// convert address into octet string format 3 bytes of atk address
+  virtual void to_octet(OctetStr& octet) const;
 
-   /// get the host part of the address
-   char get_host_address() const;
+  /// get the host part of the address
+  char get_host_address() const;
 
-   /// set the host part of the address
-   void set_host_address(const char);
+  /// set the host part of the address
+  void set_host_address(const char);
 
-   /// get the 2 byte atk network address
-   short get_net_address() const;
+  /// get the 2 byte atk network address
+  short get_net_address() const;
 
-   /// set the host 2 byte atk  network address
-   void set_net_address(const short atknet);
+  /// set the host 2 byte atk  network address
+  void set_net_address(const short atknet);
 
-   /// const char * operator overloaded for streaming output
-   virtual operator const char *() const;
+  /// const char * operator overloaded for streaming output
+  virtual operator const char *() const;
 
-   /// syntax type
-   virtual SmiUINT32 get_syntax();
+  /// syntax type
+  virtual SmiUINT32 get_syntax();
 
-   /// copy an instance of this Value
-   SnmpSyntax& operator=( SnmpSyntax &val);
+  /// copy an instance of this Value
+  SnmpSyntax& operator=( SnmpSyntax &val);
 
-   /// create a new instance of this Value
-   SnmpSyntax *clone() const;
+  /// create a new instance of this Value
+  SnmpSyntax *clone() const;
 
-   private:
-   virtual int parse_address( const char *inaddr);
-   virtual addr_type get_type() const;
-   virtual void format_output();
-   char output_buffer[MAX_DISPLAY_SZ];
+private:
+  virtual int parse_address( const char *inaddr);
+  virtual addr_type get_type() const;
+  virtual void format_output();
+  char output_buffer[MAX_DISPLAY_SZ];
 };
 
 //------------------------------------------------------------------------
diff --git a/ACE/ASNMP/asnmp/enttraps.h b/ACE/ASNMP/asnmp/enttraps.h
index 39250e866bf..c27f79233ec 100644
--- a/ACE/ASNMP/asnmp/enttraps.h
+++ b/ACE/ASNMP/asnmp/enttraps.h
@@ -38,9 +38,9 @@
  */
 class ASNMP_Export snmpTrapsOid : public Oid
 {
-   public:
-   snmpTrapsOid (void):Oid("1.3.6.1.6.3.1.1.5"){}
-   SnmpSyntax& operator=( SnmpSyntax &val){ return Oid::operator=(val); }
+public:
+  snmpTrapsOid (void):Oid("1.3.6.1.6.3.1.1.5"){}
+  SnmpSyntax& operator=( SnmpSyntax &val){ return Oid::operator=(val); }
 };
 
 /**
@@ -50,9 +50,9 @@ class ASNMP_Export snmpTrapsOid : public Oid
  */
 class ASNMP_Export snmpTrapEnterpriseOid : public Oid
 {
-   public:
-   snmpTrapEnterpriseOid(void): Oid("1.3.6.1.6.3.1.1.4.3.0") { }
-   SnmpSyntax& operator=( SnmpSyntax &val){ return Oid::operator=(val); }
+public:
+  snmpTrapEnterpriseOid(void): Oid("1.3.6.1.6.3.1.1.4.3.0") { }
+  SnmpSyntax& operator=( SnmpSyntax &val){ return Oid::operator=(val); }
 };
 
 /**
@@ -62,9 +62,9 @@ class ASNMP_Export snmpTrapEnterpriseOid : public Oid
  */
 class ASNMP_Export coldStartOid : public snmpTrapsOid
 {
-   public:
-   coldStartOid( void){*this+=".1";}
-   SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
+public:
+  coldStartOid( void){*this+=".1";}
+  SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
 };
 
 /**
@@ -74,9 +74,9 @@ class ASNMP_Export coldStartOid : public snmpTrapsOid
  */
 class ASNMP_Export warmStartOid : public snmpTrapsOid
 {
-   public:
-   warmStartOid( void){*this+=".2";}
-   SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
+public:
+  warmStartOid( void){*this+=".2";}
+  SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
 };
 
 /**
@@ -86,9 +86,9 @@ class ASNMP_Export warmStartOid : public snmpTrapsOid
  */
 class ASNMP_Export linkDownOid : public snmpTrapsOid
 {
-   public:
-   linkDownOid( void){*this+=".3";}
-   SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
+public:
+  linkDownOid( void){*this+=".3";}
+  SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
 };
 
 
@@ -100,9 +100,9 @@ class ASNMP_Export linkDownOid : public snmpTrapsOid
  */
 class ASNMP_Export linkUpOid : public snmpTrapsOid
 {
-   public:
-   linkUpOid( void){*this+=".4";}
-   SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
+public:
+  linkUpOid( void){*this+=".4";}
+  SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
 };
 
 /**
@@ -112,9 +112,9 @@ class ASNMP_Export linkUpOid : public snmpTrapsOid
  */
 class ASNMP_Export authenticationFailureOid : public snmpTrapsOid
 {
-   public:
-   authenticationFailureOid( void){*this+=".5";}
-   SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
+public:
+  authenticationFailureOid( void){*this+=".5";}
+  SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
 };
 
 /**
@@ -124,9 +124,9 @@ class ASNMP_Export authenticationFailureOid : public snmpTrapsOid
  */
 class ASNMP_Export egpNeighborLossOid : public snmpTrapsOid
 {
-   public:
-   egpNeighborLossOid( void){*this+=".6";}
-   SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
+public:
+  egpNeighborLossOid( void){*this+=".6";}
+  SnmpSyntax& operator=( SnmpSyntax &val){ return snmpTrapsOid::operator=(val); }
 };
 
 #ifdef DEFINE_TRAP_CONSTANTS_
diff --git a/ACE/ASNMP/asnmp/oid_def.h b/ACE/ASNMP/asnmp/oid_def.h
index 912b833a8ea..537415bb2bb 100644
--- a/ACE/ASNMP/asnmp/oid_def.h
+++ b/ACE/ASNMP/asnmp/oid_def.h
@@ -30,51 +30,51 @@
 
 // SMI trap oid def
 class snmpTrapsOid: public Oid {
-   public:
-   snmpTrapsOid (void):Oid("1.3.6.1.6.3.1.1.5"){};
+public:
+  snmpTrapsOid (void):Oid("1.3.6.1.6.3.1.1.5"){};
 };
 
 // SMI Enterprose Oid
 class snmpTrapEnterpriseOid: public Oid {
-   public:
-   snmpTrapEnterpriseOid(void):Oid("1.3.6.1.6.3.1.1.4.3.0"){};
+public:
+  snmpTrapEnterpriseOid(void):Oid("1.3.6.1.6.3.1.1.4.3.0"){};
 };
 
 // SMI Cold Start Oid
 class coldStartOid: public snmpTrapsOid {
-   public:
-   coldStartOid( void){*this+=".1";};
+public:
+  coldStartOid( void){*this+=".1";};
 };
 
 // SMI WarmStart Oid
 class warmStartOid: public snmpTrapsOid {
-   public:
-   warmStartOid( void){*this+=".2";};
+public:
+  warmStartOid( void){*this+=".2";};
 };
 
 // SMI LinkDown Oid
 class linkDownOid: public snmpTrapsOid {
-   public:
-   linkDownOid( void){*this+=".3";};
+public:
+  linkDownOid( void){*this+=".3";};
 };
 
 
 // SMI LinkUp Oid
 class linkUpOid: public snmpTrapsOid {
-   public:
-   linkUpOid( void){*this+=".4";};
+public:
+  linkUpOid( void){*this+=".4";};
 };
 
 // SMI Authentication Failure Oid
 class authenticationFailureOid: public snmpTrapsOid {
-   public:
-   authenticationFailureOid( void){*this+=".5";};
+public:
+  authenticationFailureOid( void){*this+=".5";};
 };
 
 // SMI egpneighborloss Oid
 class egpNeighborLossOid: public snmpTrapsOid {
-   public:
-   egpNeighborLossOid( void){*this+=".6";};
+public:
+  egpNeighborLossOid( void){*this+=".6";};
 };
 
 
diff --git a/ACE/ASNMP/asnmp/snmp.h b/ACE/ASNMP/asnmp/snmp.h
index 14dd2a61d87..8f46161e0c6 100644
--- a/ACE/ASNMP/asnmp/snmp.h
+++ b/ACE/ASNMP/asnmp/snmp.h
@@ -51,10 +51,10 @@
 class Snmp;
 class ASNMP_Export Snmp_Result
 {
-  public:
-    Snmp_Result ();
-    virtual ~Snmp_Result();
-    virtual void result(Snmp *snmp, int result) = 0;
+public:
+  Snmp_Result ();
+  virtual ~Snmp_Result();
+  virtual void result(Snmp *snmp, int result) = 0;
 };
 
 // Snmp session class - supports Version 1 operations in blocking mode
diff --git a/ACE/ASNMP/asnmp/transaction_result.h b/ACE/ASNMP/asnmp/transaction_result.h
index 62eccb92097..b260d68815d 100644
--- a/ACE/ASNMP/asnmp/transaction_result.h
+++ b/ACE/ASNMP/asnmp/transaction_result.h
@@ -15,9 +15,9 @@
 class transaction;
 class ASNMP_Export transaction_result
 {
-  public:
-    virtual ~transaction_result();
-    virtual void result(transaction * trans, int) = 0;
+public:
+  virtual ~transaction_result();
+  virtual void result(transaction * trans, int) = 0;
 };
 
 #endif
diff --git a/ACE/ASNMP/examples/get/get.cpp b/ACE/ASNMP/examples/get/get.cpp
index 4ff1631196b..31a82061732 100644
--- a/ACE/ASNMP/examples/get/get.cpp
+++ b/ACE/ASNMP/examples/get/get.cpp
@@ -36,13 +36,13 @@
 // SNMPv1 Get Application
 //
 class getapp {
-  public:
+public:
   getapp(int argc, char **argv); // process command line args
   int valid() const;             // verify transaction can proceed
   int run();                     //  issue transaction
   static void usage();           // operator help message
 
-  private:
+private:
   getapp(const getapp&);
 
   UdpAddress address_;
diff --git a/ACE/ASNMP/examples/get/get_async.cpp b/ACE/ASNMP/examples/get/get_async.cpp
index cccc0e21123..0734bfddb6c 100644
--- a/ACE/ASNMP/examples/get/get_async.cpp
+++ b/ACE/ASNMP/examples/get/get_async.cpp
@@ -32,8 +32,9 @@
 #include "ace/streams.h"
 
 // SNMPv1 Get Application
-class getapp : public Snmp_Result {
-  public:
+class getapp : public Snmp_Result
+{
+public:
   getapp(int argc, char **argv); // process command line args
   int valid() const;             // verify transaction can proceed
   int run();                     //  issue transaction
@@ -41,7 +42,7 @@ class getapp : public Snmp_Result {
 
   virtual void result(Snmp * r, int rc);
 
-  private:
+private:
   getapp(const getapp&);
 
   UdpAddress address_;
diff --git a/ACE/ASNMP/examples/next/next.cpp b/ACE/ASNMP/examples/next/next.cpp
index 999a6883cf6..cfff517c43e 100644
--- a/ACE/ASNMP/examples/next/next.cpp
+++ b/ACE/ASNMP/examples/next/next.cpp
@@ -34,14 +34,15 @@
 //
 // SNMPv1 Get Next Application
 //
-class nextapp {
-  public:
+class nextapp
+{
+public:
   nextapp(int argc, char **argv); // process command line args
   int valid() const;             // verify transaction can proceed
   int run();                     //  issue transaction
   static void usage();           // operator help message
 
-  private:
+private:
   nextapp(const nextapp&);
 
   UdpAddress address_;
diff --git a/ACE/ASNMP/examples/set/set.cpp b/ACE/ASNMP/examples/set/set.cpp
index d2ba783f0c2..f5191b2b807 100644
--- a/ACE/ASNMP/examples/set/set.cpp
+++ b/ACE/ASNMP/examples/set/set.cpp
@@ -35,13 +35,13 @@
 // SNMPv1 Set Application
 //
 class set {
-  public:
+public:
   set(int argc, char **argv); // process command line args
   int valid() const;             // verify transaction can proceed
   int run();                     //  issue transaction
   static void usage();           // operator help message
 
-  private:
+private:
   set(const set&);
 
   UdpAddress address_;
diff --git a/ACE/ASNMP/examples/trap/trap.cpp b/ACE/ASNMP/examples/trap/trap.cpp
index c8ba41bd77a..db841ee5889 100644
--- a/ACE/ASNMP/examples/trap/trap.cpp
+++ b/ACE/ASNMP/examples/trap/trap.cpp
@@ -37,13 +37,13 @@
 // SNMPv1 Trap Application
 //
 class trapapp {
-  public:
+public:
   trapapp(int argc, char **argv); // process command line args
   int valid() const;             // verify transaction can proceed
   int run();                     //  issue transaction
   static void usage();           // operator help message
 
-  private:
+private:
   trapapp(const trapapp&);
 
   UdpAddress address_;
diff --git a/ACE/ASNMP/examples/walk/walk.cpp b/ACE/ASNMP/examples/walk/walk.cpp
index 8215fe70a34..f634f364ba8 100644
--- a/ACE/ASNMP/examples/walk/walk.cpp
+++ b/ACE/ASNMP/examples/walk/walk.cpp
@@ -34,13 +34,13 @@
 // SNMPv1 Walk Mib Application
 //
 class walkapp {
-  public:
+public:
   walkapp(int argc, char **argv); // process command line args
   int valid() const;             // verify transaction can proceed
   int run();                     //  issue transaction
   static void usage();           // operator help message
 
-  private:
+private:
   walkapp(const walkapp&);
 
   UdpAddress address_;
@@ -141,7 +141,7 @@ void walkapp::usage()
 // simple mib iterator class
 //
 class MibIter {
-  public:
+public:
    // Pdu must contain initial oid to begin with
    MibIter(Snmp *snmp, Pdu& pdu, UdpTarget* target);
    int next(Vb& vb, char *&err_reason);   // return next oid in mib
diff --git a/ACE/Kokyu/Kokyu.h b/ACE/Kokyu/Kokyu.h
index bbf444a4a7d..8d579dd9e8a 100644
--- a/ACE/Kokyu/Kokyu.h
+++ b/ACE/Kokyu/Kokyu.h
@@ -91,20 +91,20 @@ namespace Kokyu
    * interface object with the appropriate implementation.
    */
   class Kokyu_Export Dispatcher_Factory : private ACE_Copy_Disabled
-    {
-    public:
-      /**
-       * Create a dispatcher for dynamic dispatching of commands
-       * (eg. events). The caller is responsible for freeing the
-       * returned dynamically allocated memory.
-       *
-       * @param config Configuration information for the dispatcher.
-       *
-       * @return pointer to the dispatcher.
-       */
-      static Dispatcher*
-      create_dispatcher (const Dispatcher_Attributes& attr);
-    };
+  {
+  public:
+    /**
+      * Create a dispatcher for dynamic dispatching of commands
+      * (eg. events). The caller is responsible for freeing the
+      * returned dynamically allocated memory.
+      *
+      * @param config Configuration information for the dispatcher.
+      *
+      * @return pointer to the dispatcher.
+      */
+    static Dispatcher*
+    create_dispatcher (const Dispatcher_Attributes& attr);
+  };
 } //end of namespace
 
 #if defined (__ACE_INLINE__)
diff --git a/ACE/Kokyu/Kokyu_defs.h b/ACE/Kokyu/Kokyu_defs.h
index 409991c9670..5998817b84d 100644
--- a/ACE/Kokyu/Kokyu_defs.h
+++ b/ACE/Kokyu/Kokyu_defs.h
@@ -121,32 +121,32 @@ namespace Kokyu
   enum Block_Flag_t {BLOCK, UNBLOCK};
 
   class Kokyu_Export Dispatch_Command
-    {
-    public:
-      Dispatch_Command(int dont_delete = 0,
-                       ACE_Allocator *allocator = 0);
-      //dont_delete indicates whether this object needs to be deleted once processed.
-      //allocator indicates the ACE_Allocator, if any, from which this object was created.
-      //This same allocator has to be used for the deletion also
-
-      /// Command callback
-      virtual int execute () = 0;
-
-      int can_be_deleted () const;
-
-      void destroy ();
-    protected:
-      /// Destructor
-      // only inheritance is possible and object should be on heap,
-      // since object could be handed over to a different thread.
-      virtual ~Dispatch_Command ();
-
-    private:
-      int dont_delete_;
-      ACE_Allocator *allocator_;
-      //if this object has to be deleted, then delete it using the allocator
-      //if one is present.
-    };
+  {
+  public:
+    Dispatch_Command(int dont_delete = 0,
+                      ACE_Allocator *allocator = 0);
+    //dont_delete indicates whether this object needs to be deleted once processed.
+    //allocator indicates the ACE_Allocator, if any, from which this object was created.
+    //This same allocator has to be used for the deletion also
+
+    /// Command callback
+    virtual int execute () = 0;
+
+    int can_be_deleted () const;
+
+    void destroy ();
+  protected:
+    /// Destructor
+    // only inheritance is possible and object should be on heap,
+    // since object could be handed over to a different thread.
+    virtual ~Dispatch_Command ();
+
+  private:
+    int dont_delete_;
+    ACE_Allocator *allocator_;
+    //if this object has to be deleted, then delete it using the allocator
+    //if one is present.
+  };
 
   enum DSRT_Sched_Type_t
     {
diff --git a/ACE/Kokyu/Kokyu_dsrt.h b/ACE/Kokyu/Kokyu_dsrt.h
index 11f24ec1eac..eb5de72b987 100644
--- a/ACE/Kokyu/Kokyu_dsrt.h
+++ b/ACE/Kokyu/Kokyu_dsrt.h
@@ -84,21 +84,21 @@ namespace Kokyu
 
   template <class DSRT_Scheduler_Traits>
   class DSRT_Dispatcher_Factory : private ACE_Copy_Disabled
-    {
-    public:
-      typedef std::unique_ptr<DSRT_Dispatcher<DSRT_Scheduler_Traits> > DSRT_Dispatcher_Auto_Ptr;
-
-      /**
-       * Create a dispatcher for dynamic dispatching of threads.
-       * This will be used to dynamic scheduling of distributable threads for
-       * DSRTCORBA. The caller is responsible for freeing the memory.
-       *
-       * @param config Configuration information for the DSRT dispatcher.
-       *
-       * @return pointer to the DSRT dispatcher.
-       */
-      static DSRT_Dispatcher<DSRT_Scheduler_Traits>* create_DSRT_dispatcher (const DSRT_ConfigInfo&);
-    };
+  {
+  public:
+    typedef std::unique_ptr<DSRT_Dispatcher<DSRT_Scheduler_Traits> > DSRT_Dispatcher_Auto_Ptr;
+
+    /**
+      * Create a dispatcher for dynamic dispatching of threads.
+      * This will be used to dynamic scheduling of distributable threads for
+      * DSRTCORBA. The caller is responsible for freeing the memory.
+      *
+      * @param config Configuration information for the DSRT dispatcher.
+      *
+      * @return pointer to the DSRT dispatcher.
+      */
+    static DSRT_Dispatcher<DSRT_Scheduler_Traits>* create_DSRT_dispatcher (const DSRT_ConfigInfo&);
+  };
 
   /**
    * @class MIF_Sched_Strategy
diff --git a/ACE/ace/Asynch_Pseudo_Task.h b/ACE/ace/Asynch_Pseudo_Task.h
index 804b9edab0c..0e311721a9d 100644
--- a/ACE/ace/Asynch_Pseudo_Task.h
+++ b/ACE/ace/Asynch_Pseudo_Task.h
@@ -48,7 +48,7 @@ public:
   int suspend_io_handler (ACE_HANDLE handle);
 
 protected:
-  virtual int svc (void);
+  virtual int svc ();
 
   /// Should be initialized before reactor_
   ACE_Select_Reactor select_reactor_;
diff --git a/ACE/ace/Connector.h b/ACE/ace/Connector.h
index 3af48b4d44b..cb98eb22183 100644
--- a/ACE/ace/Connector.h
+++ b/ACE/ace/Connector.h
@@ -356,7 +356,7 @@ protected:
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
   /// Calls handle_close() to shutdown the Connector gracefully.
-  virtual int fini (void);
+  virtual int fini ();
 
   /// Default version returns address info in @a buf.
   virtual int info (ACE_TCHAR **strp, size_t length) const;
diff --git a/ACE/ace/Event_Handler.h b/ACE/ace/Event_Handler.h
index ae23e7e82a4..aef70d591ae 100644
--- a/ACE/ace/Event_Handler.h
+++ b/ACE/ace/Event_Handler.h
@@ -228,7 +228,6 @@ public:
    */
   class ACE_Export Policy
   {
-
   public:
 
     /// Virtual destructor.
diff --git a/ACE/ace/NT_Service.h b/ACE/ace/NT_Service.h
index 6e03aabd6b2..e1b03990333 100644
--- a/ACE/ace/NT_Service.h
+++ b/ACE/ace/NT_Service.h
@@ -126,7 +126,7 @@ public:
    * ACE_Shared_Object. Default implementation sets the service status
    * to SERVICE_STOPPED.
    */
-  virtual int fini (void);
+  virtual int fini ();
 
   /**
    * The actual service implementation.  This function need not be overridden
@@ -134,7 +134,7 @@ public:
    * by subclasses when actually running the service.  It is expected that
    * this function will set the status to RUNNING.
    */
-  virtual int svc (void);
+  virtual int svc ();
 
   /**
    * This function is called in response to a request from the Service
@@ -147,7 +147,7 @@ public:
    *    SERVICE_CONTROL_INTERROGATE: reports current status
    *    SERVICE_CONTROL_SHUTDOWN: same as SERVICE_CONTROL_STOP.
    */
-  virtual void  handle_control (DWORD control_code);
+  virtual void handle_control (DWORD control_code);
 
   /// Set the svc_handle_ member.  This is only a public function because
   /// the macro-generated service function calls it.
diff --git a/ACE/ace/Naming_Context.h b/ACE/ace/Naming_Context.h
index 38349b28069..35bafa2ffee 100644
--- a/ACE/ace/Naming_Context.h
+++ b/ACE/ace/Naming_Context.h
@@ -102,7 +102,7 @@ public:
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
   /// Close down the test when dynamically unlinked.
-  virtual int fini (void);
+  virtual int fini ();
 
   /// Returns information about this context.
   virtual int info (ACE_TCHAR **strp, size_t length) const;
diff --git a/ACE/ace/Registry.h b/ACE/ace/Registry.h
index afdf775b6ea..d21dfef8e7f 100644
--- a/ACE/ace/Registry.h
+++ b/ACE/ace/Registry.h
@@ -489,20 +489,20 @@ public:
       };
 
     class ACE_Export Context_Iteration : public Iteration_State
-      {
-      public:
-        /// Next @a how_many entries
-        int next_n (u_long how_many,
-                    Binding_List &list);
-      };
+    {
+    public:
+      /// Next @a how_many entries
+      int next_n (u_long how_many,
+                  Binding_List &list);
+    };
 
     class ACE_Export Iteration_Complete : public Iteration_State
-      {
-      public:
-        /// Next @a how_many entries
-        int next_n (u_long how_many,
-                    Binding_List &list);
-      };
+    {
+    public:
+      /// Next @a how_many entries
+      int next_n (u_long how_many,
+                  Binding_List &list);
+    };
 
     /// Friend states
     friend class Iteration_State;
diff --git a/ACE/ace/SSL/SSL_Initializer.h b/ACE/ace/SSL/SSL_Initializer.h
index d73c8f88aed..a19b780523b 100644
--- a/ACE/ace/SSL/SSL_Initializer.h
+++ b/ACE/ace/SSL/SSL_Initializer.h
@@ -35,7 +35,7 @@ public:
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
   /// Do cleanup of SSL library.
-  virtual int fini (void);
+  virtual int fini ();
 };
 
 static int ACE_Force_ACE_SSL_Initializer = ACE_SSL_Initializer::static_init ();
diff --git a/ACE/ace/Service_Manager.h b/ACE/ace/Service_Manager.h
index 58ed34e6042..eda5f3f0163 100644
--- a/ACE/ace/Service_Manager.h
+++ b/ACE/ace/Service_Manager.h
@@ -73,7 +73,7 @@ protected:
   // = Dynamic linking hooks.
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **info_string, size_t length) const;
-  virtual int fini (void);
+  virtual int fini ();
 
   // = Scheduling hooks.
   virtual int suspend (void);
diff --git a/ACE/ace/Timer_Queue_Adapters.h b/ACE/ace/Timer_Queue_Adapters.h
index 0ba8dc2f0b7..56351b7172b 100644
--- a/ACE/ace/Timer_Queue_Adapters.h
+++ b/ACE/ace/Timer_Queue_Adapters.h
@@ -152,7 +152,7 @@ public:
   int cancel (long timer_id, const void **act = 0);
 
   /// Runs the dispatching thread.
-  virtual int svc (void);
+  virtual int svc ();
 
   /// Inform the dispatching thread that it should terminate.
   virtual void deactivate (void);
diff --git a/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.h b/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.h
index 43a0111041d..1e21542d46d 100644
--- a/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.h
+++ b/ACE/apps/Gateway/Gateway/Concrete_Connection_Handlers.h
@@ -107,7 +107,7 @@ protected:
   virtual int handle_input (ACE_HANDLE);
 
   /// Transmit peer messages.
-  virtual int svc (void);
+  virtual int svc ();
 
   /**
    * When thread started, connection become blocked, so no need to use
@@ -149,7 +149,7 @@ protected:
                             ACE_Reactor_Mask = ACE_Event_Handler::ALL_EVENTS_MASK);
 
   /// Transmit peer messages.
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   /// If the controlling is in thread's svc() or not.
diff --git a/ACE/apps/Gateway/Gateway/Gateway.cpp b/ACE/apps/Gateway/Gateway/Gateway.cpp
index a443ccde4df..0aa586c6fc8 100644
--- a/ACE/apps/Gateway/Gateway/Gateway.cpp
+++ b/ACE/apps/Gateway/Gateway/Gateway.cpp
@@ -23,7 +23,7 @@ protected:
   virtual int init (int argc, ACE_TCHAR *argv[]);
   // Perform initialization.
 
-  virtual int fini (void);
+  virtual int fini ();
   // Perform termination when unlinked dynamically.
 
   virtual int info (ACE_TCHAR **, size_t) const;
diff --git a/ACE/apps/Gateway/Peer/Peer.h b/ACE/apps/Gateway/Peer/Peer.h
index 9bf0c91dbb2..2cc6c0da1b1 100644
--- a/ACE/apps/Gateway/Peer/Peer.h
+++ b/ACE/apps/Gateway/Peer/Peer.h
@@ -236,7 +236,7 @@ public:
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
   /// Perform termination activities.
-  virtual int fini (void);
+  virtual int fini ();
 
   /// Return info about this service.
   virtual int info (ACE_TCHAR **, size_t) const;
diff --git a/ACE/apps/JAWS/clients/Caching/http_handler.h b/ACE/apps/JAWS/clients/Caching/http_handler.h
index b6329071358..d6482dee30e 100644
--- a/ACE/apps/JAWS/clients/Caching/http_handler.h
+++ b/ACE/apps/JAWS/clients/Caching/http_handler.h
@@ -37,7 +37,7 @@ public:
   virtual int open (void *);
 
   /// Entry points defined by the abstract Svc_Handler.
-  virtual int svc (void);
+  virtual int svc ();
 
   /// Accessor to the file being fetched.
   const char *filename (void) const;
diff --git a/ACE/apps/JAWS/server/HTTP_Server.h b/ACE/apps/JAWS/server/HTTP_Server.h
index 55ecd655e9e..9ee7bfb241a 100644
--- a/ACE/apps/JAWS/server/HTTP_Server.h
+++ b/ACE/apps/JAWS/server/HTTP_Server.h
@@ -56,7 +56,7 @@ public:
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
   /// Exit hooks
-  virtual int fini (void);
+  virtual int fini ();
 
 protected:
   /// Thread Per Request implementation
@@ -96,7 +96,7 @@ public:
                           ACE_Thread_Manager &tm,
                           int threads,
                           HTTP_Handler_Factory &factory);
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   HTTP_Acceptor &acceptor_;
@@ -121,7 +121,7 @@ public:
                            HTTP_Handler_Factory &factory);
   virtual int open (void *args = 0);
   virtual int close (u_long);
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   ACE_HANDLE handle_;
@@ -143,7 +143,7 @@ class Asynch_Thread_Pool_Task : public ACE_Task<ACE_NULL_SYNCH>
 public:
   Asynch_Thread_Pool_Task (ACE_Proactor &proactor,
                            ACE_Thread_Manager &tm);
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   ACE_Proactor &proactor_;
diff --git a/ACE/apps/JAWS/server/JAWS_Concurrency.h b/ACE/apps/JAWS/server/JAWS_Concurrency.h
index 30db0052455..08c9d88a20f 100644
--- a/ACE/apps/JAWS/server/JAWS_Concurrency.h
+++ b/ACE/apps/JAWS/server/JAWS_Concurrency.h
@@ -24,7 +24,7 @@ class JAWS_Concurrency_Base : public ACE_Task<ACE_SYNCH>
 public:
   JAWS_Concurrency_Base (void);
   virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0);
-  virtual int svc (void);
+  virtual int svc ();
 };
 
 class JAWS_Dispatch_Policy
diff --git a/ACE/apps/JAWS2/JAWS/Concurrency.h b/ACE/apps/JAWS2/JAWS/Concurrency.h
index 85f495facb5..00d290d0e16 100644
--- a/ACE/apps/JAWS2/JAWS/Concurrency.h
+++ b/ACE/apps/JAWS2/JAWS/Concurrency.h
@@ -33,7 +33,7 @@ public:
   ~JAWS_Concurrency_Base (void);
 
   virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0);
-  virtual int svc (void);
+  virtual int svc ();
 
   virtual int svc_loop (JAWS_Data_Block *db);
   // in thread pool, this is an infinite loop
diff --git a/ACE/apps/JAWS2/JAWS/Reaper.h b/ACE/apps/JAWS2/JAWS/Reaper.h
index b29211eb728..28ec31dc159 100644
--- a/ACE/apps/JAWS2/JAWS/Reaper.h
+++ b/ACE/apps/JAWS2/JAWS/Reaper.h
@@ -33,7 +33,7 @@ public:
   virtual ~JAWS_Reaper (void);
 
   virtual int open (void * = 0);
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   JAWS_Concurrency_Base *concurrency_;
diff --git a/ACE/examples/APG/Proactor/HA_Proactive_Status.h b/ACE/examples/APG/Proactor/HA_Proactive_Status.h
index efc1c824f84..d09848f3e06 100644
--- a/ACE/examples/APG/Proactor/HA_Proactive_Status.h
+++ b/ACE/examples/APG/Proactor/HA_Proactive_Status.h
@@ -79,7 +79,7 @@ public:
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
   // Terminates object when dynamic unlinking occurs.
-  virtual int fini (void);
+  virtual int fini ();
 };
 
 #endif /* __HA_PROACTIVE_STATUS_H */
diff --git a/ACE/examples/APG/Streams/CommandTask.h b/ACE/examples/APG/Streams/CommandTask.h
index 3524a16291a..bc4579ba793 100644
--- a/ACE/examples/APG/Streams/CommandTask.h
+++ b/ACE/examples/APG/Streams/CommandTask.h
@@ -20,7 +20,7 @@ public:
   int put (ACE_Message_Block *message,
            ACE_Time_Value *timeout);
 
-  virtual int svc (void);
+  virtual int svc ();
 
   virtual int close (u_long flags);
 
diff --git a/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.h b/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.h
index c6c302021f6..4b5cc137060 100644
--- a/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.h
+++ b/ACE/examples/APG/Svc_Config/HA_Status_Dynamic.h
@@ -27,7 +27,7 @@ class HASTATUS_Export HA_Status : public ACE_Service_Object
   public:
     virtual int init (int argc, ACE_TCHAR *argv[]);
 
-    virtual int fini (void);
+    virtual int fini ();
 
     virtual int info (ACE_TCHAR **str, size_t len) const;
 
diff --git a/ACE/examples/APG/Svc_Config/HA_Status_Static.h b/ACE/examples/APG/Svc_Config/HA_Status_Static.h
index eb16f9f52e1..ed4e175a46e 100644
--- a/ACE/examples/APG/Svc_Config/HA_Status_Static.h
+++ b/ACE/examples/APG/Svc_Config/HA_Status_Static.h
@@ -25,7 +25,7 @@ class HA_Status : public ACE_Service_Object
 {
   public:
     virtual int init (int argc, ACE_TCHAR *argv[]);
-    virtual int fini (void);
+    virtual int fini ();
     virtual int info (ACE_TCHAR **str, size_t len) const;
 
   private:
diff --git a/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp b/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp
index 79290125af0..8f0e4a82145 100644
--- a/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp
+++ b/ACE/examples/APG/ThreadPools/LF_ThreadPool.cpp
@@ -49,7 +49,7 @@ public:
     ACE_TRACE ("LF_ThreadPool::TP");
   }
 
-  virtual int svc (void);
+  virtual int svc ();
 
   void shut_down (void)
   {
diff --git a/ACE/examples/APG/Threads/Condition_Variables.cpp b/ACE/examples/APG/Threads/Condition_Variables.cpp
index 0275b96b88c..659cd018d86 100644
--- a/ACE/examples/APG/Threads/Condition_Variables.cpp
+++ b/ACE/examples/APG/Threads/Condition_Variables.cpp
@@ -42,7 +42,7 @@ public:
     : rep_(rep), waitCond_(wait), mutex_(mutex)
   { }
 
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   HA_Device_Repository &rep_;
diff --git a/ACE/examples/ASX/CCM_App/CCM_App.cpp b/ACE/examples/ASX/CCM_App/CCM_App.cpp
index 76b22e68132..696fa0aa19e 100644
--- a/ACE/examples/ASX/CCM_App/CCM_App.cpp
+++ b/ACE/examples/ASX/CCM_App/CCM_App.cpp
@@ -20,7 +20,7 @@ public:
   //FUZZ: enable check_for_lack_ACE_OS
 
   virtual int init (int, ACE_TCHAR *[]);
-  virtual int fini (void);
+  virtual int fini ();
   virtual int suspend (void);
   virtual int resume (void);
 };
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.h b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.h
index e616c18dce0..a8724b9065e 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.h
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Consumer_Router.h
@@ -57,7 +57,7 @@ protected:
   // <Consumer_Router>.  The <Consumer_Router> queues up this message,
   // which is then processed in the <svc> method in a separate thread.
 
-  virtual int svc (void);
+  virtual int svc ();
   // Runs in a separate thread to dequeue messages and pass them up
   // the stream.
 
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.h b/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.h
index d12a79c0a9c..2e3a09b9d0c 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.h
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Event_Analyzer.h
@@ -30,7 +30,7 @@ public:
 
   // Dynamic linking hooks (not used).
   virtual int init (int argc, ACE_TCHAR *argv[]);
-  virtual int fini (void);
+  virtual int fini ();
   virtual int info (ACE_TCHAR **info_string,
                     size_t length) const;
 private:
diff --git a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.h b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.h
index 4d1723fcea6..44e9e8a85bc 100644
--- a/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.h
+++ b/ACE/examples/ASX/Event_Server/Event_Server/Supplier_Router.h
@@ -59,7 +59,7 @@ protected:
   // The Router queues up this message, which is then processed in the
   // <svc> method in a separate thread.
 
-  virtual int svc (void);
+  virtual int svc ();
   // Runs in a separate thread to dequeue messages and pass them up
   // the stream.
 
diff --git a/ACE/examples/ASX/Message_Queue/buffer_stream.cpp b/ACE/examples/ASX/Message_Queue/buffer_stream.cpp
index 82dd3e2ad18..95408d3897d 100644
--- a/ACE/examples/ASX/Message_Queue/buffer_stream.cpp
+++ b/ACE/examples/ASX/Message_Queue/buffer_stream.cpp
@@ -47,7 +47,7 @@ public:
   Producer (void) {}
 
   // Read data from stdin and pass to consumer.
-  virtual int svc (void);
+  virtual int svc ();
 };
 
 class Consumer : public Common_Task
@@ -62,7 +62,7 @@ public:
   // Enqueue the message on the ACE_Message_Queue for subsequent
   // handling in the svc() method.
 
-  virtual int svc (void);
+  virtual int svc ();
   // Receive message from producer and print to stdout.
 
 private:
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.h b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.h
index 8e443e5c679..d8767e07d25 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.h
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Consumer_Router.h
@@ -42,7 +42,7 @@ protected:
   virtual int open (void *a = 0);
   virtual int close (u_long flags = 0);
   virtual int put (ACE_Message_Block *msg, ACE_Time_Value * = 0);
-  virtual int svc (void);
+  virtual int svc ();
 
   // Dynamic linking hooks.
   virtual int info (ACE_TCHAR **info_string, size_t length) const;
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.h b/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.h
index aa77572197a..ba382d40fd9 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.h
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Event_Analyzer.h
@@ -24,7 +24,7 @@ public:
 
   // Dynamic linking hooks.
   virtual int init (int argc, ACE_TCHAR *argv[]);
-  virtual int fini (void);
+  virtual int fini ();
   virtual int info (ACE_TCHAR **info_string, size_t length) const;
 
 private:
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h
index eaa725ca172..d8ebe216bbb 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Peer_Router.h
@@ -60,7 +60,7 @@ protected:
 
 private:
   // Don't need this method here...
-  virtual int svc (void);
+  virtual int svc ();
 };
 
 // This abstract base class provides mechanisms for routing messages
@@ -96,7 +96,7 @@ protected:
 
   // Dynamic linking initialization hooks inherited from ACE_Task.
   virtual int init (int argc, ACE_TCHAR *argv[]);
-  virtual int fini (void);
+  virtual int fini ();
 
   // Factory for accepting new PEER_HANDLERs.
   Acceptor_Factory<PEER_HANDLER, PEER_KEY> *acceptor_;
diff --git a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.h b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.h
index 97a273f6999..f14ee7098b3 100644
--- a/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.h
+++ b/ACE/examples/ASX/UPIPE_Event_Server/Supplier_Router.h
@@ -45,7 +45,7 @@ protected:
   virtual int open (void *a = 0);
   virtual int close (u_long flags = 0);
   virtual int put (ACE_Message_Block *msg, ACE_Time_Value * = 0);
-  virtual int svc (void);
+  virtual int svc ();
 
   // Dynamic linking hooks inherited from Peer_Router.
   virtual int info (ACE_TCHAR **info_string, size_t length) const;
diff --git a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h
index 890f2877eec..33d96964c37 100644
--- a/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h
+++ b/ACE/examples/Bounded_Packet_Relay/BPR_Drivers.h
@@ -207,7 +207,7 @@ public:
   int request_stop (void);
 
   /// This method runs the input device loop in the new thread.
-  virtual int svc (void);
+  virtual int svc ();
 
   /// Provides an abstract interface to allow modifying device
   /// settings.
diff --git a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h
index 7fcbbadba7b..727393c5514 100644
--- a/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h
+++ b/ACE/examples/Bounded_Packet_Relay/Thread_Bounded_Packet_Relay.h
@@ -177,7 +177,7 @@ public:
   virtual ~User_Input_Task (void);
 
   /// This method runs the event loop in the new thread.
-  virtual int svc (void);
+  virtual int svc ();
 
   // = Some helper methods.
 
diff --git a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
index 47de5c935c6..51db63ad062 100644
--- a/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
+++ b/ACE/examples/C++NPv2/AIO_Client_Logging_Daemon.cpp
@@ -63,7 +63,7 @@ public:
   // Service Configurator hook methods.
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int fini ();
-  virtual int svc (void);
+  virtual int svc ();
 };
 
 /******************************************************/
diff --git a/ACE/examples/C++NPv2/TP_Logging_Server.h b/ACE/examples/C++NPv2/TP_Logging_Server.h
index 0f0ca357b76..fe2c20f825e 100644
--- a/ACE/examples/C++NPv2/TP_Logging_Server.h
+++ b/ACE/examples/C++NPv2/TP_Logging_Server.h
@@ -26,7 +26,7 @@ public:
                    ACE_Time_Value *timeout = 0)
   { return putq (mblk, timeout); }
 
-  virtual int svc (void);
+  virtual int svc ();
 };
 
 typedef ACE_Unmanaged_Singleton<TP_Logging_Task, ACE_Null_Mutex>
diff --git a/ACE/examples/Connection/blocking/SPIPE-acceptor.h b/ACE/examples/Connection/blocking/SPIPE-acceptor.h
index 6c202b04afd..539fe2dc525 100644
--- a/ACE/examples/Connection/blocking/SPIPE-acceptor.h
+++ b/ACE/examples/Connection/blocking/SPIPE-acceptor.h
@@ -48,10 +48,10 @@ public:
   virtual int init (int argc, ACE_TCHAR *argv[]);
   // Initialize the network server.
 
-  virtual int fini (void);
+  virtual int fini ();
   // Close down the server.
 
-  virtual int svc (void);
+  virtual int svc ();
   // Run the interative service.
 
 private:
diff --git a/ACE/examples/Connection/blocking/SPIPE-connector.h b/ACE/examples/Connection/blocking/SPIPE-connector.h
index 1901f32592a..029fc11217a 100644
--- a/ACE/examples/Connection/blocking/SPIPE-connector.h
+++ b/ACE/examples/Connection/blocking/SPIPE-connector.h
@@ -53,10 +53,10 @@ public:
   virtual int init (int argc, ACE_TCHAR *argv[]);
   // Initialize the IPC client.
 
-  virtual int fini (void);
+  virtual int fini ();
   // Destroy the IPC client.
 
-  virtual int svc (void);
+  virtual int svc ();
   // Run the svc.
 
   virtual int handle_close (ACE_HANDLE, ACE_Reactor_Mask);
diff --git a/ACE/examples/Connection/misc/Connection_Handler.h b/ACE/examples/Connection/misc/Connection_Handler.h
index 47a6b8ed670..8ce52f9e472 100644
--- a/ACE/examples/Connection/misc/Connection_Handler.h
+++ b/ACE/examples/Connection/misc/Connection_Handler.h
@@ -15,7 +15,7 @@ public:
   virtual int close (u_long);
   // Terminate the <Connection_Handler>.
 
-  virtual int svc (void);
+  virtual int svc ();
   // Run the <Connection_Handler>'s main event loop.
 
 protected:
diff --git a/ACE/examples/Connection/non_blocking/CPP-acceptor.h b/ACE/examples/Connection/non_blocking/CPP-acceptor.h
index 2963fce575c..3c38d7c0d70 100644
--- a/ACE/examples/Connection/non_blocking/CPP-acceptor.h
+++ b/ACE/examples/Connection/non_blocking/CPP-acceptor.h
@@ -59,10 +59,10 @@ public:
   virtual int init (int argc, ACE_TCHAR *argv[]);
   // Initialize the network server.
 
-  virtual int fini (void);
+  virtual int fini ();
   // Close down the server.
 
-  virtual int svc (void);
+  virtual int svc ();
   // Run the interative service.
 
 private:
diff --git a/ACE/examples/Connection/non_blocking/CPP-connector.h b/ACE/examples/Connection/non_blocking/CPP-connector.h
index 72e988e882b..a6c228d0e9a 100644
--- a/ACE/examples/Connection/non_blocking/CPP-connector.h
+++ b/ACE/examples/Connection/non_blocking/CPP-connector.h
@@ -66,10 +66,10 @@ public:
   virtual int init (int argc, ACE_TCHAR *argv[]);
   // Initialize the IPC client.
 
-  virtual int fini (void);
+  virtual int fini ();
   // Destroy the IPC client.
 
-  virtual int svc (void);
+  virtual int svc ();
   // Run the svc.
 
 private:
diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
index 22e3f507117..1bf30a36ab5 100644
--- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
+++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-fancy.cpp
@@ -86,7 +86,7 @@ protected:
   // Hook method called by the <svc> template method to do the actual
   // protocol.  Must be overridden by the subclass.
 
-  virtual int svc (void);
+  virtual int svc ();
   // Template method entry point into the handler task.
 
   virtual void print_results (void);
diff --git a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
index 3e6bede08b2..c9521664bc7 100644
--- a/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
+++ b/ACE/examples/IPC_SAP/SSL_SAP/SSL-server-fancy.cpp
@@ -87,7 +87,7 @@ protected:
   // Hook method called by the <svc> template method to do the actual
   // protocol.  Must be overridden by the subclass.
 
-  virtual int svc (void);
+  virtual int svc ();
   // Template method entry point into the handler task.
 
   virtual void print_results (void);
diff --git a/ACE/examples/NT_Service/ntsvc.h b/ACE/examples/NT_Service/ntsvc.h
index ee04caaadf2..02d212adbd3 100644
--- a/ACE/examples/NT_Service/ntsvc.h
+++ b/ACE/examples/NT_Service/ntsvc.h
@@ -40,7 +40,7 @@ public:
   virtual int  handle_exception (ACE_HANDLE h);
 
   /// This is a virtual method inherited from ACE_NT_Service.
-  virtual int svc (void);
+  virtual int svc ();
 
   /// Where the real work is done:
   virtual int handle_timeout (const ACE_Time_Value& tv,
diff --git a/ACE/examples/Reactor/Misc/notification.cpp b/ACE/examples/Reactor/Misc/notification.cpp
index f9979a6a6b8..c5300a6b08b 100644
--- a/ACE/examples/Reactor/Misc/notification.cpp
+++ b/ACE/examples/Reactor/Misc/notification.cpp
@@ -56,7 +56,7 @@ public:
   virtual int notify (ACE_Time_Value *tv = 0);
   // Perform notifications.
 
-  virtual int svc (void);
+  virtual int svc ();
   // Handle I/O events in a separate threads.
 
 private:
diff --git a/ACE/examples/Reactor/Misc/test_demuxing.cpp b/ACE/examples/Reactor/Misc/test_demuxing.cpp
index 1bac5832276..f320d5bc17f 100644
--- a/ACE/examples/Reactor/Misc/test_demuxing.cpp
+++ b/ACE/examples/Reactor/Misc/test_demuxing.cpp
@@ -268,7 +268,7 @@ public:
   // Called back within the context of the <ACE_Reactor> Singleton to
   // dequeue and process the message on the <ACE_Message_Queue>.
 
-  virtual int svc (void);
+  virtual int svc ();
   // Run the "event-loop" periodically putting messages to our
   // internal <Message_Queue> that we inherit from <ACE_Task>.
 
diff --git a/ACE/examples/Reactor/Misc/test_reactors.cpp b/ACE/examples/Reactor/Misc/test_reactors.cpp
index 59ded76b40c..1d01416e1e9 100644
--- a/ACE/examples/Reactor/Misc/test_reactors.cpp
+++ b/ACE/examples/Reactor/Misc/test_reactors.cpp
@@ -26,7 +26,7 @@ public:
   virtual int close (u_long flags = 0);
   //FUZZ: enable check_for_lack_ACE_OS
 
-  virtual int svc (void);
+  virtual int svc ();
 
   virtual int handle_input (ACE_HANDLE handle);
   virtual int handle_close (ACE_HANDLE fd,
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h
index d8dc8df002d..fff847ceea8 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.h
@@ -24,7 +24,7 @@ public:
   ~Handle_Broadcast (void);
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
-  virtual int fini (void);
+  virtual int fini ();
 
 private:
   int open (const ACE_INET_Addr &r, int async = 0);
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
index f7905a92d26..aeebf5a6971 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.h
@@ -24,7 +24,7 @@ public:
   Handle_L_CODgram (void);
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
-  virtual int fini (void);
+  virtual int fini ();
 
 public:
   int open (const ACE_UNIX_Addr &suad, int async = 0);
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
index 2c4001a0394..e1c53b53129 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.h
@@ -24,7 +24,7 @@ public:
   Handle_L_Dgram (void);
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
-  virtual int fini (void);
+  virtual int fini ();
 
 private:
   int open (const ACE_UNIX_Addr &suad, int async = 0);
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h
index fb1adbc5132..8e9185f91da 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.h
@@ -23,7 +23,7 @@ public:
   Handle_L_FIFO (void);
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
-  virtual int fini (void);
+  virtual int fini ();
 
 private:
   int open (const ACE_TCHAR *rendezvous_fifo);
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
index 698ddef333a..02363f695db 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.h
@@ -26,7 +26,7 @@ public:
   ~Handle_L_Pipe (void);
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
-  virtual int fini (void);
+  virtual int fini ();
 
 private:
   int open (const ACE_UNIX_Addr &suap, int async = 0);
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h
index 57f763b296b..665b1759405 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.h
@@ -24,7 +24,7 @@ public:
   Handle_L_SPIPE (void);
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
-  virtual int fini (void);
+  virtual int fini ();
 
 private:
   int open (const ACE_SPIPE_Addr &rendezvous_spipe);
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h
index f53e0e53ea0..cd7ae8e7857 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.h
@@ -25,7 +25,7 @@ public:
   ~Handle_L_Stream (void);
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
-  virtual int fini (void);
+  virtual int fini ();
 
 private:
   int open (const ACE_UNIX_Addr &suas, int async = 0);
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h
index d9476feb934..01da58ddbe1 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.h
@@ -22,7 +22,7 @@ public:
   Handle_R_Dgram (void);
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
-  virtual int fini (void);
+  virtual int fini ();
 
 private:
   int open (const ACE_INET_Addr &r, int async = 0);
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
index 8b3cd811bf5..4f9dc98c304 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.h
@@ -24,7 +24,7 @@ public:
   Handle_R_Stream (void);
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
-  virtual int fini (void);
+  virtual int fini ();
 
 private:
   int open (const ACE_INET_Addr &sia, int async = 0);
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h
index 1207ba60af5..8db8172dca3 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.h
@@ -26,7 +26,7 @@ public:
   // = Dynamic linking hooks.
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
-  virtual int fini (void);
+  virtual int fini ();
 
 private:
   ACE_Thread_Manager thr_mgr_;
@@ -54,7 +54,7 @@ public:
   virtual int close (u_long);
   // Close down the service.
 
-  virtual int svc (void);
+  virtual int svc ();
   // Execute the service.
 
 protected:
diff --git a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
index f9be20a305c..39858c7f062 100644
--- a/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
+++ b/ACE/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.h
@@ -21,7 +21,7 @@ public:
   Handle_Timeout (void);
   virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int info (ACE_TCHAR **, size_t) const;
-  virtual int fini (void);
+  virtual int fini ();
 
 private:
   virtual ACE_HANDLE get_handle (void) const;
diff --git a/ACE/examples/Threads/barrier2.cpp b/ACE/examples/Threads/barrier2.cpp
index 1fa492857d3..aaddab06bc9 100644
--- a/ACE/examples/Threads/barrier2.cpp
+++ b/ACE/examples/Threads/barrier2.cpp
@@ -45,7 +45,7 @@ public:
 private:
   virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv=0);
 
-  virtual int svc (void);
+  virtual int svc ();
   // Iterate <n_iterations> time printing off a message and "waiting"
   // for all other threads to complete this iteration.
 
diff --git a/ACE/examples/Threads/future1.cpp b/ACE/examples/Threads/future1.cpp
index b80071185cb..57fe594f4ae 100644
--- a/ACE/examples/Threads/future1.cpp
+++ b/ACE/examples/Threads/future1.cpp
@@ -61,7 +61,7 @@ public:
   virtual int open (void *args = 0);
   virtual int close (u_long flags = 0);
 
-  virtual int svc (void);
+  virtual int svc ();
 
   ACE_Future<u_long> work (u_long param, int count = 1);
   ACE_Future<const char*> name (void);
diff --git a/ACE/examples/Threads/future2.cpp b/ACE/examples/Threads/future2.cpp
index 20f66f10188..1708fbe0d5e 100644
--- a/ACE/examples/Threads/future2.cpp
+++ b/ACE/examples/Threads/future2.cpp
@@ -69,7 +69,7 @@ private:
   virtual int close (u_long flags = 0);
 
   /// Here the actual servicing of all requests is happening..
-  virtual int svc (void);
+  virtual int svc ();
 
   // = Implementation methods.
   u_long work_i (u_long, int);
diff --git a/ACE/examples/Threads/task_four.cpp b/ACE/examples/Threads/task_four.cpp
index b53cc2e8223..e1f06fa7d1f 100644
--- a/ACE/examples/Threads/task_four.cpp
+++ b/ACE/examples/Threads/task_four.cpp
@@ -45,7 +45,7 @@ public:
                 size_t n_tasks,
                 size_t n_threads,
                 size_t n_iterations);
-  virtual int svc (void);
+  virtual int svc ();
   // creats <n_tasks> and wait for them to finish
 
 private:
@@ -63,7 +63,7 @@ public:
   Worker_Task (ACE_Thread_Manager *thr_mgr,
                size_t n_threads,
                size_t n_iterations);
-  virtual int svc (void);
+  virtual int svc ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   // Does a small work...
diff --git a/ACE/examples/Threads/task_one.cpp b/ACE/examples/Threads/task_one.cpp
index a5e36f6728d..bb0474c2894 100644
--- a/ACE/examples/Threads/task_one.cpp
+++ b/ACE/examples/Threads/task_one.cpp
@@ -21,7 +21,7 @@ public:
                 int n_threads,
                 int n_iterations);
 
-  virtual int svc (void);
+  virtual int svc ();
   // Iterate <n_iterations> time printing off a message and "waiting"
   // for all other threads to complete this iteration.
 
diff --git a/ACE/examples/Threads/task_three.cpp b/ACE/examples/Threads/task_three.cpp
index 123676c82a7..dd7d1c749ee 100644
--- a/ACE/examples/Threads/task_three.cpp
+++ b/ACE/examples/Threads/task_three.cpp
@@ -41,7 +41,7 @@ public:
   virtual int close (u_long flags = 0);
   //FUZZ: enable check_for_lack_ACE_OS
 
-  virtual int svc (void);
+  virtual int svc ();
 
   virtual int handle_input (ACE_HANDLE fd);
 
diff --git a/ACE/examples/Threads/task_two.cpp b/ACE/examples/Threads/task_two.cpp
index 560456e68c9..828322defa8 100644
--- a/ACE/examples/Threads/task_two.cpp
+++ b/ACE/examples/Threads/task_two.cpp
@@ -35,7 +35,7 @@ public:
   virtual int close (u_long flags = 0);
   //FUZZ: enable check_for_lack_ACE_OS
 
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   static ACE_Thread_Mutex lock_;
diff --git a/ACE/examples/Threads/thread_pool.cpp b/ACE/examples/Threads/thread_pool.cpp
index dfd85641bd0..9d560cb29e0 100644
--- a/ACE/examples/Threads/thread_pool.cpp
+++ b/ACE/examples/Threads/thread_pool.cpp
@@ -38,7 +38,7 @@ public:
   ~Thread_Pool (void);
   // Destructor...
 
-  virtual int svc (void);
+  virtual int svc ();
   // Iterate <n_iterations> time printing off a message and "waiting"
   // for all other threads to complete this iteration.
 
diff --git a/ACE/examples/Threads/token.cpp b/ACE/examples/Threads/token.cpp
index e0df596e414..b9c7bbd3e41 100644
--- a/ACE/examples/Threads/token.cpp
+++ b/ACE/examples/Threads/token.cpp
@@ -13,7 +13,7 @@ class My_Task : public ACE_Task<ACE_MT_SYNCH>
 {
 public:
   My_Task (int n);
-  virtual int svc (void);
+  virtual int svc ();
 
   static void sleep_hook (void *);
 
diff --git a/ACE/examples/Threads/tss1.cpp b/ACE/examples/Threads/tss1.cpp
index 2ef87c3819d..9fa78c3f2af 100644
--- a/ACE/examples/Threads/tss1.cpp
+++ b/ACE/examples/Threads/tss1.cpp
@@ -47,7 +47,7 @@ public:
   Tester (void) {}
   ~Tester (void) {}
 
-  virtual int svc (void);
+  virtual int svc ();
 
   //FUZZ: disable check_for_lack_ACE_OS
   /// Activate the thread.
diff --git a/ACE/examples/Threads/wfmo.cpp b/ACE/examples/Threads/wfmo.cpp
index ffad996a97f..a0c22c33991 100644
--- a/ACE/examples/Threads/wfmo.cpp
+++ b/ACE/examples/Threads/wfmo.cpp
@@ -27,7 +27,7 @@ public:
   virtual int open (void *);
   //FUZZ: enable check_for_lack_ACE_OS
 
-  virtual int svc (void);
+  virtual int svc ();
 
   // Use two handles here..
   ACE_sema_t sema_handles_[2];
diff --git a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h
index 5ccb0e01bff..6a357be66c9 100644
--- a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h
+++ b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Custom_Handler_Test.h
@@ -64,7 +64,7 @@ public:
               Thread_Timer_Queue_Custom_Handler_Test &timer_queue_driver);
 
   /// This method runs the event loop in the new thread.
-  virtual int svc (void);
+  virtual int svc ();
 
   // = Some helper methods.
 
diff --git a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h
index 97446bf213c..10e8443ad8c 100644
--- a/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h
+++ b/ACE/examples/Timer_Queue/Thread_Timer_Queue_Test.h
@@ -66,7 +66,7 @@ public:
               Thread_Timer_Queue_Test_Driver &timer_queue_driver);
 
   /// This method runs the event loop in the new thread.
-  virtual int svc (void);
+  virtual int svc ();
 
   // = Some helper methods.
 
diff --git a/ACE/netsvcs/lib/Client_Logging_Handler.cpp b/ACE/netsvcs/lib/Client_Logging_Handler.cpp
index bbbb141a8bc..fd8b6486e59 100644
--- a/ACE/netsvcs/lib/Client_Logging_Handler.cpp
+++ b/ACE/netsvcs/lib/Client_Logging_Handler.cpp
@@ -436,7 +436,7 @@ protected:
   virtual int init (int argc, ACE_TCHAR *argv[]);
   // Called when service is linked.
 
-  virtual int fini (void);
+  virtual int fini ();
   // Called when service is unlinked.
 
   virtual int info (ACE_TCHAR **strp, size_t length) const;
diff --git a/ACE/netsvcs/lib/Server_Logging_Handler_T.h b/ACE/netsvcs/lib/Server_Logging_Handler_T.h
index a763a3800a7..8597b8f6981 100644
--- a/ACE/netsvcs/lib/Server_Logging_Handler_T.h
+++ b/ACE/netsvcs/lib/Server_Logging_Handler_T.h
@@ -200,7 +200,7 @@ public:
   ACE_Thr_Server_Logging_Handler (ACE_Thread_Manager *,
                                   const LOG_MESSAGE_RECEIVER &receiver);
   virtual int open (void * = 0);
-  virtual int svc (void);
+  virtual int svc ();
 };
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
diff --git a/ACE/netsvcs/lib/TS_Clerk_Handler.h b/ACE/netsvcs/lib/TS_Clerk_Handler.h
index c0c4d42e27e..d2d05c13b14 100644
--- a/ACE/netsvcs/lib/TS_Clerk_Handler.h
+++ b/ACE/netsvcs/lib/TS_Clerk_Handler.h
@@ -198,7 +198,7 @@ protected:
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
   /// Called when service is unlinked.
-  virtual int fini (void);
+  virtual int fini ();
 
   /// Called to determine info about the service.
   virtual int info (ACE_TCHAR **strp, size_t length) const;
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.h b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.h
index 190eee71861..f2ade5660e0 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.h
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Adaptive_Lock_Performance_Test_Base.h
@@ -8,8 +8,8 @@ class ACE_Svc_Export Adaptive_Lock_Performance_Test_Base : public Benchmark_Perf
 {
 public:
   virtual int init (int, ACE_TCHAR *[]) = 0;
-  virtual int fini (void);
-  virtual int svc (void);
+  virtual int fini ();
+  virtual int svc ();
 
   int set_lock (ACE_Lock *lock);
 
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h
index 5adf9ef8c2d..c3b963a0a28 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/Benchmark_Performance.h
@@ -30,7 +30,7 @@ public:
   virtual int svc (void) = 0;
   virtual int init (int, ACE_TCHAR *[]);
   virtual int info (ACE_TCHAR **, size_t) const;
-  virtual int fini (void);
+  virtual int fini ();
   static void *svc_run (Benchmark_Performance *bp);
 
   // = Set/get flag that controls how the tests are shut down
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/condb_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/condb_test.cpp
index a5b041f179f..5de752a85b1 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/condb_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/condb_test.cpp
@@ -7,7 +7,7 @@
 class ACE_Svc_Export Cond_Brdcast_Test : public Benchmark_Performance
 {
 public:
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   static ACE_Thread_Mutex mutex;
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/conds_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/conds_test.cpp
index 2d487d7f0ee..17882016d2a 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/conds_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/conds_test.cpp
@@ -7,7 +7,7 @@
 class ACE_Svc_Export Cond_Signal_Test : public Benchmark_Performance
 {
 public:
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   static ACE_Thread_Mutex mutex;
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/context_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/context_test.cpp
index 8642aea0609..ba507128c87 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/context_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/context_test.cpp
@@ -7,7 +7,7 @@
 class ACE_Svc_Export Context_Test : public Benchmark_Performance
 {
 public:
-  virtual int svc (void);
+  virtual int svc ();
 };
 
 int
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
index e6ba8f9996d..45c136989bf 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/guard_test.cpp
@@ -15,7 +15,7 @@ public:
     TEST_ACE_THREAD_MUTEX_GUARD // -t
   };
 
-  virtual int svc (void);
+  virtual int svc ();
   virtual int init (int, ACE_TCHAR *[]);
 
   void test_guard (int);
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp
index 7023060e537..e5446a721ce 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/memory_test.cpp
@@ -9,7 +9,7 @@
 class ACE_Svc_Export Memory_Test : public Benchmark_Performance
 {
 public:
-  virtual int svc (void);
+  virtual int svc ();
 };
 
 int
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/mutex_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/mutex_test.cpp
index 822ccad909c..1bfca0accc0 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/mutex_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/mutex_test.cpp
@@ -7,7 +7,7 @@
 class ACE_Svc_Export Mutex_Test : public Benchmark_Performance
 {
 public:
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   static ACE_Thread_Mutex mutex;
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_proc_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_proc_test.cpp
index 0177ea6a24c..291ef0d6f23 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_proc_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_proc_test.cpp
@@ -10,7 +10,7 @@ class ACE_Svc_Export Pipe_Proc_Test : public Benchmark_Performance
 {
 public:
   int init (int, ACE_TCHAR **);
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   ACE_HANDLE pipe_handles[2];
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_thr_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_thr_test.cpp
index 00a49d12805..3f0a3b432fc 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_thr_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/pipe_thr_test.cpp
@@ -11,7 +11,7 @@ class ACE_Svc_Export Pipe_Thr_Test : public Benchmark_Performance
 {
 public:
   virtual int init (int, ACE_TCHAR **);
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   ACE_HANDLE pipe_handles[2];
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp
index 20a6a914d5f..97b731c24ee 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/recursive_lock_test.cpp
@@ -8,7 +8,7 @@
 class ACE_Svc_Export Recursive_Lock_Test : public Benchmark_Performance
 {
 public:
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   static ACE_Recursive_Thread_Mutex mutex;
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp
index 324775e2558..118ddcd47ca 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwrd_test.cpp
@@ -8,7 +8,7 @@
 class ACE_Svc_Export RWRD_Test : public Benchmark_Performance
 {
 public:
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   static ACE_RW_Mutex rw_lock;
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp
index 4898667f210..de143e21170 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/rwwr_test.cpp
@@ -8,7 +8,7 @@
 class ACE_Svc_Export RWWR_Test : public Benchmark_Performance
 {
 public:
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   static ACE_RW_Mutex rw_lock;
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sema_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sema_test.cpp
index 965261632fc..fd0af5d8bb4 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sema_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sema_test.cpp
@@ -8,7 +8,7 @@
 class ACE_Svc_Export Sema_Test : public Benchmark_Performance
 {
 public:
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   static ACE_Semaphore sema;
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sysvsema_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sysvsema_test.cpp
index 3d92c3d10d8..5a366d8dafa 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sysvsema_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/sysvsema_test.cpp
@@ -9,8 +9,8 @@ class ACE_Svc_Export SYSVSema_Test : public Benchmark_Performance
 {
 public:
   virtual int init (int, ACE_TCHAR *[]);
-  virtual int fini (void);
-  virtual int svc (void);
+  virtual int fini ();
+  virtual int svc ();
 
 private:
   static ACE_SV_Semaphore_Simple *sema;
diff --git a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/token_test.cpp b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/token_test.cpp
index 15bfedc8b5f..1bc1136424d 100644
--- a/ACE/performance-tests/Synch-Benchmarks/Perf_Test/token_test.cpp
+++ b/ACE/performance-tests/Synch-Benchmarks/Perf_Test/token_test.cpp
@@ -8,7 +8,7 @@
 class ACE_Svc_Export Token_Test : public Benchmark_Performance
 {
 public:
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   static ACE_Token token;
diff --git a/ACE/protocols/tests/INet/MT_Get/Main.cpp b/ACE/protocols/tests/INet/MT_Get/Main.cpp
index 774125b6e4e..59446adcdf9 100644
--- a/ACE/protocols/tests/INet/MT_Get/Main.cpp
+++ b/ACE/protocols/tests/INet/MT_Get/Main.cpp
@@ -17,7 +17,7 @@ public:
   Get_Task (ACE_Thread_Manager *thr_mgr,
             int n_threads);
 
-  virtual int svc (void);
+  virtual int svc ();
 
   const ACE_Array<ACE_CString>& results ();
 
@@ -107,7 +107,7 @@ class Get_MultiTask : public ACE_Task<ACE_MT_SYNCH>
 public:
   Get_MultiTask (ACE_Thread_Manager *thr_mgr);
 
-  virtual int svc (void);
+  virtual int svc ();
 
   int failures ();
 
diff --git a/ACE/tests/Bound_Ptr_Test.h b/ACE/tests/Bound_Ptr_Test.h
index b6bc6691c0e..326fc2e8ae0 100644
--- a/ACE/tests/Bound_Ptr_Test.h
+++ b/ACE/tests/Bound_Ptr_Test.h
@@ -67,7 +67,7 @@ public:
 protected:
   /// Runs the Scheduler's event loop, which dequeues <Method_Requests>
   /// and dispatches them.
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   // = These are the <Scheduler> implementation details.
diff --git a/ACE/tests/MEM_Stream_Test.h b/ACE/tests/MEM_Stream_Test.h
index f81207b805b..cbba67d5562 100644
--- a/ACE/tests/MEM_Stream_Test.h
+++ b/ACE/tests/MEM_Stream_Test.h
@@ -42,7 +42,7 @@ public:
   virtual int handle_input (ACE_HANDLE h);
   virtual int handle_close (ACE_HANDLE handle,
                             ACE_Reactor_Mask close_mask);
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   ACE_TCHAR name_[MAXPATHLEN];
diff --git a/ACE/tests/MT_Reactor_Timer_Test.h b/ACE/tests/MT_Reactor_Timer_Test.h
index 4c0a9e68f35..966a48e1500 100644
--- a/ACE/tests/MT_Reactor_Timer_Test.h
+++ b/ACE/tests/MT_Reactor_Timer_Test.h
@@ -40,7 +40,7 @@ public:
   int verify_results(void);
 
   /// Run by a daemon thread to handle deferred processing.
-  virtual int svc (void);
+  virtual int svc ();
 
   virtual int handle_timeout (const ACE_Time_Value &tv,
                               const void *arg);
diff --git a/ACE/tests/Priority_Reactor_Test.h b/ACE/tests/Priority_Reactor_Test.h
index 9d6caaace43..10a7ba3cd01 100644
--- a/ACE/tests/Priority_Reactor_Test.h
+++ b/ACE/tests/Priority_Reactor_Test.h
@@ -68,7 +68,7 @@ class Write_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>
 {
 public:
   virtual int open (void *);
-  virtual int svc (void);
+  virtual int svc ();
 };
 
 #endif /* ACE_TESTS_PRIORITY_REACTOR_TEST_H */
diff --git a/ACE/tests/Process_Strategy_Test.h b/ACE/tests/Process_Strategy_Test.h
index 345480596dd..190b1d392ea 100644
--- a/ACE/tests/Process_Strategy_Test.h
+++ b/ACE/tests/Process_Strategy_Test.h
@@ -50,7 +50,7 @@ protected:
   // = Methods invoked via "pointer to method" table entry.
 
   /// Handle the THREAD case.
-  virtual int svc (void);
+  virtual int svc ();
 
   // = Operations corresponding to requests from the client.
   /// Execute the read operation on the file.
diff --git a/ACE/tests/SSL/Bug_2912_Regression_Test.cpp b/ACE/tests/SSL/Bug_2912_Regression_Test.cpp
index 653b9ade93d..819413a431e 100644
--- a/ACE/tests/SSL/Bug_2912_Regression_Test.cpp
+++ b/ACE/tests/SSL/Bug_2912_Regression_Test.cpp
@@ -96,7 +96,7 @@ typedef ACE_Singleton<Client_Proactor, ACE_SYNCH_RECURSIVE_MUTEX>
 class Client_Proactor_Task : public ACE_Task_Base
 {
 public:
-  virtual int svc (void);
+  virtual int svc ();
 };
 
 typedef ACE_Singleton<Client_Proactor_Task, ACE_SYNCH_RECURSIVE_MUTEX>
@@ -125,7 +125,7 @@ typedef ACE_Singleton<Server_Proactor, ACE_SYNCH_RECURSIVE_MUTEX>
 class Server_Proactor_Task : public ACE_Task_Base
 {
 public:
-  virtual int svc (void);
+  virtual int svc ();
 };
 
 typedef ACE_Singleton<Server_Proactor_Task, ACE_SYNCH_RECURSIVE_MUTEX>
diff --git a/ACE/tests/Service_Config_DLL.h b/ACE/tests/Service_Config_DLL.h
index 27f966efe8c..ca66ec748db 100644
--- a/ACE/tests/Service_Config_DLL.h
+++ b/ACE/tests/Service_Config_DLL.h
@@ -42,14 +42,14 @@ public:
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
   /// Terminates object when dynamic unlinking occurs.
-  virtual int fini (void);
+  virtual int fini ();
 
   /// Run by a daemon thread.
   /**
    * Each thread will invoke the Service Configurator via this
    * method unless the object is the "FINAL" object.
    */
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
 
@@ -75,7 +75,7 @@ public:
   virtual int init (int argc, ACE_TCHAR *argv[]);
 
   /// Terminates object when dynamic unlinking occurs.
-  virtual int fini (void);
+  virtual int fini ();
 
   /// Returns information on a service object.
   virtual int info (ACE_TCHAR **info_string, size_t length = 0) const;
diff --git a/ACE/tests/Service_Config_Stream_DLL.h b/ACE/tests/Service_Config_Stream_DLL.h
index f54fc6da5cc..716c5fd147c 100644
--- a/ACE/tests/Service_Config_Stream_DLL.h
+++ b/ACE/tests/Service_Config_Stream_DLL.h
@@ -26,7 +26,7 @@ public:
   //FUZZ: enable check_for_lack_ACE_OS
 
   virtual int init (int, ACE_TCHAR *[]);
-  virtual int fini (void);
+  virtual int fini ();
 };
 
 // Task to verify the order and operation of the stream assembly
diff --git a/ACE/tests/Upgradable_RW_Test.h b/ACE/tests/Upgradable_RW_Test.h
index 4382c1f9bb5..24ae64d5e30 100644
--- a/ACE/tests/Upgradable_RW_Test.h
+++ b/ACE/tests/Upgradable_RW_Test.h
@@ -113,7 +113,7 @@ public:
   {
   };
 
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   /// keep a reference to the time calculation class
@@ -139,7 +139,7 @@ public:
   {
   };
 
-  virtual int svc (void);
+  virtual int svc ();
 
 private:
   /// keep a reference to the time calculation class