diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-09 13:31:46 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-09 13:31:46 +0100 |
| commit | 317dd62b7112b590efe99283ceb4b2e5e5649884 (patch) | |
| tree | 4df9cfc065c67e616010437b483dd97d2aba717b | |
| parent | 60d97734bef3939bb7ed54170fbcf9a1b459b496 (diff) | |
| download | ATCD-317dd62b7112b590efe99283ceb4b2e5e5649884.tar.gz | |
Documentation, layout, C++11 changes
414 files changed, 960 insertions, 1417 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 diff --git a/TAO/TAO_IDL/ast/ast_eventtype.cpp b/TAO/TAO_IDL/ast/ast_eventtype.cpp index 16e4b5fba32..b5f261ed062 100644 --- a/TAO/TAO_IDL/ast/ast_eventtype.cpp +++ b/TAO/TAO_IDL/ast/ast_eventtype.cpp @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #include "ast_eventtype.h" #include "ast_visitor.h" #include "utl_identifier.h" diff --git a/TAO/TAO_IDL/ast/ast_valuetype.cpp b/TAO/TAO_IDL/ast/ast_valuetype.cpp index 5bce86c9f98..ce0d7f427c4 100644 --- a/TAO/TAO_IDL/ast/ast_valuetype.cpp +++ b/TAO/TAO_IDL/ast/ast_valuetype.cpp @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #include "ast_valuetype.h" #include "ast_typedef.h" #include "ast_factory.h" diff --git a/TAO/TAO_IDL/be_include/be_extern.h b/TAO/TAO_IDL/be_include/be_extern.h index 444fb4674ce..e24b3397e46 100644 --- a/TAO/TAO_IDL/be_include/be_extern.h +++ b/TAO/TAO_IDL/be_include/be_extern.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/be_include/be_template_module_inst.h b/TAO/TAO_IDL/be_include/be_template_module_inst.h index 2d5c917761f..28dd3aada0e 100644 --- a/TAO/TAO_IDL/be_include/be_template_module_inst.h +++ b/TAO/TAO_IDL/be_include/be_template_module_inst.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef BE_TEMPLATE_MODULE_INST_H #define BE_TEMPLATE_MODULE_INST_H diff --git a/TAO/TAO_IDL/be_include/be_template_module_ref.h b/TAO/TAO_IDL/be_include/be_template_module_ref.h index 202d2a86b74..3d53515ed9d 100644 --- a/TAO/TAO_IDL/be_include/be_template_module_ref.h +++ b/TAO/TAO_IDL/be_include/be_template_module_ref.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef BE_TEMPLATE_MODULE_REF_H #define BE_TEMPLATE_MODULE_REF_H diff --git a/TAO/TAO_IDL/fe/fe_extern.cpp b/TAO/TAO_IDL/fe/fe_extern.cpp index 0acc50532f7..5f791a4c82a 100644 --- a/TAO/TAO_IDL/fe/fe_extern.cpp +++ b/TAO/TAO_IDL/fe/fe_extern.cpp @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast.h b/TAO/TAO_IDL/include/ast.h index f0320c6c53e..10360ac0c53 100644 --- a/TAO/TAO_IDL/include/ast.h +++ b/TAO/TAO_IDL/include/ast.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_argument.h b/TAO/TAO_IDL/include/ast_argument.h index 6f90a060c00..bba776599cb 100644 --- a/TAO/TAO_IDL/include/ast_argument.h +++ b/TAO/TAO_IDL/include/ast_argument.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h index b82000a4a50..44f53855c06 100644 --- a/TAO/TAO_IDL/include/ast_array.h +++ b/TAO/TAO_IDL/include/ast_array.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h index b8be84250cc..84266febc35 100644 --- a/TAO/TAO_IDL/include/ast_attribute.h +++ b/TAO/TAO_IDL/include/ast_attribute.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_component.h b/TAO/TAO_IDL/include/ast_component.h index 7d45a7b455b..be20b103a58 100644 --- a/TAO/TAO_IDL/include/ast_component.h +++ b/TAO/TAO_IDL/include/ast_component.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef _AST_COMPONENT_AST_COMPONENT_HH #define _AST_COMPONENT_AST_COMPONENT_HH diff --git a/TAO/TAO_IDL/include/ast_component_fwd.h b/TAO/TAO_IDL/include/ast_component_fwd.h index 61b721beff6..a8aa8e5d9db 100644 --- a/TAO/TAO_IDL/include/ast_component_fwd.h +++ b/TAO/TAO_IDL/include/ast_component_fwd.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef _AST_COMPONENT_FWD_AST_COMPONENT_FWD_HH #define _AST_COMPONENT_FWD_AST_COMPONENT_FWD_HH diff --git a/TAO/TAO_IDL/include/ast_concrete_type.h b/TAO/TAO_IDL/include/ast_concrete_type.h index 3d15bc1ba7b..cd00db1cfbe 100644 --- a/TAO/TAO_IDL/include/ast_concrete_type.h +++ b/TAO/TAO_IDL/include/ast_concrete_type.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_constant.h b/TAO/TAO_IDL/include/ast_constant.h index b974e63a842..1ccfde4d535 100644 --- a/TAO/TAO_IDL/include/ast_constant.h +++ b/TAO/TAO_IDL/include/ast_constant.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_enum.h b/TAO/TAO_IDL/include/ast_enum.h index 32b18f78a4c..3fcf4a24455 100644 --- a/TAO/TAO_IDL/include/ast_enum.h +++ b/TAO/TAO_IDL/include/ast_enum.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_enum_val.h b/TAO/TAO_IDL/include/ast_enum_val.h index f1667000d0b..531991f363f 100644 --- a/TAO/TAO_IDL/include/ast_enum_val.h +++ b/TAO/TAO_IDL/include/ast_enum_val.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_eventtype.h b/TAO/TAO_IDL/include/ast_eventtype.h index f7243863e8c..9822ee4d874 100644 --- a/TAO/TAO_IDL/include/ast_eventtype.h +++ b/TAO/TAO_IDL/include/ast_eventtype.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef _AST_VALUETYPE_AST_EVENTTYPE_HH #define _AST_VALUETYPE_AST_EVENTTYPE_HH diff --git a/TAO/TAO_IDL/include/ast_eventtype_fwd.h b/TAO/TAO_IDL/include/ast_eventtype_fwd.h index c859663a582..51b0a1d8054 100644 --- a/TAO/TAO_IDL/include/ast_eventtype_fwd.h +++ b/TAO/TAO_IDL/include/ast_eventtype_fwd.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef _AST_VALUETYPE_FWD_AST_EVENTTYPE_FWD_HH #define _AST_VALUETYPE_FWD_AST_EVENTTYPE_FWD_HH diff --git a/TAO/TAO_IDL/include/ast_exception.h b/TAO/TAO_IDL/include/ast_exception.h index 76556795479..25cf1bfd9b2 100644 --- a/TAO/TAO_IDL/include/ast_exception.h +++ b/TAO/TAO_IDL/include/ast_exception.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h index 9a975bf9502..ba2084deff9 100644 --- a/TAO/TAO_IDL/include/ast_expression.h +++ b/TAO/TAO_IDL/include/ast_expression.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_extern.h b/TAO/TAO_IDL/include/ast_extern.h index 480182b2467..92eb7908cc9 100644 --- a/TAO/TAO_IDL/include/ast_extern.h +++ b/TAO/TAO_IDL/include/ast_extern.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_factory.h b/TAO/TAO_IDL/include/ast_factory.h index d83aeacfd84..d6fddc257d3 100644 --- a/TAO/TAO_IDL/include/ast_factory.h +++ b/TAO/TAO_IDL/include/ast_factory.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_finder.h b/TAO/TAO_IDL/include/ast_finder.h index f66e44d910f..13540932f25 100644 --- a/TAO/TAO_IDL/include/ast_finder.h +++ b/TAO/TAO_IDL/include/ast_finder.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef TAO_IDL_AST_FINDER_H #define TAO_IDL_AST_FINDER_H @@ -9,7 +8,6 @@ class TAO_IDL_FE_Export AST_Finder : public virtual AST_Factory { public: - AST_Finder (UTL_ScopedName *n); virtual ~AST_Finder (); diff --git a/TAO/TAO_IDL/include/ast_fixed.h b/TAO/TAO_IDL/include/ast_fixed.h index afd9311e6df..e1c2f7372dd 100644 --- a/TAO/TAO_IDL/include/ast_fixed.h +++ b/TAO/TAO_IDL/include/ast_fixed.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef AST_FIXED_H #define AST_FIXED_H diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h index 36c34f517d4..61f78e6c27a 100644 --- a/TAO/TAO_IDL/include/ast_generator.h +++ b/TAO/TAO_IDL/include/ast_generator.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_home.h b/TAO/TAO_IDL/include/ast_home.h index 045c1357e8b..bc8a9c630ae 100644 --- a/TAO/TAO_IDL/include/ast_home.h +++ b/TAO/TAO_IDL/include/ast_home.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef _AST_HOME_AST_HOME_HH #define _AST_HOME_AST_HOME_HH diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h index a5fe7b023f5..1cc3c60b556 100644 --- a/TAO/TAO_IDL/include/ast_interface.h +++ b/TAO/TAO_IDL/include/ast_interface.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h index 101b39fd6d6..e2d9f69a976 100644 --- a/TAO/TAO_IDL/include/ast_interface_fwd.h +++ b/TAO/TAO_IDL/include/ast_interface_fwd.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h index d697dcb785e..0a04fc9eb1c 100644 --- a/TAO/TAO_IDL/include/ast_module.h +++ b/TAO/TAO_IDL/include/ast_module.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_native.h b/TAO/TAO_IDL/include/ast_native.h index 2a56f19a152..5d2ed380ea5 100644 --- a/TAO/TAO_IDL/include/ast_native.h +++ b/TAO/TAO_IDL/include/ast_native.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef _AST_NATIVE_H_ #define _AST_NATIVE_H_ diff --git a/TAO/TAO_IDL/include/ast_operation.h b/TAO/TAO_IDL/include/ast_operation.h index 008fcc4616f..fcde5eef3da 100644 --- a/TAO/TAO_IDL/include/ast_operation.h +++ b/TAO/TAO_IDL/include/ast_operation.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_param_holder.h b/TAO/TAO_IDL/include/ast_param_holder.h index 17f4d66f41b..98ba09033f5 100644 --- a/TAO/TAO_IDL/include/ast_param_holder.h +++ b/TAO/TAO_IDL/include/ast_param_holder.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef AST_PARAM_HOLDER_H #define AST_PARAM_HOLDER_H diff --git a/TAO/TAO_IDL/include/ast_porttype.h b/TAO/TAO_IDL/include/ast_porttype.h index 20b0e92ea26..9eea8b46690 100644 --- a/TAO/TAO_IDL/include/ast_porttype.h +++ b/TAO/TAO_IDL/include/ast_porttype.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef AST_PORTTYPE_H #define AST_PORTTYPE_H diff --git a/TAO/TAO_IDL/include/ast_predefined_type.h b/TAO/TAO_IDL/include/ast_predefined_type.h index 3969936f4ce..ac6f416af3a 100644 --- a/TAO/TAO_IDL/include/ast_predefined_type.h +++ b/TAO/TAO_IDL/include/ast_predefined_type.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_root.h b/TAO/TAO_IDL/include/ast_root.h index 8c3b50d01f1..78df7ca6601 100644 --- a/TAO/TAO_IDL/include/ast_root.h +++ b/TAO/TAO_IDL/include/ast_root.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_sequence.h b/TAO/TAO_IDL/include/ast_sequence.h index d1f1d94abda..0ad62ce18b0 100644 --- a/TAO/TAO_IDL/include/ast_sequence.h +++ b/TAO/TAO_IDL/include/ast_sequence.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_string.h b/TAO/TAO_IDL/include/ast_string.h index 71ad8c1e935..7f8473f82bd 100644 --- a/TAO/TAO_IDL/include/ast_string.h +++ b/TAO/TAO_IDL/include/ast_string.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_structure.h b/TAO/TAO_IDL/include/ast_structure.h index 15eb9c2dd65..808afb32f83 100644 --- a/TAO/TAO_IDL/include/ast_structure.h +++ b/TAO/TAO_IDL/include/ast_structure.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_structure_fwd.h b/TAO/TAO_IDL/include/ast_structure_fwd.h index f459c558505..4f9e4b6d84f 100644 --- a/TAO/TAO_IDL/include/ast_structure_fwd.h +++ b/TAO/TAO_IDL/include/ast_structure_fwd.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef _AST_STRUCTURE_FWD_AST_STRUCTURE_FWD_HH #define _AST_STRUCTURE_FWD_AST_STRUCTURE_FWD_HH diff --git a/TAO/TAO_IDL/include/ast_template_module.h b/TAO/TAO_IDL/include/ast_template_module.h index 5f1e5d4e8f2..a03e55e14c7 100644 --- a/TAO/TAO_IDL/include/ast_template_module.h +++ b/TAO/TAO_IDL/include/ast_template_module.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef AST_TEMPLATE_MODULE_H #define AST_TEMPLATE_MODULE_H diff --git a/TAO/TAO_IDL/include/ast_template_module_inst.h b/TAO/TAO_IDL/include/ast_template_module_inst.h index d56fc150dc1..0a8fba504f3 100644 --- a/TAO/TAO_IDL/include/ast_template_module_inst.h +++ b/TAO/TAO_IDL/include/ast_template_module_inst.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef AST_TEMPLATE_MODULE_INST_H #define AST_TEMPLATE_MODULE_INST_H diff --git a/TAO/TAO_IDL/include/ast_template_module_ref.h b/TAO/TAO_IDL/include/ast_template_module_ref.h index 7273bc0e381..62ef07289fd 100644 --- a/TAO/TAO_IDL/include/ast_template_module_ref.h +++ b/TAO/TAO_IDL/include/ast_template_module_ref.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef AST_TEMPLATE_MODULE_REF_H #define AST_TEMPLATE_MODULE_REF_H diff --git a/TAO/TAO_IDL/include/ast_type.h b/TAO/TAO_IDL/include/ast_type.h index 5cda580cf1c..db8a9c0f11a 100644 --- a/TAO/TAO_IDL/include/ast_type.h +++ b/TAO/TAO_IDL/include/ast_type.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_typedef.h b/TAO/TAO_IDL/include/ast_typedef.h index b1181cb18e8..ad124f5b6c9 100644 --- a/TAO/TAO_IDL/include/ast_typedef.h +++ b/TAO/TAO_IDL/include/ast_typedef.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_union.h b/TAO/TAO_IDL/include/ast_union.h index dafa8e704de..aebca5626da 100644 --- a/TAO/TAO_IDL/include/ast_union.h +++ b/TAO/TAO_IDL/include/ast_union.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_union_branch.h b/TAO/TAO_IDL/include/ast_union_branch.h index 988b06811da..aed502856c1 100644 --- a/TAO/TAO_IDL/include/ast_union_branch.h +++ b/TAO/TAO_IDL/include/ast_union_branch.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_union_fwd.h b/TAO/TAO_IDL/include/ast_union_fwd.h index 14a6121d7e3..763a75ac3dd 100644 --- a/TAO/TAO_IDL/include/ast_union_fwd.h +++ b/TAO/TAO_IDL/include/ast_union_fwd.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef _AST_UNION_FWD_AST_UNION_FWD_HH #define _AST_UNION_FWD_AST_UNION_FWD_HH @@ -7,7 +6,6 @@ class AST_Union; // Representation of a forward union declaration. - class TAO_IDL_FE_Export AST_UnionFwd : public virtual AST_StructureFwd { public: diff --git a/TAO/TAO_IDL/include/ast_union_label.h b/TAO/TAO_IDL/include/ast_union_label.h index 28c5e0275f2..b5e0a79bbff 100644 --- a/TAO/TAO_IDL/include/ast_union_label.h +++ b/TAO/TAO_IDL/include/ast_union_label.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/TAO_IDL/include/ast_valuebox.h b/TAO/TAO_IDL/include/ast_valuebox.h index 4ea5ec52eb5..5b79b05e2b6 100644 --- a/TAO/TAO_IDL/include/ast_valuebox.h +++ b/TAO/TAO_IDL/include/ast_valuebox.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef _AST_VALUEBOX_AST_VALUEBOX_HH #define _AST_VALUEBOX_AST_VALUEBOX_HH diff --git a/TAO/TAO_IDL/include/ast_valuetype.h b/TAO/TAO_IDL/include/ast_valuetype.h index 9309da49809..881b35e908d 100644 --- a/TAO/TAO_IDL/include/ast_valuetype.h +++ b/TAO/TAO_IDL/include/ast_valuetype.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef _AST_INTERFACE_AST_VALUETYPE_HH #define _AST_INTERFACE_AST_VALUETYPE_HH diff --git a/TAO/TAO_IDL/include/ast_valuetype_fwd.h b/TAO/TAO_IDL/include/ast_valuetype_fwd.h index 6e9e9ce38b4..43c289045a3 100644 --- a/TAO/TAO_IDL/include/ast_valuetype_fwd.h +++ b/TAO/TAO_IDL/include/ast_valuetype_fwd.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #ifndef _AST_INTERFACE_FWD_AST_VALUETYPE_FWD_HH #define _AST_INTERFACE_FWD_AST_VALUETYPE_FWD_HH diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h index 1b1a5c41e54..697c03e1e08 100644 --- a/TAO/TAO_IDL/include/utl_scope.h +++ b/TAO/TAO_IDL/include/utl_scope.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h index 1a22404b831..97f06a54d54 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h +++ b/TAO/docs/tutorials/Quoter/RTCORBA/Stock_Database.h @@ -92,7 +92,7 @@ public: * This function is used to calculate the new high, low and last values * for each stock in the stock database randomly. */ - virtual int svc (void); + virtual int svc (); /// Change the rate at which database updates are made void update_rate (u_int rate); diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.h b/TAO/examples/AMH/Sink_Server/Client_Task.h index 91dd1b5082d..1eff57f05a6 100644 --- a/TAO/examples/AMH/Sink_Server/Client_Task.h +++ b/TAO/examples/AMH/Sink_Server/Client_Task.h @@ -38,7 +38,7 @@ public: protected: /// The service method - virtual int svc (void); + virtual int svc (); private: /// Print Statistics diff --git a/TAO/examples/AMI/FL_Callback/Peer_i.h b/TAO/examples/AMI/FL_Callback/Peer_i.h index c9563cf4279..77c00e57588 100644 --- a/TAO/examples/AMI/FL_Callback/Peer_i.h +++ b/TAO/examples/AMI/FL_Callback/Peer_i.h @@ -92,7 +92,7 @@ public: CORBA::Long id); /// The thread entry point - virtual int svc (void); + virtual int svc (); private: /// The peers diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp index 878d1c9d740..18a884e8675 100644 --- a/TAO/examples/AMI/FL_Callback/peer.cpp +++ b/TAO/examples/AMI/FL_Callback/peer.cpp @@ -56,7 +56,7 @@ public: Worker (CORBA::ORB_ptr orb); /// The thread entry point. - virtual int svc (void); + virtual int svc (); private: /// The orb diff --git a/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp index 1e8b5944313..ee579c9e4c1 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.cpp @@ -12,24 +10,16 @@ #include "ace/CORBA_macros.h" #include "ace/OS_NS_unistd.h" - OrbShutdownTask::OrbShutdownTask() { } - -OrbShutdownTask::~OrbShutdownTask() -{ -} - - void OrbShutdownTask::orb(CORBA::ORB_ptr orb) { this->orb_ = CORBA::ORB::_duplicate (orb); } - int OrbShutdownTask::open(void*) { @@ -47,7 +37,6 @@ OrbShutdownTask::open(void*) return 0; } - int OrbShutdownTask::svc() { @@ -67,7 +56,6 @@ OrbShutdownTask::svc() return 0; } - int OrbShutdownTask::close(u_long) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.h b/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.h index 6f0bd826751..d0939b46191 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.h @@ -14,24 +12,21 @@ #include "ace/Task.h" #include "tao/ORB.h" - class OrbShutdownTask : public ACE_Task_Base { - public: - - OrbShutdownTask(); - virtual ~OrbShutdownTask(); - - void orb(CORBA::ORB_ptr orb); +public: + OrbShutdownTask(); + virtual ~OrbShutdownTask() = default; - virtual int open(void*); - virtual int svc(); - virtual int close(u_long); + void orb(CORBA::ORB_ptr orb); + virtual int open(void*); + virtual int svc(); + virtual int close(u_long); - private: - CORBA::ORB_var orb_; +private: + CORBA::ORB_var orb_; }; typedef ACE_Singleton<OrbShutdownTask, TAO_SYNCH_MUTEX> TheOrbShutdownTask; diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp index 1e8b5944313..0aaadc3344b 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.cpp @@ -12,24 +10,17 @@ #include "ace/CORBA_macros.h" #include "ace/OS_NS_unistd.h" - OrbShutdownTask::OrbShutdownTask() { } -OrbShutdownTask::~OrbShutdownTask() -{ -} - - void OrbShutdownTask::orb(CORBA::ORB_ptr orb) { this->orb_ = CORBA::ORB::_duplicate (orb); } - int OrbShutdownTask::open(void*) { @@ -47,7 +38,6 @@ OrbShutdownTask::open(void*) return 0; } - int OrbShutdownTask::svc() { @@ -67,7 +57,6 @@ OrbShutdownTask::svc() return 0; } - int OrbShutdownTask::close(u_long) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.h b/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.h index 6f0bd826751..d0939b46191 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.h @@ -14,24 +12,21 @@ #include "ace/Task.h" #include "tao/ORB.h" - class OrbShutdownTask : public ACE_Task_Base { - public: - - OrbShutdownTask(); - virtual ~OrbShutdownTask(); - - void orb(CORBA::ORB_ptr orb); +public: + OrbShutdownTask(); + virtual ~OrbShutdownTask() = default; - virtual int open(void*); - virtual int svc(); - virtual int close(u_long); + void orb(CORBA::ORB_ptr orb); + virtual int open(void*); + virtual int svc(); + virtual int close(u_long); - private: - CORBA::ORB_var orb_; +private: + CORBA::ORB_var orb_; }; typedef ACE_Singleton<OrbShutdownTask, TAO_SYNCH_MUTEX> TheOrbShutdownTask; diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp index 1e8b5944313..f1c523a37ab 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.cpp @@ -12,24 +10,16 @@ #include "ace/CORBA_macros.h" #include "ace/OS_NS_unistd.h" - OrbShutdownTask::OrbShutdownTask() { } - -OrbShutdownTask::~OrbShutdownTask() -{ -} - - void OrbShutdownTask::orb(CORBA::ORB_ptr orb) { this->orb_ = CORBA::ORB::_duplicate (orb); } - int OrbShutdownTask::open(void*) { @@ -47,7 +37,6 @@ OrbShutdownTask::open(void*) return 0; } - int OrbShutdownTask::svc() { diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.h b/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.h index 6f0bd826751..704d3b37e0c 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.h @@ -14,24 +12,20 @@ #include "ace/Task.h" #include "tao/ORB.h" - class OrbShutdownTask : public ACE_Task_Base { - public: - - OrbShutdownTask(); - virtual ~OrbShutdownTask(); - - void orb(CORBA::ORB_ptr orb); - - virtual int open(void*); - virtual int svc(); - virtual int close(u_long); +public: + OrbShutdownTask(); + virtual ~OrbShutdownTask() = default; + void orb(CORBA::ORB_ptr orb); - private: + virtual int open(void*); + virtual int svc(); + virtual int close(u_long); - CORBA::ORB_var orb_; +private: + CORBA::ORB_var orb_; }; typedef ACE_Singleton<OrbShutdownTask, TAO_SYNCH_MUTEX> TheOrbShutdownTask; diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.cpp index d304e57961e..55855088190 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbTask.cpp @@ -12,19 +10,12 @@ namespace { enum { MAX_ORB_TASK_WORKER_THREADS = 20 }; } - OrbTask::OrbTask(CORBA::ORB_ptr orb, unsigned num_threads) : orb_ (CORBA::ORB::_duplicate(orb)), num_threads_(num_threads) { } - -OrbTask::~OrbTask() -{ -} - - int OrbTask::open(void*) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.h b/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.h index 039da12da9f..52bc5b9c8a5 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbTask.h @@ -16,20 +14,18 @@ class OrbTask : public ACE_Task_Base { - public: - - OrbTask(CORBA::ORB_ptr orb, unsigned num_threads = 1); - virtual ~OrbTask(); - - virtual int open(void* x = 0); - virtual int svc(); - virtual int close(u_long); +public: + OrbTask(CORBA::ORB_ptr orb, unsigned num_threads = 1); + virtual ~OrbTask() = default; + virtual int open(void* x = 0); + virtual int svc(); + virtual int close(u_long); - private: - CORBA::ORB_var orb_; - unsigned num_threads_; +private: + CORBA::ORB_var orb_; + unsigned num_threads_; }; #endif diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp index bf87b4a618e..e3a52473c9d 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file ClientTask.cpp @@ -18,12 +16,10 @@ ClientTask::ClientTask(Foo_ptr foo, { } - ClientTask::~ClientTask() { } - int ClientTask::open(void*) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.h b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.h index a8385e4d1d1..e361cc1c606 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file ClientTask.h @@ -17,20 +15,19 @@ class ClientTask : public ACE_Task_Base { - public: - - ClientTask(Foo_ptr foo, - Callback_ptr callback); +public: + ClientTask(Foo_ptr foo, + Callback_ptr callback); - virtual ~ClientTask(); + virtual ~ClientTask(); - virtual int open(void* x = 0); - virtual int svc(); - virtual int close(u_long); + virtual int open(void* x = 0); + virtual int svc(); + virtual int close(u_long); - private: - Foo_var foo_; - Callback_var callback_; +private: + Foo_var foo_; + Callback_var callback_; }; #endif diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp index 1e8b5944313..7b7fbdedde1 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.cpp @@ -12,24 +10,16 @@ #include "ace/CORBA_macros.h" #include "ace/OS_NS_unistd.h" - OrbShutdownTask::OrbShutdownTask() { } - -OrbShutdownTask::~OrbShutdownTask() -{ -} - - void OrbShutdownTask::orb(CORBA::ORB_ptr orb) { this->orb_ = CORBA::ORB::_duplicate (orb); } - int OrbShutdownTask::open(void*) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.h b/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.h index 6f0bd826751..704d3b37e0c 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.h @@ -14,24 +12,20 @@ #include "ace/Task.h" #include "tao/ORB.h" - class OrbShutdownTask : public ACE_Task_Base { - public: - - OrbShutdownTask(); - virtual ~OrbShutdownTask(); - - void orb(CORBA::ORB_ptr orb); - - virtual int open(void*); - virtual int svc(); - virtual int close(u_long); +public: + OrbShutdownTask(); + virtual ~OrbShutdownTask() = default; + void orb(CORBA::ORB_ptr orb); - private: + virtual int open(void*); + virtual int svc(); + virtual int close(u_long); - CORBA::ORB_var orb_; +private: + CORBA::ORB_var orb_; }; typedef ACE_Singleton<OrbShutdownTask, TAO_SYNCH_MUTEX> TheOrbShutdownTask; diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp index 85c0ef4d00d..c64376c9403 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file ClientTask.cpp @@ -23,12 +21,10 @@ ClientTask::ClientTask(CORBA::ORB_ptr orb, { } - ClientTask::~ClientTask() { } - int ClientTask::open(void*) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.h b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.h index ec19ef9a1bb..f92336b0c26 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file ClientTask.h @@ -17,26 +15,25 @@ class ClientTask : public ACE_Task_Base { - public: - - ClientTask(CORBA::ORB_ptr orb, - Foo_ptr foo, - Callback_ptr callback, - bool collocated = false); +public: + ClientTask(CORBA::ORB_ptr orb, + Foo_ptr foo, + Callback_ptr callback, + bool collocated = false); - virtual ~ClientTask(); + virtual ~ClientTask(); - virtual int open(void* x = 0); - virtual int svc(); - virtual int close(u_long); + virtual int open(void* x = 0); + virtual int svc(); + virtual int close(u_long); - private: - bool validate_connection (); +private: + bool validate_connection (); - CORBA::ORB_var orb_; - Foo_var foo_; - Callback_var callback_; - bool collocated_; + CORBA::ORB_var orb_; + Foo_var foo_; + Callback_var callback_; + bool collocated_; }; #endif diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp index 1e8b5944313..ee579c9e4c1 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.cpp @@ -12,24 +10,16 @@ #include "ace/CORBA_macros.h" #include "ace/OS_NS_unistd.h" - OrbShutdownTask::OrbShutdownTask() { } - -OrbShutdownTask::~OrbShutdownTask() -{ -} - - void OrbShutdownTask::orb(CORBA::ORB_ptr orb) { this->orb_ = CORBA::ORB::_duplicate (orb); } - int OrbShutdownTask::open(void*) { @@ -47,7 +37,6 @@ OrbShutdownTask::open(void*) return 0; } - int OrbShutdownTask::svc() { @@ -67,7 +56,6 @@ OrbShutdownTask::svc() return 0; } - int OrbShutdownTask::close(u_long) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.h b/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.h index 6f0bd826751..d0939b46191 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.h @@ -14,24 +12,21 @@ #include "ace/Task.h" #include "tao/ORB.h" - class OrbShutdownTask : public ACE_Task_Base { - public: - - OrbShutdownTask(); - virtual ~OrbShutdownTask(); - - void orb(CORBA::ORB_ptr orb); +public: + OrbShutdownTask(); + virtual ~OrbShutdownTask() = default; - virtual int open(void*); - virtual int svc(); - virtual int close(u_long); + void orb(CORBA::ORB_ptr orb); + virtual int open(void*); + virtual int svc(); + virtual int close(u_long); - private: - CORBA::ORB_var orb_; +private: + CORBA::ORB_var orb_; }; typedef ACE_Singleton<OrbShutdownTask, TAO_SYNCH_MUTEX> TheOrbShutdownTask; diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.cpp index 1b178b8f561..45d2074cbf3 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbTask.cpp @@ -12,7 +10,6 @@ namespace { enum { MAX_ORB_TASK_WORKER_THREADS = 20 }; } - OrbTask::OrbTask(CORBA::ORB_ptr orb, unsigned num_threads) : num_threads_(num_threads) { @@ -20,11 +17,6 @@ OrbTask::OrbTask(CORBA::ORB_ptr orb, unsigned num_threads) } -OrbTask::~OrbTask() -{ -} - - int OrbTask::open(void*) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.h b/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.h index 039da12da9f..e7d808302f2 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbTask.h @@ -16,20 +14,17 @@ class OrbTask : public ACE_Task_Base { - public: - - OrbTask(CORBA::ORB_ptr orb, unsigned num_threads = 1); - virtual ~OrbTask(); - - virtual int open(void* x = 0); - virtual int svc(); - virtual int close(u_long); - +public: + OrbTask(CORBA::ORB_ptr orb, unsigned num_threads = 1); + virtual ~OrbTask() = default; - private: + virtual int open(void* x = 0); + virtual int svc(); + virtual int close(u_long); - CORBA::ORB_var orb_; - unsigned num_threads_; +private: + CORBA::ORB_var orb_; + unsigned num_threads_; }; #endif diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp index 1e8b5944313..ee579c9e4c1 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp +++ b/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.cpp @@ -12,24 +10,16 @@ #include "ace/CORBA_macros.h" #include "ace/OS_NS_unistd.h" - OrbShutdownTask::OrbShutdownTask() { } - -OrbShutdownTask::~OrbShutdownTask() -{ -} - - void OrbShutdownTask::orb(CORBA::ORB_ptr orb) { this->orb_ = CORBA::ORB::_duplicate (orb); } - int OrbShutdownTask::open(void*) { @@ -47,7 +37,6 @@ OrbShutdownTask::open(void*) return 0; } - int OrbShutdownTask::svc() { @@ -67,7 +56,6 @@ OrbShutdownTask::svc() return 0; } - int OrbShutdownTask::close(u_long) { diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.h b/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.h index 6f0bd826751..704d3b37e0c 100644 --- a/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.h +++ b/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.h @@ -14,24 +12,20 @@ #include "ace/Task.h" #include "tao/ORB.h" - class OrbShutdownTask : public ACE_Task_Base { - public: - - OrbShutdownTask(); - virtual ~OrbShutdownTask(); - - void orb(CORBA::ORB_ptr orb); - - virtual int open(void*); - virtual int svc(); - virtual int close(u_long); +public: + OrbShutdownTask(); + virtual ~OrbShutdownTask() = default; + void orb(CORBA::ORB_ptr orb); - private: + virtual int open(void*); + virtual int svc(); + virtual int close(u_long); - CORBA::ORB_var orb_; +private: + CORBA::ORB_var orb_; }; typedef ACE_Singleton<OrbShutdownTask, TAO_SYNCH_MUTEX> TheOrbShutdownTask; diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp index 01cf271ab38..4ac44575a48 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp @@ -29,7 +29,7 @@ public: // int sleep_time); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp index 5c508a5d761..857c842cd0d 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp @@ -64,7 +64,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp index f4c54c08fff..c71fa10bf11 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp @@ -29,7 +29,7 @@ public: // int sleep_time); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp index 202ee9489a3..810c7326f99 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp @@ -64,7 +64,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp index d6e1f1ae4c3..625164d0927 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp @@ -32,7 +32,7 @@ public: // int sleep_time); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp index f28ae234f5d..4e2feec4fd5 100644 --- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp +++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp @@ -64,7 +64,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp index ae03fd9da69..d4caa0614df 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp @@ -71,7 +71,7 @@ public: virtual ~Client (void) {}; /// The thread entry point. - virtual int svc (void); + virtual int svc (); private: /// The server. diff --git a/TAO/examples/Quoter/client.h b/TAO/examples/Quoter/client.h index d5bae5c6332..9a58d890955 100644 --- a/TAO/examples/Quoter/client.h +++ b/TAO/examples/Quoter/client.h @@ -103,7 +103,7 @@ class Quoter_Task : public ACE_Task<ACE_SYNCH> public: Quoter_Task (int argc, ACE_TCHAR **argv); - virtual int svc (void); + virtual int svc (); private: Quoter_Client quoter_client; diff --git a/TAO/examples/RTCORBA/Activity/Builder.h b/TAO/examples/RTCORBA/Activity/Builder.h index 0af3a9fb16d..8b0db2a892f 100644 --- a/TAO/examples/RTCORBA/Activity/Builder.h +++ b/TAO/examples/RTCORBA/Activity/Builder.h @@ -40,7 +40,7 @@ class Builder : public ACE_Service_Object /// = Service_Object virtual method overloads. virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); /// = List access int poa_list (POA_LIST& poa_list); diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.h b/TAO/examples/RTCORBA/Activity/Thread_Task.h index 13563a579f6..1538a8acd0e 100644 --- a/TAO/examples/RTCORBA/Activity/Thread_Task.h +++ b/TAO/examples/RTCORBA/Activity/Thread_Task.h @@ -36,7 +36,7 @@ class Thread_Task : public Periodic_Task protected: /// task svc - virtual int svc (void); + virtual int svc (); }; #endif /* THREAD_TASK_H */ diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h index 59616b7a4fb..34a0323310d 100644 --- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h +++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.h @@ -37,7 +37,7 @@ class DT_Test :public ACE_Task <ACE_SYNCH> protected: /// task svc - virtual int svc (void); + virtual int svc (); diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/test.h b/TAO/examples/RTScheduling/MIF_Scheduler/test.h index 18b914937ce..f308c4df398 100644 --- a/TAO/examples/RTScheduling/MIF_Scheduler/test.h +++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.h @@ -30,7 +30,7 @@ class DT_Test //:public ACE_Task <ACE_SYNCH> /* protected: */ /* /// task svc */ -/* virtual int svc (void); */ +/* virtual int svc (); */ private: diff --git a/TAO/examples/RTScheduling/Thread_Task.h b/TAO/examples/RTScheduling/Thread_Task.h index d1ee2633609..0079d0e256e 100644 --- a/TAO/examples/RTScheduling/Thread_Task.h +++ b/TAO/examples/RTScheduling/Thread_Task.h @@ -40,7 +40,7 @@ class RTSCHEDTESTLIB_Export Thread_Task : public ACE_Task <ACE_SYNCH> protected: /// task svc - virtual int svc (void); + virtual int svc (); RTScheduling::Current_var current_; CORBA::Policy_var sched_param_; time_t start_time_; diff --git a/TAO/examples/Simple/time-date/Time_Date.h b/TAO/examples/Simple/time-date/Time_Date.h index c24a97e8215..fb63add9109 100644 --- a/TAO/examples/Simple/time-date/Time_Date.h +++ b/TAO/examples/Simple/time-date/Time_Date.h @@ -39,10 +39,10 @@ public: virtual int init (int argc, ACE_TCHAR *argv[]); /// Shutdown the @c TAO_ORB_Manager. - virtual int fini (void); + virtual int fini (); /// Concurrency hook. - virtual int svc (void); + virtual int svc (); public: /// ORB pseudo-reference. diff --git a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h index 855d3fd9477..acd6971f46e 100644 --- a/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h +++ b/TAO/orbsvcs/FT_Naming_Service/FT_Naming_Service.h @@ -38,7 +38,7 @@ public: virtual int init (int argc, ACE_TCHAR* argv[]); /// The opposite of init(). - virtual int fini (void); + virtual int fini (); /// Run the TAO_Naming_Service. virtual int run (void); diff --git a/TAO/orbsvcs/IFR_Service/be_extern.h b/TAO/orbsvcs/IFR_Service/be_extern.h index 220a1ae7c44..c28a7c0c15e 100644 --- a/TAO/orbsvcs/IFR_Service/be_extern.h +++ b/TAO/orbsvcs/IFR_Service/be_extern.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- /* COPYRIGHT diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h index a5714ebb4c1..8441aa9113d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h @@ -22,7 +22,7 @@ public: virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h index cacecdca50a..7ce65127d7b 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h @@ -49,7 +49,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 (); private: friend class ACE_Singleton<Activator_NT_Service, MUTEX>; }; diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h index d5b154f929c..8bcd258b37f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h @@ -21,7 +21,7 @@ public: virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, int argc, diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h index c1a34f39d3d..8c059afd95a 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h @@ -45,7 +45,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 (); private: friend class ACE_Singleton<Locator_NT_Service, MUTEX>; diff --git a/TAO/orbsvcs/ImplRepo_Service/Replicator.h b/TAO/orbsvcs/ImplRepo_Service/Replicator.h index e5384dd4dc4..b08775cb800 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Replicator.h +++ b/TAO/orbsvcs/ImplRepo_Service/Replicator.h @@ -79,7 +79,7 @@ public: virtual ~Replicator(void); - virtual int svc (void); + virtual int svc (); virtual int handle_exception (ACE_HANDLE ); void stop (void); diff --git a/TAO/orbsvcs/LoadBalancer/Signal_Handler.h b/TAO/orbsvcs/LoadBalancer/Signal_Handler.h index ffdd776b6b7..ea20382f8fc 100644 --- a/TAO/orbsvcs/LoadBalancer/Signal_Handler.h +++ b/TAO/orbsvcs/LoadBalancer/Signal_Handler.h @@ -47,7 +47,7 @@ public: PortableServer::POA_ptr poa); /// Run by a daemon thread to handle signals synchronously. - virtual int svc (void); + virtual int svc (); /// Active object activation method. /** diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h index a74ef0aaa6d..cfdfb3e55fe 100644 --- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h +++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h @@ -45,7 +45,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 (); /// Initialize the objects argc_ and argv_ attributes values. virtual int init (int argc, diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h index 9049c48766b..dfcf77754ce 100644 --- a/TAO/orbsvcs/Naming_Service/Naming_Service.h +++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h @@ -42,7 +42,7 @@ public: virtual int init (int argc, ACE_TCHAR* argv[]); /// The opposite of init(). - virtual int fini (void); + virtual int fini (); /// Run the TAO_Naming_Service. virtual int run (void); diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h index 6377ab63421..1548b5606ec 100644 --- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h +++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h @@ -46,7 +46,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 (); /// Initialize the objects argc_ and argv_ attributes values. virtual int init (int argc, diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.h b/TAO/orbsvcs/Notify_Service/Notify_Service.h index 3a1d7f95e72..486fdbd1e3f 100644 --- a/TAO/orbsvcs/Notify_Service/Notify_Service.h +++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h @@ -34,16 +34,16 @@ class TAO_Notify_Service_Driver; class LoggingWorker : public ACE_Task_Base { - public: - LoggingWorker (TAO_Notify_Service_Driver* ns); - virtual int svc (void); - void start (); - void end (); - private: - ACE_Reactor logging_reactor_; - TAO_Notify_Service_Driver* ns_; - bool started_; - long timer_id_; +public: + LoggingWorker (TAO_Notify_Service_Driver* ns); + virtual int svc (); + void start (); + void end (); +private: + ACE_Reactor logging_reactor_; + TAO_Notify_Service_Driver* ns_; + bool started_; + long timer_id_; }; /** @@ -62,7 +62,7 @@ public: void orb (CORBA::ORB_ptr orb); /// The thread entry point. - virtual int svc (void); + virtual int svc (); private: /// The orb @@ -97,7 +97,7 @@ public: /// Shutdown the Service. /// Returns 0 on success, -1 on error. - virtual int fini (void); + virtual int fini (); protected: /// initialize the ORB. diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h index 2cf2373b242..d4c87aa11b6 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h @@ -33,7 +33,7 @@ public: virtual int init (int argc, ACE_TCHAR *argv[]); // Allows the service configurator to shutdown the orb - virtual int fini (void); + virtual int fini (); // Not supported virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h index ee4d306caa7..8ca203d982c 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.h @@ -43,7 +43,7 @@ public: int parse_args (int argc, ACE_TCHAR *argv[]); /// The thread entry point. - virtual int svc (void); + virtual int svc (); protected: /// Create an RT POA with a single lane at the specified RT Priority. diff --git a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.h b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.h index f14f5f5ed2b..5fc0f0fcd70 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/ORB_Run_Task.h @@ -28,7 +28,7 @@ public: ~TAO_Notify_ORB_Run_Task (); /// The thread entry point. - virtual int svc (void); + virtual int svc (); private: /// ORB Objects. diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h index d3cadb14fee..c10aa42d931 100644 --- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h +++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.h @@ -40,7 +40,7 @@ public: int parse_args (int argc, ACE_TCHAR *argv[]); /// The thread entry point. - virtual int svc (void); + virtual int svc (); protected: /// Create an EC diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h index 75e6abe17a3..492ca513a76 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.h @@ -41,7 +41,7 @@ public: int parse_args (int argc, ACE_TCHAR *argv[]); /// The thread entry point. - virtual int svc (void); + virtual int svc (); /// Dump stats. void dump_stats (void); diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.h b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.h index f14f5f5ed2b..5fc0f0fcd70 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/ORB_Run_Task.h @@ -28,7 +28,7 @@ public: ~TAO_Notify_ORB_Run_Task (); /// The thread entry point. - virtual int svc (void); + virtual int svc (); private: /// ORB Objects. diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h index 94b677193c6..a8124b09e5c 100644 --- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h +++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.h @@ -39,7 +39,7 @@ public: int parse_args (int argc, ACE_TCHAR *argv[]); /// The thread entry point. - virtual int svc (void); + virtual int svc (); protected: /// Create an EC diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h index 51ef58e254e..693e026a7a2 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h @@ -43,7 +43,7 @@ public: /// Called by the Service Configurator framework to remove the /// Event Service. Defined in <ace/Service_Config.h> - virtual int fini (void); + virtual int fini (); /// This function call initializes the Concurrency Service given a /// reference to the ORB and the command line parameters. diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h index ec12e35c7ff..84403d50e75 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h @@ -54,7 +54,7 @@ public: // = The Service_Object entry points virtual int init (int argc, ACE_TCHAR* argv[]); - virtual int fini (void); + virtual int fini (); // = The CEC_Factory methods virtual TAO_CEC_Dispatching* diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h index e1cbff169a7..5561bbca026 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h @@ -47,7 +47,7 @@ public: TAO_CEC_Dispatching_Task (ACE_Thread_Manager* thr_manager = 0); /// Process the events in the queue. - virtual int svc (void); + virtual int svc (); virtual void push (TAO_CEC_ProxyPushSupplier *proxy, CORBA::Any& event); diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h index 13444dc750a..f4019a5c167 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h @@ -48,7 +48,7 @@ public: * @name Derived from ACE_Service_Object */ virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); //@} //@{ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h index 43404454e53..11dc877cd2a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.h @@ -45,7 +45,7 @@ public: // = The Service_Object entry points virtual int init (int argc, ACE_TCHAR* argv[]); - virtual int fini (void); + virtual int fini (); // = The EC_Factory methods virtual TAO_EC_Dispatching* diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h index c6b46663e7b..d643250f735 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.h @@ -45,7 +45,7 @@ public: // Decorated methods... virtual int init (int argc, ACE_TCHAR* argv[]); - virtual int fini (void); + virtual int fini (); virtual TAO_EC_Dispatching* create_dispatching (TAO_EC_Event_Channel_Base*); virtual void @@ -94,9 +94,9 @@ public: create_proxy_push_supplier_collection (TAO_EC_Event_Channel_Base*); virtual void destroy_proxy_push_supplier_collection (TAO_EC_ProxyPushSupplier_Collection*); - virtual ACE_Lock* create_consumer_lock (void); + virtual ACE_Lock* create_consumer_lock (); virtual void destroy_consumer_lock (ACE_Lock*); - virtual ACE_Lock* create_supplier_lock (void); + virtual ACE_Lock* create_supplier_lock (); virtual void destroy_supplier_lock (ACE_Lock*); virtual TAO_EC_ConsumerControl* create_consumer_control (TAO_EC_Event_Channel_Base*); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h index 27c71fcd87d..c2968bd2821 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.h @@ -40,7 +40,7 @@ public: // = The Service_Object entry points virtual int init (int argc, ACE_TCHAR* argv[]); - virtual int fini (void); + virtual int fini (); // = The EC_Factory methods virtual TAO_EC_Dispatching* diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h index f6ff0028ff1..9ffd20d4a17 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h @@ -48,7 +48,7 @@ public: PortableServer::POA_ptr poa() { return poa_.in(); } CORBA::ORB_ptr orb() { return orb_.in();} private: - virtual int svc (void); + virtual int svc (); CORBA::ORB_var orb_; PortableServer::POA_var root_poa_; PortableServer::POA_var poa_; diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h index 6cdb867f44a..a7e4893d49e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h @@ -48,7 +48,7 @@ protected: public: // ctor ReactorTask(); - virtual int svc (void); + virtual int svc (); ACE_Reactor reactor_; }; diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp index 278cae08786..dc935b3e89e 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #include "orbsvcs/Log_Macros.h" #include "orbsvcs/Log_Macros.h" #include "orbsvcs/HTIOP/HTIOP_Acceptor.h" diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h index 7d78bb653ea..e887ac94801 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h @@ -82,7 +82,7 @@ namespace TAO /// Only used when the handler is turned into an active object by /// calling <activate>. This serves as the event loop in such cases. - virtual int svc (void); + virtual int svc (); #endif /* 0 */ //@{ diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp index 5d17a0de8d2..624829ef98d 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.cpp @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #include "orbsvcs/Log_Macros.h" #include "orbsvcs/Log_Macros.h" #include "orbsvcs/HTIOP/HTIOP_Profile.h" diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h index 84938c8c2eb..de362c0991a 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h @@ -43,7 +43,7 @@ public: // Called by the Service Configurator framework to remove the // Event Service. Defined in <ace/Service_Config.h> - virtual int fini (void); + virtual int fini (); // This function call initializes the IFR Service given a reference to the // ORB and the command line parameters. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h index e21f4aa30cc..1786f209790 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h @@ -44,7 +44,7 @@ public: virtual int init (int argc, ACE_TCHAR *argv[]); /// Terminates object when dynamic unlinking occurs. - virtual int fini (void); + virtual int fini (); protected: /// Register the LB_ClientComponent's ORBInitializer. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h index 0e1b4ec591c..1212d11d11d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h @@ -45,7 +45,7 @@ public: virtual int init (int argc, ACE_TCHAR *argv[]); /// Terminates object when dynamic unlinking occurs. - virtual int fini (void); + virtual int fini (); protected: diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h index b527dae317e..c49ca438234 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h @@ -47,7 +47,7 @@ public: TAO_LB_LoadManager (int ping_timeout, int ping_interval); - virtual int svc (void); + virtual int svc (); /** * @name CosLoadBalancing::LoadManager Methods diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h index b812777263b..d27ce41225c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Replication_Manager.h @@ -72,7 +72,7 @@ public: virtual ~TAO_FT_Naming_Replication_Manager(void); - virtual int svc (void); + virtual int svc (); virtual int handle_exception (ACE_HANDLE ); void stop (void); diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h index 791a0fed973..fe6358773f2 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.h @@ -127,7 +127,7 @@ public: /// Destroy the child POAs created in @c init_with_orb, /// @c init_naming_manager_with_orb, and /// @c init_replication_manager_with_orb - virtual int fini (void); + virtual int fini (); /// Destructor. virtual ~TAO_FT_Naming_Server (void); diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h index a3f78e6f5a1..131eb19f4a6 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h @@ -44,7 +44,7 @@ public: /// Called by the Service Configurator framework to remove the /// Event Service. Defined in <ace/Service_Config.h> - virtual int fini (void); + virtual int fini (); /// This function call initializes the Naming Service given a reference to the /// ORB and the command line parameters. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h index 8ca13ba9870..860828f8187 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.h @@ -125,7 +125,7 @@ public: virtual int init_with_orb (int argc, ACE_TCHAR *argv [], CORBA::ORB_ptr orb); /// Destroy the child POA created in @c init_with_orb - virtual int fini (void); + virtual int fini (); /// Destructor. virtual ~TAO_Naming_Server (void); diff --git a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h index aa5c73a5f16..f1c0781b4c8 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h +++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h @@ -44,7 +44,7 @@ public: /// Init the service from driver virtual void init_service (CORBA::ORB_ptr orb); - virtual int fini (void); + virtual int fini (); /// separate dispatching orb init virtual void init_service2 (CORBA::ORB_ptr orb, CORBA::ORB_ptr dispatching_orb); diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h index c57f50caac8..60c9758d246 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h @@ -25,7 +25,7 @@ public: TAO_MonitorManager (void); virtual int init (int argc, ACE_TCHAR* argv[]); - virtual int fini (void); + virtual int fini (); /// Start the ORB task which includes initializtion of the ORB, /// creation of the monitor servant and activation. @@ -44,7 +44,7 @@ private: { public: ORBTask (void); - virtual int svc (void); + virtual int svc (); TAO_SYNCH_MUTEX mutex_; ACE_ARGV_T<ACE_TCHAR> argv_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h index c556b0dd5e7..58fe638e208 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h @@ -75,7 +75,7 @@ public: protected: /// Task svc - virtual int svc (void); + virtual int svc (); private: /// Release diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h index 7c243fea89c..62739cd5965 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Client_Task.h @@ -55,7 +55,7 @@ public: /// destructor... virtual ~TAO_Notify_validate_client_Task (void); - virtual int svc (void); + virtual int svc (); void shutdown (void); diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h index 6006017b4be..a3a5c9c7ca1 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h @@ -44,7 +44,7 @@ public: /// Called by the Service Configurator framework to remove the /// Event Service. Defined in <ace/Service_Config.h> - virtual int fini (void); + virtual int fini (); /// Run the Trading Service int run (void); diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.h b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.h index b188a5f28f6..6530743b310 100644 --- a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.h +++ b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.h @@ -13,7 +13,7 @@ class ORB_Task : public ACE_Task_Base public: ORB_Task(CORBA::ORB_ptr orb); - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h index b7c07a2a268..b273a714725 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h @@ -80,7 +80,7 @@ public: virtual void disconnect_push_supplier (void); /// Active method - virtual int svc (void); + virtual int svc (); private: /// The supplier. diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h index 920ee50a08a..2db23e8c8a3 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.h +++ b/TAO/orbsvcs/tests/Event/Basic/Random.h @@ -95,7 +95,7 @@ public: virtual void disconnect_push_supplier (void); /// Active method - virtual int svc (void); + virtual int svc (); private: /// The supplier. diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h index 4fa08d3a766..9db3874b338 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.h +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h @@ -156,7 +156,7 @@ public: ACE_Thread_Manager* thr_mgr = 0); /// The svc call - virtual int svc (void); + virtual int svc (); private: /// The supplier diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h index 70996d7c2af..f6a3779ea06 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h @@ -36,7 +36,7 @@ private: public: // ctor ReactorTask(ACE_Event_Handler* handler) : reactor_(0), handler_(handler){} - virtual int svc (void); + virtual int svc (); // The thread entry point. ACE_Reactor* reactor_; diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp index 4d9b5e0e3ed..a1cf40b7a2c 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp @@ -76,7 +76,7 @@ public: Client (A::AMI_Test_ptr server, int niterations); /// The thread entry point. - virtual int svc (void); + virtual int svc (); // private: /// Var for the AMI_Test object. diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.h b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.h index e249384b599..fefc0c8d68e 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.h +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.h @@ -13,7 +13,7 @@ class ORB_Task : public ACE_Task_Base public: ORB_Task (CORBA::ORB_ptr orb); - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h index ffea58af84d..3914607b1bf 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h +++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h @@ -58,7 +58,7 @@ public: virtual int init (int argc, ACE_TCHAR *argv []); /// The thread entry point. - virtual int svc (void); + virtual int svc (); private: /// Supplier diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h index 4a52e9f0384..51d3cb05875 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h +++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h @@ -20,9 +20,9 @@ public: virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); - virtual int svc (void); + virtual int svc (); private: auto_ptr < ACE_Thread_Barrier > ma_barrier_; diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp index 72ff4e07736..b07fb059aa8 100644 --- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp @@ -18,7 +18,7 @@ int EVENTS_EXPECTED_TO_RECEIVE = 9*4; // 2 consumers get the same events from 2 #define DOMAIN_NAME "*" #define TYPE_NAME "*" - ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> g_result_count = 0; +ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> g_result_count = 0; FilterClient::FilterClient (void) :consumer_1 (0), diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.h b/TAO/orbsvcs/tests/Notify/lib/Command.h index 6b5ce7b68fc..7321fa1a190 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command.h @@ -63,7 +63,7 @@ protected: private: /// Execute the command. - void execute (void); + void execute (); /// Save the next command to exec. void next (TAO_Notify_Tests_Command* command); diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h index 0a808080a62..728ef7ec277 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h @@ -35,20 +35,20 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Command_Builder : public ACE_Servi { public: /// Constructor - TAO_Notify_Tests_Command_Builder (void); + TAO_Notify_Tests_Command_Builder (); /// Destructor ~TAO_Notify_Tests_Command_Builder (); /// = Service_Object virtual method overloads. virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); /// Register the factory against the name of the factory. void _register (ACE_CString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory); /// Execute the <start_command_>. - void execute (void); + void execute (); protected: /// The starting command. each command executes the next one when done. diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h index 4a36c2364ff..6c2c7fd18e0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h @@ -41,7 +41,7 @@ public: /// = Service_Object virtual method overloads. virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); /// Create the <COMMAND> command. TAO_Notify_Tests_Command* create (void); diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h index 51400d8712f..054eba9e8f9 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.h +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h @@ -39,7 +39,7 @@ public: /// Set the command builder. void command_builder (TAO_Notify_Tests_Command_Builder* cmd_builder); - virtual int svc (void); + virtual int svc (); // The thread entry point. void shutdown (void); @@ -67,7 +67,7 @@ public: /// Srt the run period. void run_period (ACE_Time_Value run_period); - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h index 87e51a72053..77000e7abd5 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h @@ -48,7 +48,7 @@ public: virtual int activate_task (ACE_Barrier* barrier); /// task svc - virtual int svc (void); + virtual int svc (); /// Dump stats. void dump_stats (ACE_TCHAR* msg, int dump_samples); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h index 4d87bcd627e..7579b33c5c1 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h @@ -47,7 +47,7 @@ public: void orb (CORBA::ORB_ptr orb); /// The thread entry point. - virtual int svc (void); + virtual int svc (); // Shutdown ORB void done (void); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h index 8eabd5dd28b..3608ad848c4 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h @@ -41,7 +41,7 @@ public: void orb (CORBA::ORB_ptr orb); /// The thread entry point. - virtual int svc (void); + virtual int svc (); int done_; @@ -103,7 +103,7 @@ public: virtual ~Throughput_StructuredPushSupplier (); // = The ACE_Task_Base methods.... - virtual int svc (void); + virtual int svc (); /// Accumulate the throughput statistics into <throughput> void accumulate_into (ACE_Throughput_Stats &throughput) const; diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h index e1d38a43ec4..cb0856a959a 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h @@ -36,7 +36,7 @@ public: Client_Worker (Simple_Server_ptr server, int niterations); /// thread entry point - virtual int svc (void); + virtual int svc (); private: /// Validate the connection diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.h index 6274c961da8..8094a5cc390 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.h +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.h @@ -36,7 +36,7 @@ public: Server_Worker (CORBA::ORB_ptr orb); /// The thread entry point. - virtual int svc (void); + virtual int svc (); private: diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h index d121c34476d..af5644efc9e 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h @@ -38,7 +38,7 @@ public: int niterations); /// thread entry point - virtual int svc (void); + virtual int svc (); private: /// Validate the connection diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.h index 6274c961da8..8094a5cc390 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.h +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.h @@ -36,7 +36,7 @@ public: Server_Worker (CORBA::ORB_ptr orb); /// The thread entry point. - virtual int svc (void); + virtual int svc (); private: diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h index ea5d000fa7e..5d130b9aa5c 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h @@ -73,7 +73,7 @@ public: virtual int execute (TAO_Naming_Client &root_context); /// This code is executed by each thread. - virtual int svc (void); + virtual int svc (); private: /// Number of threads to spawn. By default is set to 10. diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h index 04167ac8382..2c3189ce019 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.h +++ b/TAO/orbsvcs/tests/Simple_Naming/client.h @@ -81,7 +81,7 @@ public: virtual int execute (TAO_Naming_Client &root_context); /// This code is executed by each thread. - virtual int svc (void); + virtual int svc (); private: /// Number of threads to spawn. By default is set to 10. diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h index 8914549880c..75c8e5a09ee 100644 --- a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h +++ b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file ClientApp.h @@ -15,47 +13,41 @@ #include "tao/ORB.h" #include "ace/SString.h" - class ClientApp : public TestAppBase { - public: - - ClientApp(); - virtual ~ClientApp(); - - - protected: - - virtual int run_i(int argc, ACE_TCHAR* argv[]); - - - private: - - // These are all called, in order, by the run_i() method. - int init(int argc, ACE_TCHAR* argv[]); - void client_setup(void); - int run_engine(void); - void cleanup(); - - // Helper methods used by the methods above. - int parse_args(int argc, ACE_TCHAR* argv[]); - - int set_arg(unsigned& value, - const ACE_TCHAR* arg, - char opt, - const char* name, - int min = 0); - - void usage_statement(); - int arg_dependency_checks(); - - - CORBA::ORB_var orb_; - ACE_TString exe_name_; - ACE_TString ior_; - ClientEngine_Handle engine_; - unsigned client_id_; - unsigned num_loops_; +public: + ClientApp(); + virtual ~ClientApp(); + +protected: + virtual int run_i(int argc, ACE_TCHAR* argv[]); + +private: + // These are all called, in order, by the run_i() method. + int init(int argc, ACE_TCHAR* argv[]); + void client_setup(void); + int run_engine(void); + void cleanup(); + + // Helper methods used by the methods above. + int parse_args(int argc, ACE_TCHAR* argv[]); + + int set_arg(unsigned& value, + const ACE_TCHAR* arg, + char opt, + const char* name, + int min = 0); + + void usage_statement(); + int arg_dependency_checks(); + + + CORBA::ORB_var orb_; + ACE_TString exe_name_; + ACE_TString ior_; + ClientEngine_Handle engine_; + unsigned client_id_; + unsigned num_loops_; }; #endif diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h index 23a617750be..455ace71f21 100644 --- a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h +++ b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file ServerApp.h @@ -18,75 +16,67 @@ #include "tao/CSD_ThreadPool/CSD_TP_Strategy.h" #include "ace/SString.h" - class ServerApp : public TestAppBase { - public: - - ServerApp(); - virtual ~ServerApp(); - - - protected: - - virtual int run_i(int argc, ACE_TCHAR* argv[]); - - - private: - - // These are all called, in order, by the run_i() method. - int init(int argc, ACE_TCHAR* argv[]); - void poa_setup(void); - void csd_setup(void); - void servant_setup(void); - void collocated_setup(); - void poa_activate(void); - void run_collocated_clients(void); - void run_orb_event_loop(void); - bool check_results(); - void cleanup(); - - - // Helper methods used by the methods above. - int parse_args(int argc, ACE_TCHAR* argv[]); - - int set_arg(unsigned& value, - const ACE_TCHAR* arg, - char opt, - const char* name, - int min = 0); - - void usage_statement(); - int arg_dependency_checks(); - - - PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb, - const char* poa_name); - - typedef ServantList<Foo_i> ServantListType; - - CORBA::ORB_var orb_; - PortableServer::POA_var poa_; - TAO::CSD::TP_Strategy_Handle tp_strategy_; - - ServantListType servants_; - - ClientTask collocated_client_task_; - - ACE_TString exe_name_; - ACE_TString ior_filename_prefix_; - unsigned num_servants_; - unsigned num_csd_threads_; - unsigned num_orb_threads_; - unsigned num_remote_clients_; - unsigned num_collocated_clients_; - unsigned num_loops_; - unsigned use_csd_; - - ACE_CString scenario_id_; - unsigned trial_id_; - - Foo_Statistics stats_; +public: + ServerApp(); + virtual ~ServerApp(); + +protected: + virtual int run_i(int argc, ACE_TCHAR* argv[]); + +private: + // These are all called, in order, by the run_i() method. + int init(int argc, ACE_TCHAR* argv[]); + void poa_setup(void); + void csd_setup(void); + void servant_setup(void); + void collocated_setup(); + void poa_activate(void); + void run_collocated_clients(void); + void run_orb_event_loop(void); + bool check_results(); + void cleanup(); + + // Helper methods used by the methods above. + int parse_args(int argc, ACE_TCHAR* argv[]); + + int set_arg(unsigned& value, + const ACE_TCHAR* arg, + char opt, + const char* name, + int min = 0); + + void usage_statement(); + int arg_dependency_checks(); + + PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb, + const char* poa_name); + + typedef ServantList<Foo_i> ServantListType; + + CORBA::ORB_var orb_; + PortableServer::POA_var poa_; + TAO::CSD::TP_Strategy_Handle tp_strategy_; + + ServantListType servants_; + + ClientTask collocated_client_task_; + + ACE_TString exe_name_; + ACE_TString ior_filename_prefix_; + unsigned num_servants_; + unsigned num_csd_threads_; + unsigned num_orb_threads_; + unsigned num_remote_clients_; + unsigned num_collocated_clients_; + unsigned num_loops_; + unsigned use_csd_; + + ACE_CString scenario_id_; + unsigned trial_id_; + + Foo_Statistics stats_; }; #endif diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h b/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h index 492f680bd22..42d19f1090a 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file ClientEngine.h @@ -18,19 +16,16 @@ #include "ace/Synch.h" #include "ace/CORBA_macros.h" - class ClientEngine; typedef TAO_Intrusive_Ref_Count_Handle<ClientEngine> ClientEngine_Handle; - class CSD_PT_TestInf_Export ClientEngine : public TAO_Intrusive_Ref_Count_Base<TAO_SYNCH_MUTEX> { - public: - - ClientEngine(); - virtual ~ClientEngine(); +public: + ClientEngine(); + virtual ~ClientEngine(); - virtual bool execute(unsigned num_loops) = 0; + virtual bool execute(unsigned num_loops) = 0; }; #endif diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp index 5141f3eede0..ebe2b95e756 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp +++ b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - #include "ClientTask.h" #include "tao/Exception.h" #include "ace/SString.h" diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.h b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.h index 2cfb52cbde2..0cdb53fbafd 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file ClientTask.h @@ -17,31 +15,28 @@ #include "ace/Vector_T.h" #include "ace/Synch.h" - class CSD_PT_TestInf_Export ClientTask : public ACE_Task_Base { - public: - - ClientTask(); - virtual ~ClientTask(); - - void add_engine(ClientEngine* engine); - void num_loops(unsigned num_loops); +public: + ClientTask(); + virtual ~ClientTask(); - virtual int open(void* arg = 0); - virtual int svc(); - virtual int close(u_long); + void add_engine(ClientEngine* engine); + void num_loops(unsigned num_loops); - unsigned failure_count() const; + virtual int open(void* arg = 0); + virtual int svc(); + virtual int close(u_long); + unsigned failure_count() const; - private: - typedef ACE_Vector<ClientEngine_Handle> EngineVector; +private: + typedef ACE_Vector<ClientEngine_Handle> EngineVector; - TAO_SYNCH_MUTEX lock_; - EngineVector engines_; - unsigned failure_count_; - unsigned num_loops_; + TAO_SYNCH_MUTEX lock_; + EngineVector engines_; + unsigned failure_count_; + unsigned num_loops_; }; #endif diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h index eab4b7b7013..12847b0a9de 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h @@ -6,18 +6,15 @@ class CSD_PT_TestInf_Export OrbRunner { - public: +public: + OrbRunner(CORBA::ORB_ptr orb, unsigned num_orb_threads = 1); + virtual ~OrbRunner(); - OrbRunner(CORBA::ORB_ptr orb, unsigned num_orb_threads = 1); - virtual ~OrbRunner(); + void run(); - void run(void); - - - private: - - CORBA::ORB_var orb_; - unsigned num_orb_threads_; +private: + CORBA::ORB_var orb_; + unsigned num_orb_threads_; }; #endif diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.cpp index e0932bd4c38..e97050db4a0 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.cpp +++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.cpp @@ -12,24 +10,16 @@ #include "ace/CORBA_macros.h" #include "ace/OS_NS_unistd.h" - OrbShutdownTask::OrbShutdownTask() { } - -OrbShutdownTask::~OrbShutdownTask() -{ -} - - void OrbShutdownTask::orb(CORBA::ORB_ptr orb) { this->orb_ = CORBA::ORB::_duplicate(orb); } - int OrbShutdownTask::open(void*) { diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.h b/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.h index b42abe6f910..c07fa9c1355 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.h @@ -15,24 +13,20 @@ #include "ace/Task.h" #include "tao/ORB.h" - class CSD_PT_TestInf_Export OrbShutdownTask : public ACE_Task_Base { - public: - - OrbShutdownTask(); - virtual ~OrbShutdownTask(); - - void orb(CORBA::ORB_ptr orb); - - virtual int open(void*); - virtual int svc(); - virtual int close(u_long); +public: + OrbShutdownTask(); + virtual ~OrbShutdownTask() = default; + void orb(CORBA::ORB_ptr orb); - private: + virtual int open(void*); + virtual int svc(); + virtual int close(u_long); - CORBA::ORB_var orb_; +private: + CORBA::ORB_var orb_; }; #endif diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.cpp index cc48ab3ef5c..5dc1b8901c5 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.cpp +++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbTask.cpp @@ -12,19 +10,12 @@ namespace { enum { MAX_ORB_TASK_WORKER_THREADS = 20 }; } - OrbTask::OrbTask(CORBA::ORB_ptr orb, unsigned num_threads) : orb_(CORBA::ORB::_duplicate(orb)), num_threads_(num_threads) { } - -OrbTask::~OrbTask() -{ -} - - int OrbTask::open(void*) { diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.h b/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.h index c81e4212793..104ac15ca69 100644 --- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.h +++ b/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbTask.h @@ -15,23 +13,19 @@ #include "ace/Task.h" #include "tao/ORB.h" - class CSD_PT_TestInf_Export OrbTask : public ACE_Task_Base { - public: - - OrbTask(CORBA::ORB_ptr orb, unsigned num_threads = 1); - virtual ~OrbTask(); - - virtual int open(void*); - virtual int svc(); - virtual int close(u_long); - +public: + OrbTask(CORBA::ORB_ptr orb, unsigned num_threads = 1); + virtual ~OrbTask() = default; - private: + virtual int open(void*); + virtual int svc(); + virtual int close(u_long); - CORBA::ORB_var orb_; - unsigned num_threads_; +private: + CORBA::ORB_var orb_; + unsigned num_threads_; }; #endif diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h index 233c9f7bcdf..07f5e9fcaca 100644 --- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h +++ b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_ClientEngine.h @@ -17,23 +15,19 @@ class Foo_Statistics; - class CSD_PT_TestServant_Export Foo_ClientEngine : public ClientEngine { - public: - - Foo_ClientEngine(Foo_ptr obj, unsigned client_id = 0); - virtual ~Foo_ClientEngine(); - - virtual bool execute(unsigned num_loops); - - static void expected_results(Foo_Statistics& stats); +public: + Foo_ClientEngine(Foo_ptr obj, unsigned client_id = 0); + virtual ~Foo_ClientEngine(); + virtual bool execute(unsigned num_loops); - private: + static void expected_results(Foo_Statistics& stats); - Foo_var obj_; - unsigned client_id_; +private: + Foo_var obj_; + unsigned client_id_; }; #endif diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h index 0c2cf288240..72e6a106a17 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.h @@ -41,7 +41,7 @@ public: u_int task_id); /// Active Object entry point. - virtual int svc (void); + virtual int svc (); /// Gets the ior of the cubit servant in this task. char* get_servant_ior (u_int index); diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h index 67d58aec398..818ccc448f5 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h @@ -252,7 +252,7 @@ public: ~Client (void); /// The thread function. - virtual int svc (void); + virtual int svc (); /// Returns the latency of the high priority thread in usecs. ACE_timer_t get_high_priority_latency (void); diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h index 15448fc7f99..e71393dd7a8 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Util_Thread.h @@ -29,7 +29,7 @@ public: ACE_Thread_Manager *thr_mgr); /// The thread entry point function. - virtual int svc (void); + virtual int svc (); /// Gets the number of computations the thread was able to perform. u_long get_number_of_computations (void); diff --git a/TAO/performance-tests/Latency/AMI/Server_Task.h b/TAO/performance-tests/Latency/AMI/Server_Task.h index cfc9d76bc37..bd12b2c757a 100644 --- a/TAO/performance-tests/Latency/AMI/Server_Task.h +++ b/TAO/performance-tests/Latency/AMI/Server_Task.h @@ -17,7 +17,7 @@ public: Server_Task (CORBA::ORB_ptr orb); /// The thread entry point - virtual int svc (void); + virtual int svc (); private: /// Keep a reference to the ORB diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h index 07a0fbaf7b1..5848a4a8771 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h @@ -22,7 +22,7 @@ public: ACE_High_Res_Timer::global_scale_factor_type gsf); /// The service method - virtual int svc (void); + virtual int svc (); private: /// Make sure that the current thread has a connection available. diff --git a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h index 07a0fbaf7b1..5848a4a8771 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h +++ b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h @@ -22,7 +22,7 @@ public: ACE_High_Res_Timer::global_scale_factor_type gsf); /// The service method - virtual int svc (void); + virtual int svc (); private: /// Make sure that the current thread has a connection available. diff --git a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.h b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.h index 394be338714..5375d260165 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.h +++ b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.h @@ -14,7 +14,7 @@ public: Worker_Thread (CORBA::ORB_ptr orb); // = The service method - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp index 3466ec9ced1..2dab4dd836c 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp @@ -39,7 +39,7 @@ public: // Accumulate the throughput statistics into <throughput> // = The ACE_Task_Base methods.... - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_ptr orb_; diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp index cbca89d0e78..958b597b92b 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp @@ -24,7 +24,7 @@ public: // Set the test attributes. // = The ACE_Task_Base methods.... - virtual int svc (void); + virtual int svc (); private: Test_i *server_; diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp index 3f499bffaba..a0046475528 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp @@ -38,7 +38,7 @@ public: // Output the accumulated statistics. // = The ACE_Task_Base methods.... - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_ptr orb_; diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.h b/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.h index cfc9d76bc37..bd12b2c757a 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.h +++ b/TAO/performance-tests/Sequence_Latency/AMI/Server_Task.h @@ -17,7 +17,7 @@ public: Server_Task (CORBA::ORB_ptr orb); /// The thread entry point - virtual int svc (void); + virtual int svc (); private: /// Keep a reference to the ORB diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h index 79f1c7eb6e3..0bd8f60bd15 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Client_Task.h @@ -24,7 +24,7 @@ public: ACE_High_Res_Timer::global_scale_factor_type gsf); /// The service method - virtual int svc (void); + virtual int svc (); private: /// Make sure that the current thread has a connection available. diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h index 79f1c7eb6e3..0bd8f60bd15 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Client_Task.h @@ -24,7 +24,7 @@ public: ACE_High_Res_Timer::global_scale_factor_type gsf); /// The service method - virtual int svc (void); + virtual int svc (); private: /// Make sure that the current thread has a connection available. diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.h b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.h index 8c7084b5d82..c6d03785ebe 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.h +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Worker_Thread.h @@ -13,7 +13,7 @@ public: Worker_Thread (CORBA::ORB_ptr orb); // = The service method - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Impl_T.h index c69f916df91..6b36a5289de 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Any_Impl_T.h @@ -8,7 +6,6 @@ */ //============================================================================= - #ifndef TAO_ANY_IMPL_T_H #define TAO_ANY_IMPL_T_H diff --git a/TAO/tao/Arg_Traits_T.h b/TAO/tao/Arg_Traits_T.h index ed00da7c20b..2afeb183490 100644 --- a/TAO/tao/Arg_Traits_T.h +++ b/TAO/tao/Arg_Traits_T.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Arg_Traits_T.h diff --git a/TAO/tao/Codeset/Codeset_Manager_i.h b/TAO/tao/Codeset/Codeset_Manager_i.h index 4d801b97c85..1daa14d8fab 100644 --- a/TAO/tao/Codeset/Codeset_Manager_i.h +++ b/TAO/tao/Codeset/Codeset_Manager_i.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //====================================================================== /* * @file Codeset_Manager_i.h diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h index 9ecb3b3abb5..b824cacc50d 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Asynch_Reply_Dispatcher.h @@ -9,7 +7,6 @@ */ //============================================================================= - #ifndef TAO_ASYNCH_REPLY_DISPATCHER_H #define TAO_ASYNCH_REPLY_DISPATCHER_H #include /**/ "ace/pre.h" diff --git a/TAO/tao/Parser_Registry.h b/TAO/tao/Parser_Registry.h index 91c355f9bf0..10495530423 100644 --- a/TAO/tao/Parser_Registry.h +++ b/TAO/tao/Parser_Registry.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Parser_Registry.h @@ -9,7 +7,6 @@ */ //============================================================================= - #ifndef TAO_PARSER_REGISTRY_H #define TAO_PARSER_REGISTRY_H @@ -25,7 +22,6 @@ #include "ace/os_include/os_stddef.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward declarations. diff --git a/TAO/tao/RTScheduling/Current.h b/TAO/tao/RTScheduling/Current.h index df68b4994fd..f018140c012 100644 --- a/TAO/tao/RTScheduling/Current.h +++ b/TAO/tao/RTScheduling/Current.h @@ -313,7 +313,7 @@ public: int activate_task (RTCORBA::Priority base_priority, CORBA::ULong stack_size); - virtual int svc (void); + virtual int svc (); private: TAO_ORB_Core* orb_; diff --git a/TAO/tao/Strategies/COIOP_Acceptor.cpp b/TAO/tao/Strategies/COIOP_Acceptor.cpp index 9806ee84272..776b0005090 100644 --- a/TAO/tao/Strategies/COIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/COIOP_Acceptor.cpp @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #include "tao/Strategies/COIOP_Acceptor.h" #if defined (TAO_HAS_COIOP) && (TAO_HAS_COIOP != 0) diff --git a/TAO/tao/Strategies/COIOP_Connector.cpp b/TAO/tao/Strategies/COIOP_Connector.cpp index ce03957681a..a56d1b804c7 100644 --- a/TAO/tao/Strategies/COIOP_Connector.cpp +++ b/TAO/tao/Strategies/COIOP_Connector.cpp @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #include "tao/Strategies/COIOP_Connector.h" #if defined (TAO_HAS_COIOP) && (TAO_HAS_COIOP != 0) diff --git a/TAO/tao/Strategies/COIOP_Endpoint.cpp b/TAO/tao/Strategies/COIOP_Endpoint.cpp index 1c51cc45226..18290090a03 100644 --- a/TAO/tao/Strategies/COIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/COIOP_Endpoint.cpp @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #include "tao/Strategies/COIOP_Endpoint.h" #if defined (TAO_HAS_COIOP) && (TAO_HAS_COIOP != 0) diff --git a/TAO/tao/Strategies/DIOP_Acceptor.cpp b/TAO/tao/Strategies/DIOP_Acceptor.cpp index 39574a53fbe..7416b3b24f7 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.cpp +++ b/TAO/tao/Strategies/DIOP_Acceptor.cpp @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #include "tao/Strategies/DIOP_Acceptor.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) diff --git a/TAO/tao/Strategies/DIOP_Connector.cpp b/TAO/tao/Strategies/DIOP_Connector.cpp index 236bb65d1d2..80545ddae9f 100644 --- a/TAO/tao/Strategies/DIOP_Connector.cpp +++ b/TAO/tao/Strategies/DIOP_Connector.cpp @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #include "tao/Strategies/DIOP_Connector.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) diff --git a/TAO/tao/Strategies/DIOP_Endpoint.cpp b/TAO/tao/Strategies/DIOP_Endpoint.cpp index d21c854a17b..e22a32fc888 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.cpp +++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #include "tao/Strategies/DIOP_Endpoint.h" #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0) diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h index c4843c74f7e..e0994e7ba2f 100644 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h +++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OC_Endpoint_Selector_Factory.h @@ -11,12 +9,10 @@ */ //============================================================================= - #ifndef TAO_OC_ENDPOINT_SELECTOR_FACTORY_H #define TAO_OC_ENDPOINT_SELECTOR_FACTORY_H #include /**/ "ace/pre.h" - #include "tao/Strategies/strategies_export.h" #include "tao/Endpoint_Selector_Factory.h" diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h index 865a4c75c0d..0913f89df53 100644 --- a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h +++ b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OC_Endpoint_Selector_Loader.h @@ -11,7 +9,6 @@ */ //============================================================================= - #ifndef TAO_OC_ENDPOINT_LOADER_H #define TAO_OC_ENDPOINT_LOADER_H #include /**/ "ace/pre.h" @@ -23,7 +20,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Forward references diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h index 5bcc45072f6..ddff6b17932 100644 --- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h +++ b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Optimized_Connection_Endpoint_Selector.h @@ -11,7 +9,6 @@ */ //============================================================================= - #ifndef TAO_OPTIMIZED_CONNECTION_ENDPOINT_SELECTOR_H #define TAO_OPTIMIZED_CONNECTION_ENDPOINT_SELECTOR_H @@ -28,7 +25,6 @@ #include "tao/Invocation_Endpoint_Selectors.h" #include "ace/Time_Value.h" - TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_GIOP_Invocation; diff --git a/TAO/tao/Strategies/SCIOP_Profile.cpp b/TAO/tao/Strategies/SCIOP_Profile.cpp index 114bd24aa21..5619222b443 100644 --- a/TAO/tao/Strategies/SCIOP_Profile.cpp +++ b/TAO/tao/Strategies/SCIOP_Profile.cpp @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- #include "tao/Strategies/SCIOP_Profile.h" #if TAO_HAS_SCIOP == 1 diff --git a/TAO/tao/TAO_Singleton_Manager.h b/TAO/tao/TAO_Singleton_Manager.h index 5f1cc3274fc..e00a42fc9b8 100644 --- a/TAO/tao/TAO_Singleton_Manager.h +++ b/TAO/tao/TAO_Singleton_Manager.h @@ -58,7 +58,7 @@ public: int init (int register_with_object_manager); /// Explicitly destroy. - virtual int fini (void); + virtual int fini (); /** * Returns 1 before the TAO_Singleton_Manager has been constructed. diff --git a/TAO/tao/Thread_Per_Connection_Handler.h b/TAO/tao/Thread_Per_Connection_Handler.h index 1d631be25e5..2979579e685 100644 --- a/TAO/tao/Thread_Per_Connection_Handler.h +++ b/TAO/tao/Thread_Per_Connection_Handler.h @@ -50,7 +50,7 @@ public: /** * Please see the documentation in ace/Task.h for details. */ - virtual int svc (void); + virtual int svc (); virtual int open (void *); virtual int close (u_long); diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h index b8aa3702d0e..cc57a5abd5b 100644 --- a/TAO/tao/Transport_Connector.h +++ b/TAO/tao/Transport_Connector.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Transport_Connector.h diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h index 701613ee518..3c3cb88115f 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file TypeCodeFactory_i.h @@ -37,7 +35,6 @@ namespace TAO } } - class TAO_TypeCodeFactory_Export TAO_TypeCodeFactory_i : public virtual CORBA::TypeCodeFactory, public virtual ::CORBA::LocalObject @@ -51,10 +48,10 @@ class TAO_TypeCodeFactory_Export TAO_TypeCodeFactory_i */ public: /// ctor - TAO_TypeCodeFactory_i (void); + TAO_TypeCodeFactory_i (); /// dtor - ~TAO_TypeCodeFactory_i (void); + ~TAO_TypeCodeFactory_i (); /// = LocalObject methods static TAO_TypeCodeFactory_i *_narrow (CORBA::Object_ptr obj); diff --git a/TAO/tao/Wait_On_Read.h b/TAO/tao/Wait_On_Read.h index b1efe5db8e3..85a8930f8e7 100644 --- a/TAO/tao/Wait_On_Read.h +++ b/TAO/tao/Wait_On_Read.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Wait_On_Read.h diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h index dedb1934674..80f82534edf 100644 --- a/TAO/tao/default_server.h +++ b/TAO/tao/default_server.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file default_server.h @@ -8,7 +6,6 @@ */ //============================================================================= - #ifndef TAO_DEFAULT_SERVER_FACTORY_H #define TAO_DEFAULT_SERVER_FACTORY_H diff --git a/TAO/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp index 99c01fd4c5a..5c8268de7e6 100644 --- a/TAO/tests/AMI/client.cpp +++ b/TAO/tests/AMI/client.cpp @@ -86,7 +86,7 @@ public: Client (A::AMI_Test_ptr server, int niterations); /// The thread entry point. - virtual int svc (void); + virtual int svc (); // private: /// Var for the AMI_Test object. diff --git a/TAO/tests/Big_Reply/Big_Reply_i.h b/TAO/tests/Big_Reply/Big_Reply_i.h index 48dac729c0e..2139368bea6 100644 --- a/TAO/tests/Big_Reply/Big_Reply_i.h +++ b/TAO/tests/Big_Reply/Big_Reply_i.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- // =================================================================== /** * @file Big_Reply_i.h diff --git a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h index ad5e6059fac..0207ca3ae3d 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h +++ b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.h @@ -23,7 +23,7 @@ public: size_t sz); /// The thread entry point. - virtual int svc (void); + virtual int svc (); private: /// Reference to the test interface diff --git a/TAO/tests/Bug_1020_Regression/ORB_Task.h b/TAO/tests/Bug_1020_Regression/ORB_Task.h index e8960166082..498f8bfd09a 100644 --- a/TAO/tests/Bug_1020_Regression/ORB_Task.h +++ b/TAO/tests/Bug_1020_Regression/ORB_Task.h @@ -13,7 +13,7 @@ class ORB_Task : public ACE_Task_Base public: ORB_Task(CORBA::ORB_ptr orb); - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1361_Regression/ORB_Task.h b/TAO/tests/Bug_1361_Regression/ORB_Task.h index 9fe0d7ec260..a8fa63d7724 100644 --- a/TAO/tests/Bug_1361_Regression/ORB_Task.h +++ b/TAO/tests/Bug_1361_Regression/ORB_Task.h @@ -13,7 +13,7 @@ class ORB_Task : public ACE_Task_Base public: ORB_Task (CORBA::ORB_ptr orb); - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h index 3a899d5e404..94e88b01841 100644 --- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h +++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h @@ -17,7 +17,7 @@ public: // Destructor... int shutdown (void); - virtual int svc (void); + virtual int svc (); virtual int put (Test::Echo_ptr echoptr); diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.h b/TAO/tests/Bug_1476_Regression/Sender_i.h index bc2dc1bb460..575284c03be 100644 --- a/TAO/tests/Bug_1476_Regression/Sender_i.h +++ b/TAO/tests/Bug_1476_Regression/Sender_i.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- // =================================================================== /** * @file Sender_i.h @@ -27,16 +26,16 @@ public: Sender_i (CORBA::ORB_ptr orb); ///Destructor - virtual ~Sender_i (void); + virtual ~Sender_i (); // = The skeleton methods virtual void active_objects (CORBA::ULong ao); - virtual void send_ready_message (void); + virtual void send_ready_message (); - CORBA::ULong get_number_received (void) const; + CORBA::ULong get_number_received () const; - CORBA::ULong get_active_objects (void) const; + CORBA::ULong get_active_objects () const; private: /// Our local ORB ptr diff --git a/TAO/tests/Bug_2417_Regression/client.cpp b/TAO/tests/Bug_2417_Regression/client.cpp index e1f24e78eb7..afa4ffda9d5 100644 --- a/TAO/tests/Bug_2417_Regression/client.cpp +++ b/TAO/tests/Bug_2417_Regression/client.cpp @@ -36,7 +36,7 @@ class ThreadPool : public ACE_Task_Base { public: ThreadPool (CORBA::ORB_ptr orb); - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; }; diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp index 7ab1cc23b6f..165830204e3 100644 --- a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp +++ b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp @@ -20,7 +20,7 @@ public: Worker(Publisher_impl * _owner); ~Worker(); void addSubscriber(Subscriber_ptr subscriber); - virtual int svc (void); + virtual int svc (); void terminate(); private: bool terminated; diff --git a/TAO/tests/Bug_2417_Regression/server.cpp b/TAO/tests/Bug_2417_Regression/server.cpp index 31b7f25a20a..246554ac593 100644 --- a/TAO/tests/Bug_2417_Regression/server.cpp +++ b/TAO/tests/Bug_2417_Regression/server.cpp @@ -36,7 +36,7 @@ class ThreadPool : public ACE_Task_Base { public: ThreadPool (CORBA::ORB_ptr orb); - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; }; diff --git a/TAO/tests/Bug_2494_Regression/server.cpp b/TAO/tests/Bug_2494_Regression/server.cpp index 6f7b23da911..710fdc31597 100644 --- a/TAO/tests/Bug_2494_Regression/server.cpp +++ b/TAO/tests/Bug_2494_Regression/server.cpp @@ -46,7 +46,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/Bug_2677_Regression/DllORB.h b/TAO/tests/Bug_2677_Regression/DllORB.h index d72946c0d96..0a18875b1ff 100644 --- a/TAO/tests/Bug_2677_Regression/DllORB.h +++ b/TAO/tests/Bug_2677_Regression/DllORB.h @@ -16,7 +16,7 @@ public: virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); private: unsigned int failPrePostInit_; diff --git a/TAO/tests/Bug_2683_Regression/test_i.h b/TAO/tests/Bug_2683_Regression/test_i.h index 154e49b5a11..61ceecfc642 100644 --- a/TAO/tests/Bug_2683_Regression/test_i.h +++ b/TAO/tests/Bug_2683_Regression/test_i.h @@ -12,7 +12,7 @@ class ORB_Killer : public ACE_Task_Base public: /// Constructor ORB_Killer (CORBA::ORB_ptr orb); - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; }; diff --git a/TAO/tests/Bug_2805_Regression/client.cpp b/TAO/tests/Bug_2805_Regression/client.cpp index 8ffd6a12f67..a038b164012 100644 --- a/TAO/tests/Bug_2805_Regression/client.cpp +++ b/TAO/tests/Bug_2805_Regression/client.cpp @@ -80,7 +80,7 @@ public: Client (A::AMI_Test_ptr server, int niterations); /// The thread entry point. - virtual int svc (void); + virtual int svc (); // private: /// Var for the AMI_Test object. diff --git a/TAO/tests/Bug_2909_Regression/client.cpp b/TAO/tests/Bug_2909_Regression/client.cpp index a8f1a9f3f6b..9c9b02e239f 100644 --- a/TAO/tests/Bug_2909_Regression/client.cpp +++ b/TAO/tests/Bug_2909_Regression/client.cpp @@ -77,7 +77,7 @@ public: Client (A::AMI_Test_ptr server, int niterations); /// The thread entry point. - virtual int svc (void); + virtual int svc (); // private: /// Var for the AMI_Test object. diff --git a/TAO/tests/Bug_2936_Regression/PersistentPOA.h b/TAO/tests/Bug_2936_Regression/PersistentPOA.h index 239a115680c..1bd7c53e109 100644 --- a/TAO/tests/Bug_2936_Regression/PersistentPOA.h +++ b/TAO/tests/Bug_2936_Regression/PersistentPOA.h @@ -25,7 +25,7 @@ class bug2936_Export PersistentPoa protected: virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); // private methods and instance variables private: diff --git a/TAO/tests/Bug_3108_Regression/client.cpp b/TAO/tests/Bug_3108_Regression/client.cpp index 259e7b0df70..3a34daed57b 100644 --- a/TAO/tests/Bug_3108_Regression/client.cpp +++ b/TAO/tests/Bug_3108_Regression/client.cpp @@ -48,7 +48,7 @@ public: // ctor Client (test_ptr server); - virtual int svc (void); + virtual int svc (); // The server. test_var server_; diff --git a/TAO/tests/Bug_3171_Regression/server.cpp b/TAO/tests/Bug_3171_Regression/server.cpp index de783b96f62..92c4e1532bb 100644 --- a/TAO/tests/Bug_3171_Regression/server.cpp +++ b/TAO/tests/Bug_3171_Regression/server.cpp @@ -58,7 +58,7 @@ class Worker : public ACE_Task_Base public: Worker (); - virtual int svc (void); + virtual int svc (); private: }; diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.h b/TAO/tests/Bug_3251_Regression/DllOrb.h index a9541c0f930..de48025da89 100644 --- a/TAO/tests/Bug_3251_Regression/DllOrb.h +++ b/TAO/tests/Bug_3251_Regression/DllOrb.h @@ -20,9 +20,9 @@ public: virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); - virtual int svc (void); + virtual int svc (); private: auto_ptr < ACE_Thread_Barrier > ma_barrier_; diff --git a/TAO/tests/Bug_3251_Regression/PersistentPoa.h b/TAO/tests/Bug_3251_Regression/PersistentPoa.h index 964b95fc886..cb43a653b55 100644 --- a/TAO/tests/Bug_3251_Regression/PersistentPoa.h +++ b/TAO/tests/Bug_3251_Regression/PersistentPoa.h @@ -23,7 +23,7 @@ class bug_3251_Export PersistentPoa: public ACE_Service_Object protected: virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); // private methods and instance variables private: diff --git a/TAO/tests/Bug_3384_Regression/client.cpp b/TAO/tests/Bug_3384_Regression/client.cpp index ea37462912c..7b090db5fd2 100644 --- a/TAO/tests/Bug_3384_Regression/client.cpp +++ b/TAO/tests/Bug_3384_Regression/client.cpp @@ -45,7 +45,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service.h b/TAO/tests/Bug_3499_Regression/DLL_Service.h index 0d4d77d40de..801ead231da 100644 --- a/TAO/tests/Bug_3499_Regression/DLL_Service.h +++ b/TAO/tests/Bug_3499_Regression/DLL_Service.h @@ -12,7 +12,7 @@ public: virtual int init (int , ACE_TCHAR * []); - virtual int fini (void); + virtual int fini (); /// This is only here for destruction purposes virtual void destroy (void); diff --git a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h index 0571daa891c..f2d26f5d3db 100644 --- a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h +++ b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h @@ -14,7 +14,7 @@ public: virtual int init (int argc, ACE_TCHAR * argv []); - virtual int fini (void); + virtual int fini (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_3531_Regression/client.cpp b/TAO/tests/Bug_3531_Regression/client.cpp index 966d2157fb8..37ed18ee226 100644 --- a/TAO/tests/Bug_3531_Regression/client.cpp +++ b/TAO/tests/Bug_3531_Regression/client.cpp @@ -90,7 +90,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/Bug_3531_Regression/server.cpp b/TAO/tests/Bug_3531_Regression/server.cpp index f21c3a1c74f..0988c258929 100644 --- a/TAO/tests/Bug_3531_Regression/server.cpp +++ b/TAO/tests/Bug_3531_Regression/server.cpp @@ -53,7 +53,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/Bug_3531b_Regression/server.cpp b/TAO/tests/Bug_3531b_Regression/server.cpp index 7b7637e06ca..2e9a80a1bfe 100644 --- a/TAO/tests/Bug_3531b_Regression/server.cpp +++ b/TAO/tests/Bug_3531b_Regression/server.cpp @@ -76,7 +76,7 @@ public: : shutdown_ (false) {} - virtual int svc (void); + virtual int svc (); virtual int close (u_long = 0); virtual int put (ACE_Message_Block * mblk, ACE_Time_Value * tv = 0); int process_cmd (void); diff --git a/TAO/tests/Bug_3542_Regression/DllOrb.h b/TAO/tests/Bug_3542_Regression/DllOrb.h index 616821e97cd..1030d5b022d 100644 --- a/TAO/tests/Bug_3542_Regression/DllOrb.h +++ b/TAO/tests/Bug_3542_Regression/DllOrb.h @@ -20,9 +20,9 @@ public: virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); - virtual int svc (void); + virtual int svc (); private: auto_ptr < ACE_Thread_Barrier > ma_barrier_; diff --git a/TAO/tests/Bug_3567_Regression/client.cpp b/TAO/tests/Bug_3567_Regression/client.cpp index 3cc35b7b408..76acc2af742 100644 --- a/TAO/tests/Bug_3567_Regression/client.cpp +++ b/TAO/tests/Bug_3567_Regression/client.cpp @@ -71,7 +71,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: @@ -96,7 +96,7 @@ public: ~Client () ; /// The thread entry point. - virtual int svc (void); + virtual int svc (); // private: /// Var for the AMI_Test object. diff --git a/TAO/tests/Bug_3567_Regression/server.cpp b/TAO/tests/Bug_3567_Regression/server.cpp index 70949ace98e..153766723e3 100644 --- a/TAO/tests/Bug_3567_Regression/server.cpp +++ b/TAO/tests/Bug_3567_Regression/server.cpp @@ -31,7 +31,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/Bug_3672_Regression/client.cpp b/TAO/tests/Bug_3672_Regression/client.cpp index 609f07b7754..88a2f8aa8dd 100644 --- a/TAO/tests/Bug_3672_Regression/client.cpp +++ b/TAO/tests/Bug_3672_Regression/client.cpp @@ -77,7 +77,7 @@ public: Client (A::AMI_Test_ptr server, int niterations, A::AMI_AMI_TestHandler_ptr handler); /// The thread entry point. - virtual int svc (void); + virtual int svc (); /// Set all members to nil void clear (); diff --git a/TAO/tests/Bug_3896_Regression/client.cpp b/TAO/tests/Bug_3896_Regression/client.cpp index 89330ba57a9..2f09cc510f4 100644 --- a/TAO/tests/Bug_3896_Regression/client.cpp +++ b/TAO/tests/Bug_3896_Regression/client.cpp @@ -42,7 +42,7 @@ class Client : public ACE_Task_Base public: Client (CORBA::ORB_ptr server); - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h index 27aaab8a148..1d9c9cbc332 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h @@ -70,7 +70,6 @@ struct RefHelper struct CSD_TP_Test_Export AppHelper { - static void ref_to_file(CORBA::ORB_ptr orb, CORBA::Object_ptr obj, const ACE_TCHAR* filename); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h index a8307ab45b4..bbc8ba0cd90 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h @@ -7,29 +7,27 @@ class CSD_TP_Test_Export AppShutdown { - public: +public: + AppShutdown(); + virtual ~AppShutdown(); - AppShutdown(); - virtual ~AppShutdown(); + void init(CORBA::ORB_ptr orb, + unsigned num_clients); - void init(CORBA::ORB_ptr orb, - unsigned num_clients); + void wait (); - void wait (); + void client_done(); - void client_done(); + static AppShutdown* instance (); - static AppShutdown* instance (); +private: + CORBA::ORB_var orb_; + unsigned num_clients_; + ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned> num_clients_shutdown_; - private: - CORBA::ORB_var orb_; - unsigned num_clients_; - ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned> num_clients_shutdown_; - - OrbShutdownTask orb_shutdown_task_; + OrbShutdownTask orb_shutdown_task_; }; - #define TheAppShutdown AppShutdown::instance() #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h index 0a1ce4c76fc..8690c061ff8 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file ClientEngine.h @@ -18,19 +16,16 @@ #include "ace/Synch.h" #include "ace/CORBA_macros.h" - class ClientEngine; typedef TAO_Intrusive_Ref_Count_Handle<ClientEngine> ClientEngine_Handle; - class CSD_TP_Test_Export ClientEngine : public TAO_Intrusive_Ref_Count_Base<TAO_SYNCH_MUTEX> { - public: - - ClientEngine(); - virtual ~ClientEngine(); +public: + ClientEngine(); + virtual ~ClientEngine(); - virtual bool execute(void) = 0; + virtual bool execute(void) = 0; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h index ed41fc51f39..29f046e1055 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file ClientTask.h @@ -17,30 +15,27 @@ #include "ace/Vector_T.h" #include "ace/Synch.h" - class CSD_TP_Test_Export ClientTask : public ACE_Task_Base { - public: - - ClientTask(bool shutdown_after_done = false); - virtual ~ClientTask(); - - void add_engine(ClientEngine* engine); +public: + ClientTask(bool shutdown_after_done = false); + virtual ~ClientTask(); - virtual int open(void* arg = 0); - virtual int svc(); - virtual int close(u_long); + void add_engine(ClientEngine* engine); - unsigned failure_count () const; + virtual int open(void* arg = 0); + virtual int svc(); + virtual int close(u_long); - private: + unsigned failure_count () const; - typedef ACE_Vector<ClientEngine_Handle> EngineVector; +private: + typedef ACE_Vector<ClientEngine_Handle> EngineVector; - TAO_SYNCH_MUTEX lock_; - EngineVector engines_; - bool shutdown_after_done_; - unsigned failure_count_; + TAO_SYNCH_MUTEX lock_; + EngineVector engines_; + bool shutdown_after_done_; + unsigned failure_count_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h index 36fff3dd607..c2d1b7a9d91 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h @@ -6,18 +6,15 @@ class CSD_TP_Test_Export OrbRunner { - public: +public: + OrbRunner(CORBA::ORB_ptr orb, unsigned num_orb_threads = 1); + virtual ~OrbRunner(); - OrbRunner(CORBA::ORB_ptr orb, unsigned num_orb_threads = 1); - virtual ~OrbRunner(); + void run(); - void run(void); - - - private: - - CORBA::ORB_var orb_; - unsigned num_orb_threads_; +private: + CORBA::ORB_var orb_; + unsigned num_orb_threads_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp index e0932bd4c38..e97050db4a0 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.cpp @@ -12,24 +10,16 @@ #include "ace/CORBA_macros.h" #include "ace/OS_NS_unistd.h" - OrbShutdownTask::OrbShutdownTask() { } - -OrbShutdownTask::~OrbShutdownTask() -{ -} - - void OrbShutdownTask::orb(CORBA::ORB_ptr orb) { this->orb_ = CORBA::ORB::_duplicate(orb); } - int OrbShutdownTask::open(void*) { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.h index 9197b8083d5..94b63769026 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbShutdownTask.h @@ -15,24 +13,20 @@ #include "ace/Task.h" #include "tao/ORB.h" - class CSD_TP_Test_Export OrbShutdownTask : public ACE_Task_Base { - public: - - OrbShutdownTask(); - virtual ~OrbShutdownTask(); - - void orb(CORBA::ORB_ptr orb); - - virtual int open(void*); - virtual int svc(); - virtual int close(u_long); +public: + OrbShutdownTask(); + virtual ~OrbShutdownTask() = default; + void orb(CORBA::ORB_ptr orb); - private: + virtual int open(void*); + virtual int svc(); + virtual int close(u_long); - CORBA::ORB_var orb_; +private: + CORBA::ORB_var orb_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp index 758b9b2d833..097c6c1f494 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbTask.cpp @@ -13,19 +11,12 @@ namespace { enum { MAX_ORB_TASK_WORKER_THREADS = 20 }; } - OrbTask::OrbTask(CORBA::ORB_ptr orb, unsigned num_threads) : orb_(CORBA::ORB::_duplicate(orb)), num_threads_(num_threads) { } - -OrbTask::~OrbTask() -{ -} - - int OrbTask::open(void*) { @@ -87,7 +78,6 @@ OrbTask::svc() return 0; } - int OrbTask::close(u_long) { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.h index dcacb31119d..e7d61ee0b18 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file OrbTask.h @@ -17,20 +15,17 @@ class CSD_TP_Test_Export OrbTask : public ACE_Task_Base { - public: - - OrbTask(CORBA::ORB_ptr orb, unsigned num_threads = 1); - virtual ~OrbTask(); - - virtual int open(void* x = 0); - virtual int svc(); - virtual int close(u_long); - +public: + OrbTask(CORBA::ORB_ptr orb, unsigned num_threads = 1); + ~OrbTask() override = default; - private: + int open(void* x = 0) override; + int svc() override; + int close(u_long) override; - CORBA::ORB_var orb_; - unsigned num_threads_; +private: + CORBA::ORB_var orb_; + unsigned num_threads_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h index 20607775fd3..f8670e65903 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h @@ -5,51 +5,47 @@ #include "tao/PortableServer/Servant_Base.h" #include "ace/Vector_T.h" - // The T type is a concrete servant type. template <class T> class ServantList { - public: - - typedef typename T::_stub_type T_stub; - typedef typename T::_stub_ptr_type T_stub_ptr; - typedef typename T::_stub_var_type T_stub_var; - - ServantList(); - ~ServantList(); - - /// Activate servant and output ior to a file. - void create_and_activate(unsigned num_servants, - CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - const ACE_TCHAR* ior_fname_prefix); - - /// Activate servant and not output ior to a file. - void create_and_activate(unsigned num_servants, - PortableServer::POA_ptr poa); - - // Code not used and not working right now - possible future addition. - //void deactivate(PortableServer::POA_ptr poa); - - /// Get a (copy) of one of the object references (for a specific servant). - T_stub_ptr objref(unsigned index); - /// This doesn't return a copy. - T* servant(unsigned index); - - - private: - - struct ServantRecord - { - T* servant_; - PortableServer::ServantBase_var safe_servant_; - T_stub_var obj_; - }; - - typedef ACE_Vector<ServantRecord> ServantRecordVector; - - ServantRecordVector servant_records_; +public: + typedef typename T::_stub_type T_stub; + typedef typename T::_stub_ptr_type T_stub_ptr; + typedef typename T::_stub_var_type T_stub_var; + + ServantList(); + ~ServantList(); + + /// Activate servant and output ior to a file. + void create_and_activate(unsigned num_servants, + CORBA::ORB_ptr orb, + PortableServer::POA_ptr poa, + const ACE_TCHAR* ior_fname_prefix); + + /// Activate servant and not output ior to a file. + void create_and_activate(unsigned num_servants, + PortableServer::POA_ptr poa); + + // Code not used and not working right now - possible future addition. + //void deactivate(PortableServer::POA_ptr poa); + + /// Get a (copy) of one of the object references (for a specific servant). + T_stub_ptr objref(unsigned index); + /// This doesn't return a copy. + T* servant(unsigned index); + +private: + struct ServantRecord + { + T* servant_; + PortableServer::ServantBase_var safe_servant_; + T_stub_var obj_; + }; + + typedef ACE_Vector<ServantRecord> ServantRecordVector; + + ServantRecordVector servant_records_; }; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h index ae95c226bf7..b82edcb91e3 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h @@ -7,17 +7,14 @@ #include "ace/Vector_T.h" #include "ace/SString.h" - typedef ACE_Vector< CORBA::Long, 1000 > LongVector; typedef ACE_Vector< ACE_CString, 1000 > StringVector; typedef ACE_Array< CORBA::Long > LongArray; - extern CSD_TP_Test_Export void swap ( CORBA::Long& x, CORBA::Long& y ); extern CSD_TP_Test_Export void sort ( LongVector & vector ); - #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h index 0fb4aaaaa9f..40b06e5ca2d 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h @@ -8,25 +8,22 @@ class CSD_TP_Test_Export TestAppBase { - public: +public: + virtual ~TestAppBase(); - virtual ~TestAppBase(); + // Returns 0 for success, and -1 for failure. + int run (int argc, ACE_TCHAR *argv[]); - // Returns 0 for success, and -1 for failure. - int run (int argc, ACE_TCHAR *argv[]); + const char *name() const; - const char *name() const; +protected: + TestAppBase (const char* name); - protected: + // Returns -1 for failure, 0 for success + virtual int run_i (int argc, ACE_TCHAR *argv[]) = 0; - TestAppBase (const char* name); - - // Returns -1 for failure, 0 for success - virtual int run_i (int argc, ACE_TCHAR *argv[]) = 0; - - private: - - ACE_CString name_; +private: + ACE_CString name_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h index 1fc1cdec42a..0eb354a8060 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_A_ClientEngine.h @@ -19,20 +17,18 @@ class Foo_A_Statistics; class CSD_TP_Foo_A_Export Foo_A_ClientEngine : public ClientEngine { - public: - - Foo_A_ClientEngine(Foo_A_ptr obj, unsigned client_id = 0, bool collocated = false); - virtual ~Foo_A_ClientEngine(); - - virtual bool execute(void); +public: + Foo_A_ClientEngine(Foo_A_ptr obj, unsigned client_id = 0, bool collocated = false); + virtual ~Foo_A_ClientEngine(); - static void expected_results(Foo_A_Statistics& stats); + virtual bool execute(void); - private: + static void expected_results(Foo_A_Statistics& stats); - Foo_A_var obj_; - unsigned client_id_; - bool collocated_; +private: + Foo_A_var obj_; + unsigned client_id_; + bool collocated_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h index 5bf5c62d92c..72731110b59 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_B_ClientEngine.h @@ -20,26 +18,24 @@ class Callback_i; class CSD_TP_Foo_B_Export Foo_B_ClientEngine : public ClientEngine { - public: - - Foo_B_ClientEngine(Foo_B_ptr obj, - Callback_ptr callback, - unsigned client_id = 0, - bool collocated = false); - - virtual ~Foo_B_ClientEngine(); +public: + Foo_B_ClientEngine(Foo_B_ptr obj, + Callback_ptr callback, + unsigned client_id = 0, + bool collocated = false); - virtual bool execute(void); + virtual ~Foo_B_ClientEngine(); - static void expected_results(Foo_B_Statistics& stats); - static unsigned expected_callbacks (); + virtual bool execute(void); - private: + static void expected_results(Foo_B_Statistics& stats); + static unsigned expected_callbacks (); - Foo_B_var obj_; - Callback_var callback_; - unsigned client_id_; - bool collocated_; +private: + Foo_B_var obj_; + Callback_var callback_; + unsigned client_id_; + bool collocated_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h index b821b2c7230..e64bad650d9 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_B_SimpleClientEngine.h @@ -20,26 +18,24 @@ class Callback_i; class CSD_TP_Foo_B_Export Foo_B_SimpleClientEngine : public ClientEngine { - public: - - Foo_B_SimpleClientEngine(Foo_B_ptr obj, - Callback_ptr callback, - unsigned client_id = 0, - bool collocated = false); - - virtual ~Foo_B_SimpleClientEngine(); +public: + Foo_B_SimpleClientEngine(Foo_B_ptr obj, + Callback_ptr callback, + unsigned client_id = 0, + bool collocated = false); - virtual bool execute(void); + virtual ~Foo_B_SimpleClientEngine(); - static void expected_results(Foo_B_Statistics& stats); - static unsigned expected_callbacks (); + virtual bool execute(void); - private: + static void expected_results(Foo_B_Statistics& stats); + static unsigned expected_callbacks (); - Foo_B_var obj_; - Callback_var callback_; - unsigned client_id_; - bool collocated_; +private: + Foo_B_var obj_; + Callback_var callback_; + unsigned client_id_; + bool collocated_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h index 4e6e3f7d045..245c72fc54a 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_C_ClientEngine.h @@ -16,23 +14,20 @@ #include "Foo_CC.h" #include "Foo_C_Statistics.h" - class CSD_TP_Foo_C_Export Foo_C_ClientEngine : public ClientEngine { - public: - - Foo_C_ClientEngine(Foo_C_ptr obj, - unsigned client_id); - virtual ~Foo_C_ClientEngine(); - - virtual bool execute(void); +public: + Foo_C_ClientEngine(Foo_C_ptr obj, + unsigned client_id); + virtual ~Foo_C_ClientEngine(); - static void expected_results(Foo_C_Statistics& stats); + virtual bool execute(void); - private: + static void expected_results(Foo_C_Statistics& stats); - Foo_C_var obj_; - unsigned client_id_; +private: + Foo_C_var obj_; + unsigned client_id_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h index f3b9d19cb7e..6ef663ec30a 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_C_Custom_ClientEngine.h @@ -15,26 +13,22 @@ #include "ClientEngine.h" #include "Foo_C_Custom_Proxy.h" - class CSD_TP_Foo_C_Export Foo_C_Custom_ClientEngine : public ClientEngine { - public: - - Foo_C_Custom_ClientEngine(Foo_C_i* servant, - Foo_C_ptr objref, - TAO::CSD::TP_Strategy* strategy, - unsigned client_id); - virtual ~Foo_C_Custom_ClientEngine(); - - virtual bool execute(void); - - static void expected_results(Foo_C_Statistics& stats); +public: + Foo_C_Custom_ClientEngine(Foo_C_i* servant, + Foo_C_ptr objref, + TAO::CSD::TP_Strategy* strategy, + unsigned client_id); + virtual ~Foo_C_Custom_ClientEngine(); + virtual bool execute(void); - private: + static void expected_results(Foo_C_Statistics& stats); - Foo_C_Custom_Proxy proxy_; - unsigned client_id_; +private: + Foo_C_Custom_Proxy proxy_; + unsigned client_id_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h index 674e454a4ca..3c82dd0f15a 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_C_Custom_Proxy.h @@ -16,11 +14,9 @@ #include "Foo_C_i.h" #include "tao/CSD_ThreadPool/CSD_TP_Strategy.h" - class CSD_TP_Foo_C_Export Foo_C_Custom_Proxy { public: - Foo_C_Custom_Proxy(Foo_C_i* servant, Foo_C_ptr objref, TAO::CSD::TP_Strategy* strategy); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h index a107ad34528..27475bb4a78 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_C_cust_op1.h @@ -20,24 +18,21 @@ class Foo_C_i; class Foo_C_cust_op1; typedef TAO_Intrusive_Ref_Count_Handle<Foo_C_cust_op1> Foo_C_cust_op1_Handle; - class CSD_TP_Foo_C_Export Foo_C_cust_op1 : public TAO::CSD::TP_Custom_Request_Operation { - public: - - Foo_C_cust_op1(Foo_C_i* servant); - virtual ~Foo_C_cust_op1(); - - void result(void); +public: + Foo_C_cust_op1(Foo_C_i* servant); + virtual ~Foo_C_cust_op1(); + void result(void); - protected: - virtual void execute_i(); - virtual void cancel_i(); +protected: + virtual void execute_i(); + virtual void cancel_i(); - private: - bool cancelled_; - Foo_C_i* servant_; +private: + bool cancelled_; + Foo_C_i* servant_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h index 25e6cf28f1a..f26caa26e60 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_C_cust_op2.h @@ -20,29 +18,22 @@ class Foo_C_i; class Foo_C_cust_op2; typedef TAO_Intrusive_Ref_Count_Handle<Foo_C_cust_op2> Foo_C_cust_op2_Handle; - class CSD_TP_Foo_C_Export Foo_C_cust_op2 : public TAO::CSD::TP_Custom_Request_Operation { - public: - - Foo_C_cust_op2(Foo_C_i* servant, long arg); - virtual ~Foo_C_cust_op2(); - - void result(void); - - - protected: - - virtual void execute_i(); - virtual void cancel_i(); - +public: + Foo_C_cust_op2(Foo_C_i* servant, long arg); + virtual ~Foo_C_cust_op2(); - private: + void result(void); - long arg_; - bool cancelled_; +protected: + virtual void execute_i(); + virtual void cancel_i(); - Foo_C_i* servant_; +private: + long arg_; + bool cancelled_; + Foo_C_i* servant_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h index cd52e184a6a..61a034eb086 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_C_cust_op3.h @@ -20,30 +18,23 @@ class Foo_C_i; class Foo_C_cust_op3; typedef TAO_Intrusive_Ref_Count_Handle<Foo_C_cust_op3> Foo_C_cust_op3_Handle; - class CSD_TP_Foo_C_Export Foo_C_cust_op3 : public TAO::CSD::TP_Custom_Request_Operation { - public: - - Foo_C_cust_op3(Foo_C_i* servant, long arg); - virtual ~Foo_C_cust_op3(); - - long result(void); - - - protected: - - virtual void execute_i(); - virtual void cancel_i(); - +public: + Foo_C_cust_op3(Foo_C_i* servant, long arg); + virtual ~Foo_C_cust_op3(); - private: + long result(void); - long arg_; - long result_; - bool cancelled_; +protected: + virtual void execute_i(); + virtual void cancel_i(); - Foo_C_i* servant_; +private: + long arg_; + long result_; + bool cancelled_; + Foo_C_i* servant_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.h index 8d5c42757a0..d97852d798e 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_C_cust_op4.h @@ -20,26 +18,19 @@ class Foo_C_i; class Foo_C_cust_op4; typedef TAO_Intrusive_Ref_Count_Handle<Foo_C_cust_op4> Foo_C_cust_op4_Handle; - class CSD_TP_Foo_C_Export Foo_C_cust_op4 : public TAO::CSD::TP_Custom_Request_Operation { - public: - - Foo_C_cust_op4(Foo_C_i* servant, long arg); - virtual ~Foo_C_cust_op4(); - - - protected: - - virtual void execute_i(); - virtual void cancel_i(); - - - private: +public: + Foo_C_cust_op4(Foo_C_i* servant, long arg); + virtual ~Foo_C_cust_op4(); - long arg_; +protected: + virtual void execute_i(); + virtual void cancel_i(); - Foo_C_i* servant_; +private: + long arg_; + Foo_C_i* servant_; }; #endif diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h index 333fe40d057..8a3c0159bbd 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Foo_C_cust_op5.h @@ -20,29 +18,22 @@ class Foo_C_i; class Foo_C_cust_op5; typedef TAO_Intrusive_Ref_Count_Handle<Foo_C_cust_op5> Foo_C_cust_op5_Handle; - class CSD_TP_Foo_C_Export Foo_C_cust_op5 : public TAO::CSD::TP_Custom_Request_Operation { - public: - - Foo_C_cust_op5(Foo_C_i* servant); - virtual ~Foo_C_cust_op5(); - - void result(void); - - - protected: - - virtual void execute_i(); - virtual void cancel_i(); - +public: + Foo_C_cust_op5(Foo_C_i* servant); + virtual ~Foo_C_cust_op5(); - private: + void result(void); - bool exception_; - bool cancelled_; +protected: + virtual void execute_i(); + virtual void cancel_i(); - Foo_C_i* servant_; +private: + bool exception_; + bool cancelled_; + Foo_C_i* servant_; }; #endif diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.h b/TAO/tests/DLL_ORB/Test_Client_Module.h index 8cb2d44ee61..d2757f8128e 100644 --- a/TAO/tests/DLL_ORB/Test_Client_Module.h +++ b/TAO/tests/DLL_ORB/Test_Client_Module.h @@ -41,10 +41,10 @@ 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 to handle deferred processing. - virtual int svc (void); + virtual int svc (); private: diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.h b/TAO/tests/DLL_ORB/Test_Server_Module.h index da65a59ce27..a741049c4ad 100644 --- a/TAO/tests/DLL_ORB/Test_Server_Module.h +++ b/TAO/tests/DLL_ORB/Test_Server_Module.h @@ -41,10 +41,10 @@ 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 to handle deferred processing. - virtual int svc (void); + virtual int svc (); virtual ~Test_Server_Module (void); diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp index 689c1446bd9..edb2562a0ac 100644 --- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp +++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Client.cpp @@ -7,7 +7,7 @@ class MT_Requestor : public virtual ACE_Task_Base public: MT_Requestor (Test::Middle_ptr m, CORBA::Short sec); - virtual int svc (void); + virtual int svc (); private: Test::Middle_var middle_; CORBA::Short seconds_; diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp index ce2a1d2b538..5cf199a84e1 100644 --- a/TAO/tests/File_IO/server.cpp +++ b/TAO/tests/File_IO/server.cpp @@ -22,7 +22,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/ForwardOnceUponException/client.cpp b/TAO/tests/ForwardOnceUponException/client.cpp index 2a0223db73b..3ebab564f83 100644 --- a/TAO/tests/ForwardOnceUponException/client.cpp +++ b/TAO/tests/ForwardOnceUponException/client.cpp @@ -71,7 +71,7 @@ public: // Constructor // = The Task_Base methods - virtual int svc (void); + virtual int svc (); // Caught any exception ? int received_ex_kind () const; diff --git a/TAO/tests/ForwardUponObjectNotExist/client.cpp b/TAO/tests/ForwardUponObjectNotExist/client.cpp index fe0f24b6c99..ba98b629398 100644 --- a/TAO/tests/ForwardUponObjectNotExist/client.cpp +++ b/TAO/tests/ForwardUponObjectNotExist/client.cpp @@ -60,7 +60,7 @@ public: /// The actual implementation of the test virtual void run_test (void); - virtual int svc (void); + virtual int svc (); /// Caught OBJECT_NOT_EXIST exception ? bool got_object_not_exist () const; diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp index d4037881831..c14cc58d77f 100644 --- a/TAO/tests/Forwarding/client.cpp +++ b/TAO/tests/Forwarding/client.cpp @@ -52,7 +52,7 @@ public: // The actual implementation of the test // = The Task_Base methods - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h index 79e9f35ef42..c5ec6f15903 100644 --- a/TAO/tests/LongUpcalls/AMI_Manager.h +++ b/TAO/tests/LongUpcalls/AMI_Manager.h @@ -32,7 +32,7 @@ public: CORBA::Long milliseconds, CORBA::ORB_ptr orb); - virtual int svc (void); + virtual int svc (); // The service method private: diff --git a/TAO/tests/LongUpcalls/Manager.h b/TAO/tests/LongUpcalls/Manager.h index de0b40dd319..8a8c31a580d 100644 --- a/TAO/tests/LongUpcalls/Manager.h +++ b/TAO/tests/LongUpcalls/Manager.h @@ -32,7 +32,7 @@ public: Test::Controller_ptr controller, CORBA::Long milliseconds); - virtual int svc (void); + virtual int svc (); // The service method private: diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp index c4aef141512..dae352c2acb 100644 --- a/TAO/tests/MT_Client/client.cpp +++ b/TAO/tests/MT_Client/client.cpp @@ -56,7 +56,7 @@ public: Client (Simple_Server_ptr server, int niterations); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp index 44ed8590e59..6bbea2da704 100644 --- a/TAO/tests/MT_Client/orb_creation.cpp +++ b/TAO/tests/MT_Client/orb_creation.cpp @@ -53,7 +53,7 @@ public: const char* ior); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h index a9e31f4e0f5..224dd5a4e2d 100644 --- a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h +++ b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h @@ -10,7 +10,7 @@ class Chatter : public Worker { public: Chatter (CORBA::ORB_ptr orb, const ACE_TCHAR *ior, ACE_Condition<ACE_Mutex>& cond); - virtual int svc (void); + virtual int svc (); int farewell (); long nrequests (void); long nreplies (void); diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/worker.h b/TAO/tests/MT_NoUpcall_Client_Leader/worker.h index aa0244e0e21..4e75ff3f4c3 100644 --- a/TAO/tests/MT_NoUpcall_Client_Leader/worker.h +++ b/TAO/tests/MT_NoUpcall_Client_Leader/worker.h @@ -17,7 +17,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. public: diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp index 82620993a6c..99e4e4bbf33 100644 --- a/TAO/tests/MT_Server/server.cpp +++ b/TAO/tests/MT_Server/server.cpp @@ -47,7 +47,7 @@ public: Worker (CORBA::ORB_ptr orb); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp index bc53d39ce43..33cdd24ad25 100644 --- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp +++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp @@ -55,7 +55,7 @@ public: // Constructor // = The Task_Base methods - virtual int svc (void); + virtual int svc (); // Caught any exception ? int received_ex_kind () const; diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp index 413809511ec..d8e2e8da78f 100644 --- a/TAO/tests/Muxed_GIOP_Versions/client.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/client.cpp @@ -60,7 +60,7 @@ public: Client (Simple_Server_ptr server, int niterations); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp index 2e4dce3e7dd..3b27ff909d3 100644 --- a/TAO/tests/Muxed_GIOP_Versions/server.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp @@ -69,7 +69,7 @@ public: Worker (CORBA::ORB_ptr orb); /// The thread entry point. - virtual int svc (void); + virtual int svc (); private: @@ -90,7 +90,7 @@ public: SelfClient (CORBA::ORB_ptr orb, Simple_Server_ptr server, int niterations); // ctor - virtual int svc (void); + virtual int svc (); // The thread entry point. private: diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.h b/TAO/tests/NestedUpcall/MT_Client_Test/client.h index b4d9a8c861f..9f7bc2f1d3f 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.h @@ -92,7 +92,7 @@ class MT_Client_Task : public ACE_Task<ACE_SYNCH> public: MT_Client_Task (int argc, ACE_TCHAR **argv, int client_number); - virtual int svc (void); + virtual int svc (); private: MT_Client mT_Client_; diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h index cc1e4357e95..35d8be77869 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h @@ -107,7 +107,7 @@ public: ACE_TCHAR **argv, TAO_ORB_Manager* orb_manager_ptr); - virtual int svc (void); + virtual int svc (); private: MT_Server mT_Server_; diff --git a/TAO/tests/No_Server_MT_Connect_Test/client.cpp b/TAO/tests/No_Server_MT_Connect_Test/client.cpp index 6649dbc7b0c..80cf170c64d 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/client.cpp +++ b/TAO/tests/No_Server_MT_Connect_Test/client.cpp @@ -57,7 +57,7 @@ public: /// The thread entry point. - virtual int svc (void); + virtual int svc (); private: Simple_Server_var server_; diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h index 9b051ef7ac7..883d6c025a5 100644 --- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h +++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h @@ -32,11 +32,11 @@ class DllOrb_Export DllOrb virtual int init (int argc, ACE_TCHAR *argv[]); - virtual int fini (void); + virtual int fini (); // protected types and methods protected: - virtual int svc (void); + virtual int svc (); // private methods and instance variables private: diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h index 2bf3b6eaa44..535972f7a3e 100644 --- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h +++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h @@ -41,14 +41,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: diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h index bb952ea1fca..4adee3cc6d7 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h @@ -91,7 +91,7 @@ public: * 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: signed char is_server_; diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h index 1a1d8e044bb..111bf6147bd 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- // =================================================================== /** * @file Receiver_i.h diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h index 658ca912400..2c045a7d8bd 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h @@ -1,4 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- // =================================================================== /** * @file Sender_i.h diff --git a/TAO/tests/POA/Loader/Servant_Activator.h b/TAO/tests/POA/Loader/Servant_Activator.h index 6ce4840c4d7..34adf6ee19f 100644 --- a/TAO/tests/POA/Loader/Servant_Activator.h +++ b/TAO/tests/POA/Loader/Servant_Activator.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Servant_Activator.h diff --git a/TAO/tests/POA/Loader/Servant_Locator.h b/TAO/tests/POA/Loader/Servant_Locator.h index f0402a0cfa5..8f76acb75c3 100644 --- a/TAO/tests/POA/Loader/Servant_Locator.h +++ b/TAO/tests/POA/Loader/Servant_Locator.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Servant_Locator.h diff --git a/TAO/tests/POA/Loader/Server_Manager.h b/TAO/tests/POA/Loader/Server_Manager.h index 3e12ee9aafb..69901de9fef 100644 --- a/TAO/tests/POA/Loader/Server_Manager.h +++ b/TAO/tests/POA/Loader/Server_Manager.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Server_Manager.h diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Activator.h b/TAO/tests/POA/On_Demand_Loading/Servant_Activator.h index ebddca4b829..dc8d8ae3ab2 100644 --- a/TAO/tests/POA/On_Demand_Loading/Servant_Activator.h +++ b/TAO/tests/POA/On_Demand_Loading/Servant_Activator.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Servant_Activator.h @@ -12,7 +10,6 @@ */ //============================================================================= - #ifndef SERVANT_ACTIVATOR_H #define SERVANT_ACTIVATOR_H diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Locator.h b/TAO/tests/POA/On_Demand_Loading/Servant_Locator.h index 5bda0398a77..7b744cafac9 100644 --- a/TAO/tests/POA/On_Demand_Loading/Servant_Locator.h +++ b/TAO/tests/POA/On_Demand_Loading/Servant_Locator.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Servant_Locator.h @@ -11,7 +9,6 @@ */ //============================================================================= - #ifndef SERVANT_LOCATOR_H #define SERVANT_LOCATOR_H diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h index 9049c080f36..16aa0032bc6 100644 --- a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h +++ b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Servant_Manager.h @@ -10,7 +8,6 @@ */ //============================================================================= - #ifndef SERVANT_MANAGER_H #define SERVANT_MANAGER_H diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.h b/TAO/tests/POA/On_Demand_Loading/Server_Manager.h index 612160fc3d8..da3c669f680 100644 --- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.h +++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.h @@ -1,5 +1,3 @@ -// This may look like C, but it's really -*- C++ -*- - //============================================================================= /** * @file Server_Manager.h @@ -10,7 +8,6 @@ */ //============================================================================= - #ifndef SERVER_MANAGER_H #define SERVER_MANAGER_H diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp index 84f75a7854c..1c8ca3a272f 100644 --- a/TAO/tests/Policies/Manipulation.cpp +++ b/TAO/tests/Policies/Manipulation.cpp @@ -54,7 +54,7 @@ public: int niterations); /// The thread entry point. - virtual int svc (void); + virtual int svc (); private: void perform_iteration (unsigned int *seed, diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp index 48a6b0f905a..bdb4d340acc 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp @@ -28,7 +28,7 @@ public: ACE_Barrier *barrier); // Constructor. - virtual int svc (void); + virtual int svc (); // Do work. private: diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.h b/TAO/tests/RTScheduling/Current/Thread_Task.h index 2138e9e7731..eca0f6da253 100644 --- a/TAO/tests/RTScheduling/Current/Thread_Task.h +++ b/TAO/tests/RTScheduling/Current/Thread_Task.h @@ -17,7 +17,7 @@ class Thread_Task : public ACE_Task <ACE_SYNCH> protected: /// task svc - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; RTScheduling::Current_var current_; diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h index c59f70affb6..55c479befcb 100644 --- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h +++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h @@ -15,7 +15,7 @@ class Thread_Task : public ACE_Task <ACE_SYNCH> protected: /// task svc - virtual int svc (void); + virtual int svc (); private: CORBA::ORB_var orb_; RTScheduling::Current_var current_; diff --git a/TAO/tests/TransportCurrent/Framework/client.cpp b/TAO/tests/TransportCurrent/Framework/client.cpp index 6e8737a30f1..f91eea955d1 100644 --- a/TAO/tests/TransportCurrent/Framework/client.cpp +++ b/TAO/tests/TransportCurrent/Framework/client.cpp @@ -69,7 +69,7 @@ class Worker : public ACE_Task_Base { public: Worker (Test::Transport::CurrentTest_ptr server, int niterations, int use_dii_too); - virtual int svc (void); + virtual int svc (); private: // The server. diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp index bf76a489a6d..b14bd1caec4 100644 --- a/TAO/tests/TransportCurrent/Framework/server.cpp +++ b/TAO/tests/TransportCurrent/Framework/server.cpp @@ -55,7 +55,7 @@ class Worker : public ACE_Task_Base { public: Worker (CORBA::ORB_ptr); - virtual int svc (void); + virtual int svc (); private: // The ORB diff --git a/TAO/tests/TransportCurrent/IIOP/client.cpp b/TAO/tests/TransportCurrent/IIOP/client.cpp index 0ac7557c468..843baeaeb6f 100644 --- a/TAO/tests/TransportCurrent/IIOP/client.cpp +++ b/TAO/tests/TransportCurrent/IIOP/client.cpp @@ -69,7 +69,7 @@ class Worker : public ACE_Task_Base { public: Worker (Test::Transport::CurrentTest_ptr server, int niterations, int use_dii_too); - virtual int svc (void); + virtual int svc (); private: // The server. diff --git a/TAO/tests/TransportCurrent/IIOP/server.cpp b/TAO/tests/TransportCurrent/IIOP/server.cpp index 122086f513d..b7c0e769a28 100644 --- a/TAO/tests/TransportCurrent/IIOP/server.cpp +++ b/TAO/tests/TransportCurrent/IIOP/server.cpp @@ -54,7 +54,7 @@ class Worker : public ACE_Task_Base { public: Worker (CORBA::ORB_ptr); - virtual int svc (void); + virtual int svc (); private: // The ORB diff --git a/TAO/tests/Two_Objects/worker.h b/TAO/tests/Two_Objects/worker.h index 1df842862e9..2e50f9c9982 100644 --- a/TAO/tests/Two_Objects/worker.h +++ b/TAO/tests/Two_Objects/worker.h @@ -15,7 +15,7 @@ public: Worker (CORBA::ORB_ptr orb); // The thread entry point. - virtual int svc (void); + virtual int svc (); private: |