diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-03-09 18:44:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-09 18:44:09 +0100 |
| commit | b0a0b92a0ee6bb248700d6ff4e7c51cc44db198f (patch) | |
| tree | f78fc5b7b2ea337ffc306a77223018fcc780e507 | |
| parent | 199259c5d2d5f4a6550382a683f5d54ac482fcd1 (diff) | |
| parent | adc1dcda981a4c76612bedeba2dddb76aa272d6f (diff) | |
| download | ATCD-b0a0b92a0ee6bb248700d6ff4e7c51cc44db198f.tar.gz | |
Merge pull request #1446 from jwillemsen/jwi-cpp11cleanup
Various cleanup and use of C++11 features
673 files changed, 1355 insertions, 2387 deletions
diff --git a/.github/workflows/cancel_previous_runs.yml b/.github/workflows/cancel_previous_runs.yml new file mode 100644 index 00000000000..de2463f62fa --- /dev/null +++ b/.github/workflows/cancel_previous_runs.yml @@ -0,0 +1,18 @@ +name: cancel + +on: + workflow_run: + workflows: ['face', 'fuzz', 'linux', 'macosx', 'windows'] + types: ['requested'] + +jobs: + cancel-duplicate-workflow-runs: + name: Cancel Duplicate Workflow Runs + runs-on: ubuntu-20.04 + steps: + - uses: potiuk/cancel-workflow-runs@v4_7 + name: Cancel Duplicate Workflow Runs + with: + cancelMode: allDuplicates + token: ${{ secrets.GITHUB_TOKEN }} + sourceRunId: ${{ github.event.workflow_run.id }} 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/ARGV.cpp b/ACE/ace/ARGV.cpp index d7af2f8457c..77353632b4d 100644 --- a/ACE/ace/ARGV.cpp +++ b/ACE/ace/ARGV.cpp @@ -301,7 +301,6 @@ ACE_ARGV_T<CHAR_TYPE>::add (CHAR_TYPE *argv[], bool quote_args) } // Free up argv_ and buf_ - template <typename CHAR_TYPE> ACE_ARGV_T<CHAR_TYPE>::~ACE_ARGV_T () { diff --git a/ACE/ace/Activation_Queue.h b/ACE/ace/Activation_Queue.h index aa8c4b8ef10..3d41fd0f4a4 100644 --- a/ACE/ace/Activation_Queue.h +++ b/ACE/ace/Activation_Queue.h @@ -73,7 +73,7 @@ public: * Defaults to ACE_Allocator::instance(). */ ACE_Activation_Queue (ACE_Message_Queue<ACE_SYNCH> *new_queue = 0, - ACE_Allocator *alloc = 0, + ACE_Allocator *alloc = nullptr, ACE_Allocator *db_alloc = 0); /// Destructor. @@ -139,7 +139,6 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - /// Stores the Method_Requests. ACE_Message_Queue<ACE_SYNCH> *queue_; diff --git a/ACE/ace/Active_Map_Manager_T.h b/ACE/ace/Active_Map_Manager_T.h index 8bfb7afcc5c..d17c9426406 100644 --- a/ACE/ace/Active_Map_Manager_T.h +++ b/ACE/ace/Active_Map_Manager_T.h @@ -8,7 +8,6 @@ */ //============================================================================= - #ifndef ACE_ACTIVE_MAP_MANAGER_T_H #define ACE_ACTIVE_MAP_MANAGER_T_H #include /**/ "ace/pre.h" @@ -50,11 +49,11 @@ public: typedef REVERSE_ITERATOR reverse_iterator; /// Initialize a Active_Map_Manager with the ACE_DEFAULT_MAP_SIZE. - ACE_Active_Map_Manager (ACE_Allocator *alloc = 0); + ACE_Active_Map_Manager (ACE_Allocator *alloc = nullptr); /// Initialize a Active_Map_Manager with @a size entries. ACE_Active_Map_Manager (size_t size, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = nullptr); /// Close down a Active_Map_Manager and release dynamically /// allocated resources. @@ -62,7 +61,7 @@ public: /// Initialize a Active_Map_Manager with size @a length. int open (size_t length = ACE_DEFAULT_MAP_SIZE, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = nullptr); /// Close down a Active_Map_Manager and release dynamically /// allocated resources. diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h index a0899b7b596..9d2803ad7db 100644 --- a/ACE/ace/Asynch_IO.h +++ b/ACE/ace/Asynch_IO.h @@ -704,7 +704,7 @@ public: ACE_Asynch_Read_File_Result_Impl *implementation_; private: - /// Here just to provide an dummpy implementation, since the + /// Here just to provide an dummy implementation, since the /// one auto generated by MSVC is flagged as infinitely recursive void operator= (Result &) {} }; @@ -838,7 +838,7 @@ public: ACE_Asynch_Write_File_Result_Impl *implementation_; private: - /// Here just to provide an dummpy implementation, since the + /// Here just to provide an dummy implementation, since the /// one auto generated by MSVC is flagged as infinitely recursive void operator= (Result &) {}; }; 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/Auto_Event.h b/ACE/ace/Auto_Event.h index d57fd71e718..d2eaed88033 100644 --- a/ACE/ace/Auto_Event.h +++ b/ACE/ace/Auto_Event.h @@ -4,8 +4,6 @@ /** * @file Auto_Event.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== diff --git a/ACE/ace/Auto_IncDec_T.h b/ACE/ace/Auto_IncDec_T.h index 72d98af0f47..78916c408c8 100644 --- a/ACE/ace/Auto_IncDec_T.h +++ b/ACE/ace/Auto_IncDec_T.h @@ -8,7 +8,6 @@ */ //============================================================================= - #ifndef ACE_AUTO_INCDEC_T_H #define ACE_AUTO_INCDEC_T_H diff --git a/ACE/ace/Barrier.h b/ACE/ace/Barrier.h index 58cba3f2610..0f5eccd1f6a 100644 --- a/ACE/ace/Barrier.h +++ b/ACE/ace/Barrier.h @@ -4,8 +4,6 @@ /** * @file Barrier.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== @@ -38,9 +36,9 @@ class ACE_Export ACE_Barrier { public: ACE_Barrier (unsigned int, const ACE_TCHAR * = 0, void * = 0) {} - ~ACE_Barrier (void) {} - int wait (void) { ACE_NOTSUP_RETURN (-1); } - void dump (void) const {} + ~ACE_Barrier () = default; + int wait () { ACE_NOTSUP_RETURN (-1); } + void dump () const {} }; ACE_END_VERSIONED_NAMESPACE_DECL @@ -149,9 +147,8 @@ protected: ACE_Sub_Barrier *sub_barrier_[2]; private: - // = Prevent assignment and initialization. - void operator= (const ACE_Barrier &); - ACE_Barrier (const ACE_Barrier &); + void operator= (const ACE_Barrier &) = delete; + ACE_Barrier (const ACE_Barrier &) = delete; }; /** diff --git a/ACE/ace/Base_Thread_Adapter.inl b/ACE/ace/Base_Thread_Adapter.inl index f2ea0636e59..667b9f50a3a 100644 --- a/ACE/ace/Base_Thread_Adapter.inl +++ b/ACE/ace/Base_Thread_Adapter.inl @@ -36,7 +36,7 @@ ACE_Base_Thread_Adapter::entry_point () #ifdef ACE_USES_GPROF ACE_INLINE itimerval* -ACE_Base_Thread_Adapter::timerval (void) +ACE_Base_Thread_Adapter::timerval () { return &(this->itimer_); } diff --git a/ACE/ace/CDR_Base.cpp b/ACE/ace/CDR_Base.cpp index 05312ecfd61..cf3a56904c5 100644 --- a/ACE/ace/CDR_Base.cpp +++ b/ACE/ace/CDR_Base.cpp @@ -22,14 +22,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL #if defined (NONNATIVE_LONGDOUBLE) -static const ACE_INT16 max_eleven_bit = 0x3ff; -static const ACE_INT16 max_fifteen_bit = 0x3fff; +static constexpr ACE_INT16 max_eleven_bit = 0x3ff; +static constexpr ACE_INT16 max_fifteen_bit = 0x3fff; #endif /* NONNATIVE_LONGDOUBLE */ -// // See comments in CDR_Base.inl about optimization cases for swap_XX_array. -// - void ACE_CDR::swap_2_array (char const * orig, char* target, size_t n) { diff --git a/ACE/ace/Cache_Map_Manager_T.h b/ACE/ace/Cache_Map_Manager_T.h index 38bee2de970..a090df83683 100644 --- a/ACE/ace/Cache_Map_Manager_T.h +++ b/ACE/ace/Cache_Map_Manager_T.h @@ -94,7 +94,7 @@ public: /// @a size entries. ACE_Cache_Map_Manager (CACHING_STRATEGY &caching_strategy, size_t size = ACE_DEFAULT_MAP_SIZE, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = nullptr); /// Close down a <Cache_Map_Manager> and release dynamically allocated /// resources. @@ -102,7 +102,7 @@ public: /// Initialize a cache with size @a length. int open (size_t length = ACE_DEFAULT_MAP_SIZE, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = nullptr); /// Close down a cache and release dynamically allocated resources. int close (void); diff --git a/ACE/ace/Cleanup.h b/ACE/ace/Cleanup.h index 7f839901d1f..08e26bac57c 100644 --- a/ACE/ace/Cleanup.h +++ b/ACE/ace/Cleanup.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/Codecs.h b/ACE/ace/Codecs.h index 6440e7dad8c..4809f4a0fa8 100644 --- a/ACE/ace/Codecs.h +++ b/ACE/ace/Codecs.h @@ -81,12 +81,11 @@ public: protected: // Prevent default construction. - ACE_Base64 (void) {} + ACE_Base64 () = default; private: - // Preventing copying and assignment. - ACE_Base64 (ACE_Base64 const &); - ACE_Base64 & operator= (ACE_Base64 const &); + ACE_Base64 (ACE_Base64 const &) = delete; + ACE_Base64 & operator= (ACE_Base64 const &) = delete; /// Initialize the tables for encoding/decoding. static void init (void); diff --git a/ACE/ace/Condition_Attributes.cpp b/ACE/ace/Condition_Attributes.cpp index 9257b602dfe..525a88c5f2a 100644 --- a/ACE/ace/Condition_Attributes.cpp +++ b/ACE/ace/Condition_Attributes.cpp @@ -2,8 +2,6 @@ /** * @file Condition_Attributes.cpp * - * Originally in Synch.cpp - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ diff --git a/ACE/ace/Condition_Attributes.h b/ACE/ace/Condition_Attributes.h index b678536da34..ef89629acf7 100644 --- a/ACE/ace/Condition_Attributes.h +++ b/ACE/ace/Condition_Attributes.h @@ -4,8 +4,6 @@ /** * @file Condition_Attributes.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== @@ -41,9 +39,8 @@ protected: ACE_condattr_t attributes_; private: - // = Prevent assignment and initialization. - void operator= (const ACE_Condition_Attributes &); - ACE_Condition_Attributes (const ACE_Condition_Attributes &); + void operator= (const ACE_Condition_Attributes &) = delete; + ACE_Condition_Attributes (const ACE_Condition_Attributes &) = delete; }; template <class TIME_POLICY> @@ -56,12 +53,11 @@ public: {} /// Destructor - ~ACE_Condition_Attributes_T () {} + ~ACE_Condition_Attributes_T () = default; private: - // = Prevent assignment and initialization. - void operator= (const ACE_Condition_Attributes_T<TIME_POLICY> &); - ACE_Condition_Attributes_T (const ACE_Condition_Attributes_T<TIME_POLICY> &); + void operator= (const ACE_Condition_Attributes_T<TIME_POLICY> &) = delete; + ACE_Condition_Attributes_T (const ACE_Condition_Attributes_T<TIME_POLICY> &) = delete; }; class ACE_Monotonic_Time_Policy; @@ -78,9 +74,8 @@ public: ~ACE_Condition_Attributes_T (); private: - // = Prevent assignment and initialization. - void operator= (const ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy> &); - ACE_Condition_Attributes_T (const ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy> &); + void operator= (const ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy> &) = delete; + ACE_Condition_Attributes_T (const ACE_Condition_Attributes_T<ACE_Monotonic_Time_Policy> &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp index 73e60ef7d20..8b05327c5ac 100644 --- a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp +++ b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp @@ -3,8 +3,6 @@ /** * @file Condition_Recursive_Thread_Mutex.cpp * - * Originally in Synch.cpp - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.h b/ACE/ace/Condition_Recursive_Thread_Mutex.h index 816f08c7f2c..5a641784156 100644 --- a/ACE/ace/Condition_Recursive_Thread_Mutex.h +++ b/ACE/ace/Condition_Recursive_Thread_Mutex.h @@ -4,8 +4,6 @@ /** * @file Condition_Recursive_Thread_Mutex.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== @@ -87,9 +85,8 @@ public: void dump () const; private: - // = Prevent assignment and copying. - void operator= (const ACE_Condition<ACE_Recursive_Thread_Mutex> &); - ACE_Condition (const ACE_Condition<ACE_Recursive_Thread_Mutex> &); + void operator= (const ACE_Condition<ACE_Recursive_Thread_Mutex> &) = delete; + ACE_Condition (const ACE_Condition<ACE_Recursive_Thread_Mutex> &) = delete; private: /// A normal (i.e., non-recursive) condition variable. diff --git a/ACE/ace/Condition_T.h b/ACE/ace/Condition_T.h index 0a79a413f9e..34523edb875 100644 --- a/ACE/ace/Condition_T.h +++ b/ACE/ace/Condition_T.h @@ -4,8 +4,6 @@ /** * @file Condition_T.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== @@ -114,7 +112,6 @@ protected: MUTEX &mutex_; private: - // = Prevent assignment and initialization. void operator= (const ACE_Condition<MUTEX> &) = delete; ACE_Condition (const ACE_Condition<MUTEX> &) = delete; }; diff --git a/ACE/ace/Condition_Thread_Mutex.cpp b/ACE/ace/Condition_Thread_Mutex.cpp index fbc64708bdc..59a8a7f4de6 100644 --- a/ACE/ace/Condition_Thread_Mutex.cpp +++ b/ACE/ace/Condition_Thread_Mutex.cpp @@ -2,8 +2,6 @@ /** * @file Condition_Thread_Mutex.cpp * - * Originally in Synch.cpp - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ diff --git a/ACE/ace/Condition_Thread_Mutex.h b/ACE/ace/Condition_Thread_Mutex.h index 855adcba377..73346f0c97e 100644 --- a/ACE/ace/Condition_Thread_Mutex.h +++ b/ACE/ace/Condition_Thread_Mutex.h @@ -4,8 +4,6 @@ /** * @file Condition_Thread_Mutex.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== @@ -125,9 +123,8 @@ protected: bool removed_; private: - // = Prevent assignment and initialization. - void operator= (const ACE_Condition<ACE_Thread_Mutex> &); - ACE_Condition (const ACE_Condition<ACE_Thread_Mutex> &); + void operator= (const ACE_Condition<ACE_Thread_Mutex> &) = delete; + ACE_Condition (const ACE_Condition<ACE_Thread_Mutex> &) = delete; }; typedef ACE_Condition<ACE_Thread_Mutex> ACE_Condition_Thread_Mutex; diff --git a/ACE/ace/Configuration.cpp b/ACE/ace/Configuration.cpp index 9242671776b..b0af75777c3 100644 --- a/ACE/ace/Configuration.cpp +++ b/ACE/ace/Configuration.cpp @@ -423,7 +423,7 @@ ACE_Configuration::operator!= (const ACE_Configuration& rhs) const #if defined (ACE_WIN32) && !defined (ACE_LACKS_WIN32_REGISTRY) -static const int ACE_DEFAULT_BUFSIZE = 256; +static constexpr int ACE_DEFAULT_BUFSIZE = 256; static const ACE_TCHAR *temp_name (const ACE_TCHAR *name) { diff --git a/ACE/ace/Connector.h b/ACE/ace/Connector.h index b342fe1180f..cb98eb22183 100644 --- a/ACE/ace/Connector.h +++ b/ACE/ace/Connector.h @@ -38,7 +38,7 @@ template <class SVC_HANDLER> class ACE_Connector_Base { public: - virtual ~ACE_Connector_Base (void) {} + virtual ~ACE_Connector_Base () = default; /// Initialize the Svc_Handler. virtual void initialize_svc_handler (ACE_HANDLE handle, @@ -46,7 +46,7 @@ public: /// Return the handle set representing the non-blocking connects in /// progress. - virtual ACE_Unbounded_Set<ACE_HANDLE> &non_blocking_handles (void) = 0; + virtual ACE_Unbounded_Set<ACE_HANDLE> &non_blocking_handles () = 0; }; /** @@ -64,7 +64,7 @@ public: long timer_id); /// Destructor. - ~ACE_NonBlocking_Connect_Handler (void); + ~ACE_NonBlocking_Connect_Handler (); /// Close up and return underlying SVC_HANDLER through @c sh. /** @@ -81,16 +81,16 @@ public: bool close (SVC_HANDLER *&sh); /// Get SVC_HANDLER. - SVC_HANDLER *svc_handler (void); + SVC_HANDLER *svc_handler (); /// Get handle. - ACE_HANDLE handle (void); + ACE_HANDLE handle (); /// Set handle. void handle (ACE_HANDLE); /// Get timer id. - long timer_id (void); + long timer_id (); /// Set timer id. void timer_id (long timer_id); @@ -113,7 +113,7 @@ public: virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg); /// Should Reactor resume us if we have been suspended before the upcall? - virtual int resume_handler (void); + virtual int resume_handler (); /// Dump the state of an object. void dump () const; @@ -191,7 +191,7 @@ public: int flags = 0); /// Shutdown a connector and release resources. - virtual ~ACE_Connector (void); + virtual ~ACE_Connector (); // = Connection establishment methods. @@ -260,10 +260,10 @@ public: /// Close down the Connector. All pending non-blocking connects are /// canceled and the corresponding svc_handler is closed. - virtual int close (void); + virtual int close (); /// Return the underlying PEER_CONNECTOR object. - virtual PEER_CONNECTOR &connector (void) const; + virtual PEER_CONNECTOR &connector () const; /// Initialize Svc_Handler. virtual void initialize_svc_handler (ACE_HANDLE handle, @@ -273,7 +273,7 @@ public: virtual void reactor (ACE_Reactor *reactor); /// Get Reactor. - virtual ACE_Reactor *reactor (void) const; + virtual ACE_Reactor *reactor () const; /// Dump the state of an object. void dump () const; @@ -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; @@ -364,11 +364,11 @@ protected: // = Service management hooks. /// Default version does no work and returns -1. Must be overloaded /// by application developer to do anything meaningful. - virtual int suspend (void); + virtual int suspend (); /// Default version does no work and returns -1. Must be overloaded /// by application developer to do anything meaningful. - virtual int resume (void); + virtual int resume (); private: /// This is the peer connector factory. @@ -387,7 +387,6 @@ private: /// Handle set representing the non-blocking connects in progress. ACE_Unbounded_Set<ACE_HANDLE> non_blocking_handles_; - }; /** diff --git a/ACE/ace/DEV.cpp b/ACE/ace/DEV.cpp index ca87efd7056..984892b9aaf 100644 --- a/ACE/ace/DEV.cpp +++ b/ACE/ace/DEV.cpp @@ -10,8 +10,6 @@ #include "ace/DEV.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_DEV) diff --git a/ACE/ace/DEV_IO.cpp b/ACE/ace/DEV_IO.cpp index 87394d9dc1b..617d72e80b8 100644 --- a/ACE/ace/DEV_IO.cpp +++ b/ACE/ace/DEV_IO.cpp @@ -8,9 +8,6 @@ #include "ace/DEV_IO.inl" #endif /* __ACE_INLINE__ */ - - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_DEV_IO) diff --git a/ACE/ace/DLL.cpp b/ACE/ace/DLL.cpp index 27a0e83d40d..b5880d09d0c 100644 --- a/ACE/ace/DLL.cpp +++ b/ACE/ace/DLL.cpp @@ -9,9 +9,7 @@ #include <algorithm> - - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL +ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Default constructor. Also, by default, the object will be closed // before it is destroyed. diff --git a/ACE/ace/Date_Time.h b/ACE/ace/Date_Time.h index 4c3484a727e..8f9dde69a74 100644 --- a/ACE/ace/Date_Time.h +++ b/ACE/ace/Date_Time.h @@ -31,7 +31,7 @@ class ACE_Export ACE_Date_Time { public: /// Constructor initializes current time/date info. - ACE_Date_Time (void); + ACE_Date_Time (); /// Constructor initializes with the given ACE_Time_Value explicit ACE_Date_Time (const ACE_Time_Value& timevalue); @@ -48,55 +48,55 @@ public: long wday = 0); /// Update to the current time/date. - void update (void); + void update (); /// Update to the given ACE_Time_Value void update (const ACE_Time_Value& timevalue); /// Get day. - long day (void) const; + long day () const; /// Set day. void day (long day); /// Get month. - long month (void) const; + long month () const; /// Set month. void month (long month); /// Get year. - long year (void) const; + long year () const; /// Set year. void year (long year); /// Get hour. - long hour (void) const; + long hour () const; /// Set hour. void hour (long hour); /// Get minute. - long minute (void) const; + long minute () const; /// Set minute. void minute (long minute); /// Get second. - long second (void) const; + long second () const; /// Set second. void second (long second); /// Get microsec. - long microsec (void) const; + long microsec () const; /// Set microsec. void microsec (long microsec); /// Get weekday. - long weekday (void) const; + long weekday () const; /// Set weekday. void weekday (long wday); diff --git a/ACE/ace/Date_Time.inl b/ACE/ace/Date_Time.inl index 196f572befd..ef2a39b4d3e 100644 --- a/ACE/ace/Date_Time.inl +++ b/ACE/ace/Date_Time.inl @@ -40,7 +40,7 @@ ACE_Date_Time::update (const ACE_Time_Value& timevalue) } ACE_INLINE void -ACE_Date_Time::update (void) +ACE_Date_Time::update () { ACE_TRACE ("ACE_Date_Time::update"); @@ -48,7 +48,7 @@ ACE_Date_Time::update (void) } ACE_INLINE -ACE_Date_Time::ACE_Date_Time (void) +ACE_Date_Time::ACE_Date_Time () { ACE_TRACE ("ACE_Date_Time::ACE_Date_Time"); this->update (); @@ -87,7 +87,7 @@ ACE_Date_Time::ACE_Date_Time (long day, // get day ACE_INLINE long -ACE_Date_Time::day (void) const +ACE_Date_Time::day () const { ACE_TRACE ("ACE_Date_Time::day"); return day_; @@ -103,7 +103,7 @@ ACE_Date_Time::day (long day) // get month ACE_INLINE long -ACE_Date_Time::month (void) const +ACE_Date_Time::month () const { ACE_TRACE ("ACE_Date_Time::month"); return month_; @@ -119,7 +119,7 @@ ACE_Date_Time::month (long month) // get year ACE_INLINE long -ACE_Date_Time::year (void) const +ACE_Date_Time::year () const { ACE_TRACE ("ACE_Date_Time::year"); return year_; @@ -135,7 +135,7 @@ ACE_Date_Time::year (long year) // get hour ACE_INLINE long -ACE_Date_Time::hour (void) const +ACE_Date_Time::hour () const { ACE_TRACE ("ACE_Date_Time::hour"); return hour_; @@ -151,7 +151,7 @@ ACE_Date_Time::hour (long hour) // get minute ACE_INLINE long -ACE_Date_Time::minute (void) const +ACE_Date_Time::minute () const { ACE_TRACE ("ACE_Date_Time::minute"); return minute_; @@ -167,7 +167,7 @@ ACE_Date_Time::minute (long minute) // get second ACE_INLINE long -ACE_Date_Time::second (void) const +ACE_Date_Time::second () const { ACE_TRACE ("ACE_Date_Time::second"); return second_; @@ -183,7 +183,7 @@ ACE_Date_Time::second (long second) // get microsec ACE_INLINE long -ACE_Date_Time::microsec (void) const +ACE_Date_Time::microsec () const { ACE_TRACE ("ACE_Date_Time::microsec"); return microsec_; @@ -199,7 +199,7 @@ ACE_Date_Time::microsec (long microsec) // get wday ACE_INLINE long -ACE_Date_Time::weekday (void) const +ACE_Date_Time::weekday () const { ACE_TRACE ("ACE_Date_Time::weekday"); return wday_; diff --git a/ACE/ace/Default_Constants.h b/ACE/ace/Default_Constants.h index 383679a1eac..dc1f2e6de40 100644 --- a/ACE/ace/Default_Constants.h +++ b/ACE/ace/Default_Constants.h @@ -364,7 +364,7 @@ // elements. # define ACE_FREE_LIST_WITH_POOL 1 -// A simple free list which doen't allocate/deallocate elements. +// A simple free list which doesn't allocate/deallocate elements. # define ACE_PURE_FREE_LIST 2 # if defined (ACE_WIN32) diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp index 8229aafbe57..46c8ae9cc03 100644 --- a/ACE/ace/Dev_Poll_Reactor.cpp +++ b/ACE/ace/Dev_Poll_Reactor.cpp @@ -24,7 +24,6 @@ # include "ace/Dev_Poll_Reactor.inl" #endif /* __ACE_INLINE__ */ - #include "ace/Handle_Set.h" #include "ace/Reactor.h" #include "ace/Timer_Heap.h" diff --git a/ACE/ace/Dump.h b/ACE/ace/Dump.h index 09eafd1a6f4..c07193a5b0b 100644 --- a/ACE/ace/Dump.h +++ b/ACE/ace/Dump.h @@ -72,10 +72,10 @@ public: ACE_Dumpable (const void *); /// This pure virtual method must be filled in by a subclass. - virtual void dump (void) const = 0; + virtual void dump () const = 0; protected: - virtual ~ACE_Dumpable (void); + virtual ~ACE_Dumpable (); private: /// Pointer to the object that is being stored. diff --git a/ACE/ace/Dynamic_Message_Strategy.cpp b/ACE/ace/Dynamic_Message_Strategy.cpp index 600e9afc60a..5bad52c38b2 100644 --- a/ACE/ace/Dynamic_Message_Strategy.cpp +++ b/ACE/ace/Dynamic_Message_Strategy.cpp @@ -12,7 +12,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // ctor - ACE_Dynamic_Message_Strategy::ACE_Dynamic_Message_Strategy (unsigned long static_bit_field_mask, unsigned long static_bit_field_shift, unsigned long dynamic_priority_max, diff --git a/ACE/ace/Dynamic_Service.cpp b/ACE/ace/Dynamic_Service.cpp index 8bf6871d1d9..e771a814b2b 100644 --- a/ACE/ace/Dynamic_Service.cpp +++ b/ACE/ace/Dynamic_Service.cpp @@ -15,7 +15,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL - template <class TYPE> TYPE * ACE_Dynamic_Service<TYPE>::instance (const ACE_TCHAR *name) { diff --git a/ACE/ace/ETCL/ETCL_Constraint.cpp b/ACE/ace/ETCL/ETCL_Constraint.cpp index 4e8f6d129a8..3cb945b39ae 100644 --- a/ACE/ace/ETCL/ETCL_Constraint.cpp +++ b/ACE/ace/ETCL/ETCL_Constraint.cpp @@ -12,11 +12,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ETCL_Constraint::ETCL_Constraint (void) +ETCL_Constraint::ETCL_Constraint () { } -ETCL_Constraint::~ETCL_Constraint (void) +ETCL_Constraint::~ETCL_Constraint () { } @@ -29,8 +29,7 @@ ETCL_Constraint::accept (ETCL_Constraint_Visitor * /* visitor */) // **************************************************************** ETCL_Literal_Constraint::ETCL_Literal_Constraint ( - const ETCL_Literal_Constraint & lit - ) + const ETCL_Literal_Constraint & lit) : ETCL_Constraint(), type_ (ACE_ETCL_UNKNOWN) { @@ -50,8 +49,7 @@ ETCL_Literal_Constraint::ETCL_Literal_Constraint ( } ETCL_Literal_Constraint::ETCL_Literal_Constraint ( - ACE_CDR::Boolean boolean - ) + ACE_CDR::Boolean boolean) : type_ (ACE_ETCL_BOOLEAN) { this->op_.bool_ = boolean; @@ -122,7 +120,7 @@ ETCL_Literal_Constraint::operator ACE_CDR::ULong (void) const } } -ETCL_Literal_Constraint::operator ACE_CDR::Long (void) const +ETCL_Literal_Constraint::operator ACE_CDR::Long () const { switch (this->type_) { @@ -147,7 +145,7 @@ ETCL_Literal_Constraint::operator ACE_CDR::Long (void) const } } -ETCL_Literal_Constraint::operator ACE_CDR::Double (void) const +ETCL_Literal_Constraint::operator ACE_CDR::Double () const { switch (this->type_) { @@ -163,7 +161,7 @@ ETCL_Literal_Constraint::operator ACE_CDR::Double (void) const } } -ETCL_Literal_Constraint::operator const char* (void) const +ETCL_Literal_Constraint::operator const char* () const { switch (this->type_) { @@ -537,9 +535,6 @@ ETCL_Component_Array::accept (ETCL_Constraint_Visitor *visitor) // **************************************************************** -ETCL_Special::~ETCL_Special (void) -{} - int ETCL_Special::accept (ETCL_Constraint_Visitor *visitor) { diff --git a/ACE/ace/ETCL/ETCL_Constraint.h b/ACE/ace/ETCL/ETCL_Constraint.h index 1e4ddf7aac7..96dc8e1909b 100644 --- a/ACE/ace/ETCL/ETCL_Constraint.h +++ b/ACE/ace/ETCL/ETCL_Constraint.h @@ -262,16 +262,16 @@ private: class ACE_ETCL_Export ETCL_Special : public ETCL_Constraint { public: - ETCL_Special (); + ETCL_Special () = default; ETCL_Special (int type); - virtual ~ETCL_Special (); + ~ETCL_Special () override = default; int type () const; virtual int accept (ETCL_Constraint_Visitor *visitor); private: - int type_; + int type_ {}; }; class ACE_ETCL_Export ETCL_Component : public ETCL_Constraint @@ -387,7 +387,7 @@ private: class ACE_ETCL_Export ETCL_Preference : public ETCL_Constraint { public: - ETCL_Preference (); + ETCL_Preference () = default; ETCL_Preference (int type, ETCL_Constraint *subexpr = 0); virtual ~ETCL_Preference (); @@ -398,8 +398,8 @@ public: virtual int accept (ETCL_Constraint_Visitor *visitor); private: - int type_; - ETCL_Constraint *subexpr_; + int type_ {}; + ETCL_Constraint *subexpr_ {}; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/ETCL/ETCL_Constraint.inl b/ACE/ace/ETCL/ETCL_Constraint.inl index b10fd67cd31..6caa59440bf 100644 --- a/ACE/ace/ETCL/ETCL_Constraint.inl +++ b/ACE/ace/ETCL/ETCL_Constraint.inl @@ -159,11 +159,6 @@ ETCL_Component_Array::component () const // **************************************************************** ACE_INLINE -ETCL_Special::ETCL_Special () - : type_ (0) -{} - -ACE_INLINE ETCL_Special::ETCL_Special (int type) : type_ (type) {} @@ -306,12 +301,6 @@ ETCL_Binary_Expr::lhs () const // **************************************************************** ACE_INLINE -ETCL_Preference::ETCL_Preference () - : type_ (0), - subexpr_ (0) -{} - -ACE_INLINE ETCL_Preference::ETCL_Preference (int type, ETCL_Constraint *subexpr) : type_ (type), diff --git a/ACE/ace/ETCL/ETCL_l.cpp b/ACE/ace/ETCL/ETCL_l.cpp index 05f062af484..237c26c934a 100644 --- a/ACE/ace/ETCL/ETCL_l.cpp +++ b/ACE/ace/ETCL/ETCL_l.cpp @@ -462,7 +462,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL ACE_BEGIN_VERSIONED_NAMESPACE_DECL static const char* extract_string(char*); -//static const char * extract_string(char*); #define YY_LEX_DEBUG diff --git a/ACE/ace/Event.h b/ACE/ace/Event.h index d0ebcb0c160..bd1270deea3 100644 --- a/ACE/ace/Event.h +++ b/ACE/ace/Event.h @@ -4,8 +4,6 @@ /** * @file Event.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== @@ -63,14 +61,12 @@ public: ACE_ALLOC_HOOK_DECLARE; protected: - /// The policy to return the current time of day TIME_POLICY time_policy_; private: - // = Prevent copying. - ACE_Event_T (const ACE_Event_T<TIME_POLICY>& event); - const ACE_Event_T &operator= (const ACE_Event_T<TIME_POLICY> &rhs); + ACE_Event_T (const ACE_Event_T<TIME_POLICY>& event) = delete; + const ACE_Event_T &operator= (const ACE_Event_T<TIME_POLICY> &rhs) = delete; }; typedef ACE_Event_T<ACE_System_Time_Policy> ACE_Event; diff --git a/ACE/ace/Event_Base.h b/ACE/ace/Event_Base.h index aaef456772b..da982122ff1 100644 --- a/ACE/ace/Event_Base.h +++ b/ACE/ace/Event_Base.h @@ -4,8 +4,6 @@ /** * @file Event_Base.h * - * Moved from Synch.h. - * * @author Martin Corino <mcorino@remedy.nl> */ //========================================================================== @@ -124,9 +122,8 @@ protected: bool removed_; private: - // = Prevent copying. - ACE_Event_Base (const ACE_Event_Base& event); - const ACE_Event_Base &operator= (const ACE_Event_Base &rhs); + ACE_Event_Base (const ACE_Event_Base& event) = delete; + const ACE_Event_Base &operator= (const ACE_Event_Base &rhs) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL 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/Event_Handler_T.h b/ACE/ace/Event_Handler_T.h index e4a1c6bbe96..d904aec15be 100644 --- a/ACE/ace/Event_Handler_T.h +++ b/ACE/ace/Event_Handler_T.h @@ -110,28 +110,28 @@ public: // = Get/set the target pointer-to-method used for dispatching. - GET_HANDLE handle_get (void); + GET_HANDLE handle_get (); void handle_get (GET_HANDLE); - SET_HANDLE handle_set (void); + SET_HANDLE handle_set (); void handle_set (SET_HANDLE); - IO_HANDLER input_handler (void); + IO_HANDLER input_handler (); void input_handler (IO_HANDLER); - IO_HANDLER output_handler (void); + IO_HANDLER output_handler (); void output_handler (IO_HANDLER); - IO_HANDLER except_handler (void); + IO_HANDLER except_handler (); void except_handler (IO_HANDLER); - TO_HANDLER to_handler (void); + TO_HANDLER to_handler (); void to_handler (TO_HANDLER); - CL_HANDLER cl_handler (void); + CL_HANDLER cl_handler (); void cl_handler (CL_HANDLER); - SIG_HANDLER sig_handler (void); + SIG_HANDLER sig_handler (); void sig_handler (SIG_HANDLER); /// Dump the state of an object. diff --git a/ACE/ace/FIFO_Recv.cpp b/ACE/ace/FIFO_Recv.cpp index c7569baa29a..2fd920b13a2 100644 --- a/ACE/ace/FIFO_Recv.cpp +++ b/ACE/ace/FIFO_Recv.cpp @@ -9,8 +9,6 @@ #include "ace/FIFO_Recv.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Recv) diff --git a/ACE/ace/FIFO_Send.cpp b/ACE/ace/FIFO_Send.cpp index 3c37bd53410..fc92f1c172b 100644 --- a/ACE/ace/FIFO_Send.cpp +++ b/ACE/ace/FIFO_Send.cpp @@ -8,8 +8,6 @@ #include "ace/FIFO_Send.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Send) diff --git a/ACE/ace/FIFO_Send.h b/ACE/ace/FIFO_Send.h index 01aa7d52836..0ffa228a0d8 100644 --- a/ACE/ace/FIFO_Send.h +++ b/ACE/ace/FIFO_Send.h @@ -39,7 +39,7 @@ public: /// To use non-blocking behavior include ACE_NONBLOCK in @a flags. //@{ /// Default constructor. - ACE_FIFO_Send (void); + ACE_FIFO_Send (); /// Open up a bytestream named pipe for writing. ACE_FIFO_Send (const ACE_TCHAR *rendezvous, diff --git a/ACE/ace/FIFO_Send_Msg.cpp b/ACE/ace/FIFO_Send_Msg.cpp index d97e0fc3b01..117d8c96bdb 100644 --- a/ACE/ace/FIFO_Send_Msg.cpp +++ b/ACE/ace/FIFO_Send_Msg.cpp @@ -10,8 +10,6 @@ #include "ace/FIFO_Send_Msg.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_FIFO_Send_Msg) diff --git a/ACE/ace/FILE.cpp b/ACE/ace/FILE.cpp index 94df37e49a1..9cf86ef6228 100644 --- a/ACE/ace/FILE.cpp +++ b/ACE/ace/FILE.cpp @@ -14,8 +14,6 @@ #include "ace/FILE.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_FILE) diff --git a/ACE/ace/FILE_Addr.cpp b/ACE/ace/FILE_Addr.cpp index 624d888d96e..733339af790 100644 --- a/ACE/ace/FILE_Addr.cpp +++ b/ACE/ace/FILE_Addr.cpp @@ -9,8 +9,6 @@ #include "ace/FILE_Addr.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_FILE_Addr) diff --git a/ACE/ace/FILE_Connector.cpp b/ACE/ace/FILE_Connector.cpp index b49f8dcfff7..c9585a99633 100644 --- a/ACE/ace/FILE_Connector.cpp +++ b/ACE/ace/FILE_Connector.cpp @@ -9,8 +9,6 @@ #include "ace/FILE_Connector.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_FILE_Connector) diff --git a/ACE/ace/FILE_IO.cpp b/ACE/ace/FILE_IO.cpp index 315779568b5..681b6c53885 100644 --- a/ACE/ace/FILE_IO.cpp +++ b/ACE/ace/FILE_IO.cpp @@ -12,8 +12,6 @@ #include "ace/FILE_IO.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_FILE_IO) diff --git a/ACE/ace/File_Lock.cpp b/ACE/ace/File_Lock.cpp index aae97dd8afc..64f69138307 100644 --- a/ACE/ace/File_Lock.cpp +++ b/ACE/ace/File_Lock.cpp @@ -8,8 +8,6 @@ #include "ace/File_Lock.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_File_Lock) diff --git a/ACE/ace/File_Lock.h b/ACE/ace/File_Lock.h index 45ea9b14bde..12c06e062a3 100644 --- a/ACE/ace/File_Lock.h +++ b/ACE/ace/File_Lock.h @@ -153,9 +153,8 @@ protected: bool const unlink_in_destructor_; private: - // = Prevent assignment and initialization. - void operator= (const ACE_File_Lock &); - ACE_File_Lock (const ACE_File_Lock &); + void operator= (const ACE_File_Lock &) = delete; + ACE_File_Lock (const ACE_File_Lock &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Functor.cpp b/ACE/ace/Functor.cpp index 8d41b4062f9..6fff54a99b5 100644 --- a/ACE/ace/Functor.cpp +++ b/ACE/ace/Functor.cpp @@ -29,8 +29,6 @@ #include "ace/Functor.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Command_Base::~ACE_Command_Base () diff --git a/ACE/ace/Functor_T.h b/ACE/ace/Functor_T.h index c3b6deb2bb1..25846ef109e 100644 --- a/ACE/ace/Functor_T.h +++ b/ACE/ace/Functor_T.h @@ -180,7 +180,6 @@ ACE_END_VERSIONED_NAMESPACE_DECL #include "ace/Functor_T.inl" #endif /* __ACE_INLINE__ */ - #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) #include "ace/Functor_T.cpp" #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */ diff --git a/ACE/ace/Guard_T.h b/ACE/ace/Guard_T.h index e85ff7f5dfa..575c17a91be 100644 --- a/ACE/ace/Guard_T.h +++ b/ACE/ace/Guard_T.h @@ -4,8 +4,6 @@ /** * @file Guard_T.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== @@ -123,7 +121,6 @@ protected: int owner_; private: - // = Prevent assignment and initialization. void operator= (const ACE_Guard<ACE_LOCK> &) = delete; ACE_Guard (const ACE_Guard<ACE_LOCK> &) = delete; }; diff --git a/ACE/ace/Hash_Cache_Map_Manager_T.h b/ACE/ace/Hash_Cache_Map_Manager_T.h index 1f4dc540448..0865ffa7a98 100644 --- a/ACE/ace/Hash_Cache_Map_Manager_T.h +++ b/ACE/ace/Hash_Cache_Map_Manager_T.h @@ -75,7 +75,7 @@ class ACE_Hash_Cache_Map_Manager : public ACE_CACHE_MAP_MANAGER /// Initialize a <Hash_Cache_Map_Manager> with @a size entries. ACE_Hash_Cache_Map_Manager (CACHING_STRATEGY &caching_s, size_t size = ACE_DEFAULT_MAP_SIZE, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = nullptr); /// Close down a <Cache_Map_Manager> and release dynamically allocated /// resources. diff --git a/ACE/ace/IPC_SAP.cpp b/ACE/ace/IPC_SAP.cpp index c88f8830f55..a7a0aa3efc6 100644 --- a/ACE/ace/IPC_SAP.cpp +++ b/ACE/ace/IPC_SAP.cpp @@ -13,8 +13,6 @@ #include "ace/IPC_SAP.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_IPC_SAP) diff --git a/ACE/ace/Intrusive_List.cpp b/ACE/ace/Intrusive_List.cpp index 54bafc4c7b7..0d4c5fdb690 100644 --- a/ACE/ace/Intrusive_List.cpp +++ b/ACE/ace/Intrusive_List.cpp @@ -13,18 +13,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -template <class T> -ACE_Intrusive_List<T>::ACE_Intrusive_List () - : head_ (0) - , tail_ (0) -{ -} - -template<class T> -ACE_Intrusive_List<T>::~ACE_Intrusive_List () -{ -} - template<class T> void ACE_Intrusive_List<T>::push_back (T *node) { diff --git a/ACE/ace/Intrusive_List.h b/ACE/ace/Intrusive_List.h index d5ba0534d41..c5017cd730c 100644 --- a/ACE/ace/Intrusive_List.h +++ b/ACE/ace/Intrusive_List.h @@ -57,10 +57,10 @@ class ACE_Intrusive_List public: /// Constructor. Use user specified allocation strategy /// if specified. - ACE_Intrusive_List (); + ACE_Intrusive_List () = default; /// Destructor. - ~ACE_Intrusive_List (); + ~ACE_Intrusive_List () = default; // = Check boundary conditions. @@ -112,10 +112,10 @@ private: private: /// Head of the list - T *head_; + T *head_ {}; /// Tail of the list - T *tail_; + T *tail_ {}; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Intrusive_List_Node.cpp b/ACE/ace/Intrusive_List_Node.cpp index 74f27993d02..52d1d2d6e2d 100644 --- a/ACE/ace/Intrusive_List_Node.cpp +++ b/ACE/ace/Intrusive_List_Node.cpp @@ -11,15 +11,4 @@ #include "ace/Intrusive_List_Node.inl" #endif /* __ACE_INLINE__ */ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -template<class T> -ACE_Intrusive_List_Node<T>::ACE_Intrusive_List_Node () - : prev_ (0) - , next_ (0) -{ -} - -ACE_END_VERSIONED_NAMESPACE_DECL - #endif /* ACE_INTRUSIVE_LIST_NODE_CPP */ diff --git a/ACE/ace/Intrusive_List_Node.h b/ACE/ace/Intrusive_List_Node.h index 366083712e5..8fe5c40b205 100644 --- a/ACE/ace/Intrusive_List_Node.h +++ b/ACE/ace/Intrusive_List_Node.h @@ -56,12 +56,12 @@ protected: * The constructor is protected, because only derived classes should * be instantiated. */ - ACE_Intrusive_List_Node (); + ACE_Intrusive_List_Node () = default; private: /// Head and tail of the list - T *prev_; - T *next_; + T *prev_ {}; + T *next_ {}; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/LSOCK.cpp b/ACE/ace/LSOCK.cpp index ef57f5448c7..f09bb8a3d1a 100644 --- a/ACE/ace/LSOCK.cpp +++ b/ACE/ace/LSOCK.cpp @@ -1,7 +1,5 @@ #include "ace/LSOCK.h" - - #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) #include "ace/Log_Category.h" diff --git a/ACE/ace/LSOCK_CODgram.cpp b/ACE/ace/LSOCK_CODgram.cpp index 6f28664991a..51f51b31b90 100644 --- a/ACE/ace/LSOCK_CODgram.cpp +++ b/ACE/ace/LSOCK_CODgram.cpp @@ -6,8 +6,6 @@ # include "ace/Malloc_Base.h" #endif /* ACE_HAS_ALLOC_HOOKS */ - - #if !defined (__ACE_INLINE__) #include "ace/LSOCK_CODgram.inl" #endif /* __ACE_INLINE__ */ diff --git a/ACE/ace/LSOCK_Connector.cpp b/ACE/ace/LSOCK_Connector.cpp index 45bb9c67249..3a0f6064037 100644 --- a/ACE/ace/LSOCK_Connector.cpp +++ b/ACE/ace/LSOCK_Connector.cpp @@ -6,9 +6,6 @@ # include "ace/Malloc_Base.h" #endif /* ACE_HAS_ALLOC_HOOKS */ - - - #if !defined (__ACE_INLINE__) #include "ace/LSOCK_Connector.inl" #endif /* __ACE_INLINE__ */ diff --git a/ACE/ace/LSOCK_Dgram.cpp b/ACE/ace/LSOCK_Dgram.cpp index d544d4d3850..5d19eb56f94 100644 --- a/ACE/ace/LSOCK_Dgram.cpp +++ b/ACE/ace/LSOCK_Dgram.cpp @@ -6,8 +6,6 @@ # include "ace/Malloc_Base.h" #endif /* ACE_HAS_ALLOC_HOOKS */ - - #if !defined (__ACE_INLINE__) #include "ace/LSOCK_Dgram.inl" #endif /* __ACE_INLINE__ */ diff --git a/ACE/ace/LSOCK_Stream.cpp b/ACE/ace/LSOCK_Stream.cpp index 4af5927f1c3..fa2e0c48a37 100644 --- a/ACE/ace/LSOCK_Stream.cpp +++ b/ACE/ace/LSOCK_Stream.cpp @@ -7,8 +7,6 @@ # include "ace/Malloc_Base.h" #endif /* ACE_HAS_ALLOC_HOOKS */ - - #if !defined (__ACE_INLINE__) #include "ace/LSOCK_Stream.inl" #endif /* __ACE_INLINE__ */ diff --git a/ACE/ace/Lib_Find.cpp b/ACE/ace/Lib_Find.cpp index 1ffc040ece9..ea7814a7e4f 100644 --- a/ACE/ace/Lib_Find.cpp +++ b/ACE/ace/Lib_Find.cpp @@ -53,7 +53,6 @@ extern "C" int LIB$FIND_IMAGE_SYMBOL(...); class ACE_LD_Symbol_Registry { public: - typedef ACE_RB_Tree<const ACE_TCHAR*, void*, ACE_Less_Than<const ACE_TCHAR*>, @@ -64,9 +63,9 @@ public: void* find_symbol (const ACE_TCHAR* symname); - ACE_LD_Symbol_Registry () {} -private: + ACE_LD_Symbol_Registry () = default; +private: TREE symbol_registry_; }; diff --git a/ACE/ace/Local_Tokens.cpp b/ACE/ace/Local_Tokens.cpp index 1a8aaac0ad1..b0fa98ad2e5 100644 --- a/ACE/ace/Local_Tokens.cpp +++ b/ACE/ace/Local_Tokens.cpp @@ -10,7 +10,6 @@ #include "ace/Local_Tokens.inl" #endif /* __ACE_INLINE__ */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL void @@ -36,10 +35,6 @@ ACE_Tokens::ACE_Tokens (void) ACE_TRACE ("ACE_Tokens::ACE_Tokens"); } -ACE_Tokens::~ACE_Tokens (void) -{ -} - void ACE_Tokens::make_owner (ACE_TPQ_Entry *caller) { diff --git a/ACE/ace/Local_Tokens.h b/ACE/ace/Local_Tokens.h index 61a366375ae..c420cf92e9e 100644 --- a/ACE/ace/Local_Tokens.h +++ b/ACE/ace/Local_Tokens.h @@ -266,7 +266,7 @@ public: ACE_TPQ_Iterator (ACE_Token_Proxy_Queue &q); /// Destructor. - ~ACE_TPQ_Iterator (void); + ~ACE_TPQ_Iterator () = default; /// Pass back the @a next_item. int next (ACE_TPQ_Entry *&next_item); @@ -308,7 +308,7 @@ public: ACE_Token_Proxy_Queue (void); /// Destructor. - ~ACE_Token_Proxy_Queue (void); + ~ACE_Token_Proxy_Queue () = default; /** * Enqueue a proxy, nesting level, client_id, and a magic cookie at @@ -369,12 +369,11 @@ protected: class ACE_Export ACE_Tokens { public: - /// Null constructor. - ACE_Tokens (void); + ACE_Tokens (); /// Destructor - virtual ~ACE_Tokens (void); + virtual ~ACE_Tokens () = default; /// No implementation. virtual int acquire (ACE_TPQ_Entry *caller, @@ -461,7 +460,6 @@ public: ACE_TPQ_Entry *owner (void); protected: - /// For the deadlock detection algorithm. int visited_; @@ -1088,16 +1086,16 @@ public: int debug = 0); /// Destructor - ~ACE_Local_WLock (void); + ~ACE_Local_WLock (); /// Dump the state of the class. void dump () const; /// Returns ACE_RW_Token::WLOCK. - virtual int type (void) const; + virtual int type () const; /// Return deep copy. - virtual ACE_Token_Proxy *clone (void) const; + virtual ACE_Token_Proxy *clone () const; protected: /// Return a new ACE_Local_Mutex. diff --git a/ACE/ace/Local_Tokens.inl b/ACE/ace/Local_Tokens.inl index 23dc5d86796..a57ca96344b 100644 --- a/ACE/ace/Local_Tokens.inl +++ b/ACE/ace/Local_Tokens.inl @@ -6,7 +6,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // ************************************************************ ACE_INLINE int -ACE_Token_Proxy_Queue::size (void) +ACE_Token_Proxy_Queue::size () { ACE_TRACE ("ACE_Token_Proxy_Queue::size"); return this->size_; @@ -15,7 +15,7 @@ ACE_Token_Proxy_Queue::size (void) // ************************************************************ ACE_INLINE int -ACE_TPQ_Entry::waiting (void) const +ACE_TPQ_Entry::waiting () const { ACE_TRACE ("ACE_TPQ_Entry::waiting"); return waiting_; @@ -29,14 +29,14 @@ ACE_TPQ_Entry::waiting (int v) } ACE_INLINE const ACE_TCHAR * -ACE_TPQ_Entry::client_id (void) const +ACE_TPQ_Entry::client_id () const { ACE_TRACE ("ACE_TPQ_Entry::client_id"); return this->client_id_; } ACE_INLINE ACE_Token_Proxy * -ACE_TPQ_Entry::proxy (void) const +ACE_TPQ_Entry::proxy () const { ACE_TRACE ("ACE_TPQ_Entry::proxy"); return this->proxy_; @@ -49,16 +49,6 @@ ACE_TPQ_Entry::proxy (ACE_Token_Proxy *proxy) this->proxy_ = proxy; } -ACE_INLINE -ACE_TPQ_Iterator::~ACE_TPQ_Iterator (void) -{ -} - -ACE_INLINE -ACE_Token_Proxy_Queue::~ACE_Token_Proxy_Queue (void) -{ -} - ACE_INLINE void ACE_Tokens::remove (ACE_TPQ_Entry *caller) { @@ -96,8 +86,6 @@ ACE_Token_Proxy_Queue::head (void) } // ************************************************** -// ************************************************** -// ************************************************** ACE_INLINE void ACE_Tokens::visit (int v) @@ -140,7 +128,7 @@ ACE_Tokens::name (void) // ************************************************************ ACE_INLINE int -ACE_TPQ_Entry::nesting_level (void) const +ACE_TPQ_Entry::nesting_level () const { ACE_TRACE ("ACE_TPQ_Entry::nesting_level"); return this->nesting_level_; @@ -154,7 +142,7 @@ ACE_TPQ_Entry::nesting_level (int delta) } ACE_INLINE ACE_TPQ_Entry::PTVF -ACE_TPQ_Entry::sleep_hook (void) const +ACE_TPQ_Entry::sleep_hook () const { ACE_TRACE ("ACE_TPQ_Entry::sleep_hook"); return this->sleep_hook_; @@ -188,8 +176,6 @@ ACE_TPQ_Entry::equal_client_id (const ACE_TCHAR *id) } // ************************************************************ -// ************************************************************ -// ************************************************************ ACE_INLINE ACE_Local_Mutex::ACE_Local_Mutex (const ACE_TCHAR *token_name, @@ -252,10 +238,10 @@ ACE_INLINE void ACE_Token_Name::operator= (const ACE_Token_Name &rhs) { ACE_TRACE ("ACE_Token_Name::operator="); - if (&rhs == this) - return; - else + if (&rhs != this) + { this->name (rhs.name ()); + } } ACE_INLINE bool diff --git a/ACE/ace/Lock.cpp b/ACE/ace/Lock.cpp index b3b78a4729a..9b89681f1ee 100644 --- a/ACE/ace/Lock.cpp +++ b/ACE/ace/Lock.cpp @@ -4,8 +4,6 @@ #include "ace/Lock.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Lock::~ACE_Lock () diff --git a/ACE/ace/Lock.h b/ACE/ace/Lock.h index 2216a6f5581..c68a156feb1 100644 --- a/ACE/ace/Lock.h +++ b/ACE/ace/Lock.h @@ -4,8 +4,6 @@ /** * @file Lock.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== diff --git a/ACE/ace/Lock_Adapter_T.h b/ACE/ace/Lock_Adapter_T.h index ece637ae264..360f2d02479 100644 --- a/ACE/ace/Lock_Adapter_T.h +++ b/ACE/ace/Lock_Adapter_T.h @@ -4,8 +4,6 @@ /** * @file Lock_Adapter_T.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== diff --git a/ACE/ace/Log_Msg.h b/ACE/ace/Log_Msg.h index 474962401a3..a40750264a4 100644 --- a/ACE/ace/Log_Msg.h +++ b/ACE/ace/Log_Msg.h @@ -928,14 +928,12 @@ ACE_END_VERSIONED_NAMESPACE_DECL # define ACE_TSS_CLEANUP_NAME ACE_TSS_cleanup #endif /* ACE_HAS_VERSIONED_NAMESPACE == 1 */ - LOCAL_EXTERN_PREFIX void ACE_TSS_CLEANUP_NAME (void *ptr); # endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */ #endif /* ACE_MT_SAFE */ - #if defined (__ACE_INLINE__) #include "ace/Log_Msg.inl" #endif /* __ACE_INLINE__ */ diff --git a/ACE/ace/Log_Msg_IPC.cpp b/ACE/ace/Log_Msg_IPC.cpp index 56fd98df942..e484ef91451 100644 --- a/ACE/ace/Log_Msg_IPC.cpp +++ b/ACE/ace/Log_Msg_IPC.cpp @@ -3,8 +3,6 @@ #include "ace/CDR_Stream.h" #include "ace/Truncate.h" - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Log_Msg_IPC::ACE_Log_Msg_IPC () diff --git a/ACE/ace/Log_Msg_NT_Event_Log.cpp b/ACE/ace/Log_Msg_NT_Event_Log.cpp index f9d0d141deb..29a8cd05afa 100644 --- a/ACE/ace/Log_Msg_NT_Event_Log.cpp +++ b/ACE/ace/Log_Msg_NT_Event_Log.cpp @@ -8,8 +8,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Log_Msg_NT_Event_Log::ACE_Log_Msg_NT_Event_Log (void) diff --git a/ACE/ace/MEM_Acceptor.cpp b/ACE/ace/MEM_Acceptor.cpp index 27bc04ab4d0..10afe145c1c 100644 --- a/ACE/ace/MEM_Acceptor.cpp +++ b/ACE/ace/MEM_Acceptor.cpp @@ -12,8 +12,6 @@ #include "ace/MEM_Acceptor.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Acceptor) diff --git a/ACE/ace/MEM_IO.cpp b/ACE/ace/MEM_IO.cpp index 1a27b9a72d8..46750e0d864 100644 --- a/ACE/ace/MEM_IO.cpp +++ b/ACE/ace/MEM_IO.cpp @@ -8,8 +8,6 @@ #include "ace/MEM_IO.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_MEM_IO) diff --git a/ACE/ace/MEM_SAP.cpp b/ACE/ace/MEM_SAP.cpp index 26a85a07292..6269849cc23 100644 --- a/ACE/ace/MEM_SAP.cpp +++ b/ACE/ace/MEM_SAP.cpp @@ -6,8 +6,6 @@ #include "ace/MEM_SAP.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_MEM_SAP) diff --git a/ACE/ace/MEM_Stream.cpp b/ACE/ace/MEM_Stream.cpp index 2af690115d6..ddfdaa40095 100644 --- a/ACE/ace/MEM_Stream.cpp +++ b/ACE/ace/MEM_Stream.cpp @@ -6,8 +6,6 @@ #include "ace/MEM_Stream.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_MEM_Stream) diff --git a/ACE/ace/MMAP_Memory_Pool.h b/ACE/ace/MMAP_Memory_Pool.h index 7021586e26c..e90264d0e14 100644 --- a/ACE/ace/MMAP_Memory_Pool.h +++ b/ACE/ace/MMAP_Memory_Pool.h @@ -120,9 +120,8 @@ public: bool install_signal_handler_; private: - // Prevent copying - ACE_MMAP_Memory_Pool_Options (const ACE_MMAP_Memory_Pool_Options &); - ACE_MMAP_Memory_Pool_Options &operator= (const ACE_MMAP_Memory_Pool_Options &); + ACE_MMAP_Memory_Pool_Options (const ACE_MMAP_Memory_Pool_Options &) = delete; + ACE_MMAP_Memory_Pool_Options &operator= (const ACE_MMAP_Memory_Pool_Options &) = delete; }; /** diff --git a/ACE/ace/Malloc.cpp b/ACE/ace/Malloc.cpp index 77023adeb43..4f1cae29388 100644 --- a/ACE/ace/Malloc.cpp +++ b/ACE/ace/Malloc.cpp @@ -8,7 +8,6 @@ #include "ace/Malloc_Base.h" #include "ace/OS_NS_string.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Process-wide ACE_Allocator. diff --git a/ACE/ace/Malloc_Base.h b/ACE/ace/Malloc_Base.h index 76e63076bd6..c73f984e856 100644 --- a/ACE/ace/Malloc_Base.h +++ b/ACE/ace/Malloc_Base.h @@ -178,7 +178,7 @@ public: typedef std::ptrdiff_t difference_type; template <typename U> struct rebind { typedef ACE_Allocator_Std_Adapter<U> other; }; - ACE_Allocator_Std_Adapter() {} + ACE_Allocator_Std_Adapter() = default; template <typename U> ACE_Allocator_Std_Adapter(const ACE_Allocator_Std_Adapter<U>&) {} diff --git a/ACE/ace/Malloc_T.cpp b/ACE/ace/Malloc_T.cpp index b2d117f045c..a2cd42f0d2a 100644 --- a/ACE/ace/Malloc_T.cpp +++ b/ACE/ace/Malloc_T.cpp @@ -14,7 +14,6 @@ #include "ace/ACE.h" #include "ace/OS_NS_string.h" - ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <class T, class ACE_LOCK> diff --git a/ACE/ace/Manual_Event.h b/ACE/ace/Manual_Event.h index a2981f41ffd..757d8564e66 100644 --- a/ACE/ace/Manual_Event.h +++ b/ACE/ace/Manual_Event.h @@ -4,8 +4,6 @@ /** * @file Manual_Event.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== @@ -85,7 +83,7 @@ public: #endif /* ACE_HAS_WCHAR */ /// Default dtor. - virtual ~ACE_Manual_Event () {} + ~ACE_Manual_Event () override = default; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Map_Manager.h b/ACE/ace/Map_Manager.h index 27b6b24fcc0..80e2a3a62c6 100644 --- a/ACE/ace/Map_Manager.h +++ b/ACE/ace/Map_Manager.h @@ -145,15 +145,15 @@ public: typedef ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK> reverse_iterator; /// Initialize a ACE_Map_Manager with the ACE_DEFAULT_MAP_SIZE. - ACE_Map_Manager (ACE_Allocator *alloc = 0); + ACE_Map_Manager (ACE_Allocator *alloc = nullptr); /// Initialize a ACE_Map_Manager with @a size entries. ACE_Map_Manager (size_t size, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = nullptr); /// Initialize a ACE_Map_Manager with size @a length. int open (size_t length = ACE_DEFAULT_MAP_SIZE, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = nullptr); /// Close down a ACE_Map_Manager and release dynamically allocated /// resources. diff --git a/ACE/ace/Map_T.h b/ACE/ace/Map_T.h index 51e89febc08..876dda9ce03 100644 --- a/ACE/ace/Map_T.h +++ b/ACE/ace/Map_T.h @@ -283,7 +283,7 @@ public: /// Initialize a map with size @a length. virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE, - ACE_Allocator *alloc = 0) = 0; + ACE_Allocator *alloc = nullptr) = 0; /// Close down a <Map> and release dynamically allocated resources. virtual int close () = 0; @@ -554,19 +554,19 @@ public: implementation; /// Initialize with the ACE_DEFAULT_MAP_SIZE. - ACE_Map_Impl (ACE_Allocator *alloc = 0); + ACE_Map_Impl (ACE_Allocator *alloc = nullptr); /// Initialize with @a size entries. The @a size parameter is ignored /// by maps for which an initialize size does not make sense. ACE_Map_Impl (size_t size, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = nullptr); /// Close down and release dynamically allocated resources. virtual ~ACE_Map_Impl (); /// Initialize a <Map> with size @a length. virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = nullptr); /// Close down a <Map> and release dynamically allocated resources. virtual int close (); @@ -833,19 +833,19 @@ public: implementation; /// Initialize with the ACE_DEFAULT_MAP_SIZE. - ACE_Active_Map_Manager_Adapter (ACE_Allocator *alloc = 0); + ACE_Active_Map_Manager_Adapter (ACE_Allocator *alloc = nullptr); /// Initialize with @a size entries. The @a size parameter is ignored /// by maps for which an initialize size does not make sense. ACE_Active_Map_Manager_Adapter (size_t size, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = nullptr); /// Close down and release dynamically allocated resources. virtual ~ACE_Active_Map_Manager_Adapter (); /// Initialize a Map with size @a length. virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = nullptr); /// Close down a Map and release dynamically allocated resources. virtual int close (); @@ -1123,19 +1123,19 @@ public: implementation; /// Initialize with the ACE_DEFAULT_MAP_SIZE. - ACE_Hash_Map_Manager_Ex_Adapter (ACE_Allocator *alloc = 0); + ACE_Hash_Map_Manager_Ex_Adapter (ACE_Allocator *alloc = nullptr); /// Initialize with @a size entries. The @a size parameter is ignored /// by maps for which an initialize size does not make sense. ACE_Hash_Map_Manager_Ex_Adapter (size_t size, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = nullptr); /// Close down and release dynamically allocated resources. virtual ~ACE_Hash_Map_Manager_Ex_Adapter (); /// Initialize a Map with size @a length. virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = nullptr); /// Close down a Map and release dynamically allocated resources. virtual int close (); @@ -1406,19 +1406,19 @@ public: implementation; /// Initialize with the ACE_DEFAULT_MAP_SIZE. - ACE_Map_Manager_Adapter (ACE_Allocator *alloc = 0); + ACE_Map_Manager_Adapter (ACE_Allocator *alloc = nullptr); /// Initialize with @a size entries. The @a size parameter is ignored /// by maps for which an initialize size does not make sense. ACE_Map_Manager_Adapter (size_t size, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = nullptr); /// Close down and release dynamically allocated resources. virtual ~ACE_Map_Manager_Adapter (); /// Initialize a <Map> with size @a length. virtual int open (size_t length = ACE_DEFAULT_MAP_SIZE, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = nullptr); /// Close down a <Map> and release dynamically allocated resources. virtual int close (); diff --git a/ACE/ace/Message_Queue_NT.h b/ACE/ace/Message_Queue_NT.h index 6fea82734a4..2e50483b67d 100644 --- a/ACE/ace/Message_Queue_NT.h +++ b/ACE/ace/Message_Queue_NT.h @@ -58,10 +58,10 @@ public: /// Close down the underlying I/O completion port. You need to /// re-open the MQ after this function is executed. - virtual int close (void); + virtual int close (); /// Close down the message queue and release all resources. - virtual ~ACE_Message_Queue_NT (void); + virtual ~ACE_Message_Queue_NT (); // = Enqueue and dequeue methods. @@ -90,30 +90,30 @@ public: * Always return false. */ - virtual bool is_full (void); + virtual bool is_full (); /** * True if queue is empty, else false. Notice the return value is * only transient. */ - virtual bool is_empty (void); + virtual bool is_empty (); // = Queue statistic methods (transient.) /** * Number of total bytes on the queue, i.e., sum of the message * block sizes. */ - virtual size_t message_bytes (void); + virtual size_t message_bytes (); /** * Number of total length on the queue, i.e., sum of the message * block lengths. */ - virtual size_t message_length (void); + virtual size_t message_length (); /** * Number of total messages on the queue. */ - virtual size_t message_count (void); + virtual size_t message_count (); // = Manual changes to these stats (used when queued message blocks // change size or lengths). @@ -130,7 +130,7 @@ public: virtual void message_length (size_t new_length); /// Get the max concurrent thread number. - virtual DWORD max_threads (void); + virtual DWORD max_threads (); // = Activation control methods. @@ -143,13 +143,13 @@ public: * * @retval The queue's state before this call. */ - virtual int deactivate (void); + virtual int deactivate (); /** * Reactivate the queue so that threads can enqueue and dequeue * messages again. Returns the state of the queue before the call. */ - virtual int activate (void); + virtual int activate (); /** * Pulse the queue to wake up any waiting threads. Changes the @@ -158,11 +158,11 @@ public: * * @retval The queue's state before this call. */ - virtual int pulse (void); + virtual int pulse (); /// Returns true if the state of the queue is <DEACTIVATED>, /// but false if the queue's is <ACTIVATED> or <PULSED>. - virtual int deactivated (void); + virtual int deactivated (); // = Not currently implemented... int peek_dequeue_head (ACE_Message_Block *&first_item, @@ -176,7 +176,7 @@ public: virtual void dump () const; /// Get the handle to the underlying completion port. - virtual ACE_HANDLE completion_port (void); + virtual ACE_HANDLE completion_port (); /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Metrics_Cache_T.cpp b/ACE/ace/Metrics_Cache_T.cpp index b17c85c131f..c2611b921d3 100644 --- a/ACE/ace/Metrics_Cache_T.cpp +++ b/ACE/ace/Metrics_Cache_T.cpp @@ -1,8 +1,6 @@ #ifndef ACE_METRICS_CACHE_CPP #define ACE_METRICS_CACHE_CPP -//#define ACE_BUILD_DLL - #include "ace/Metrics_Cache_T.h" #if defined (ACE_COMPILE_TIMEPROBES) diff --git a/ACE/ace/Metrics_Cache_T.h b/ACE/ace/Metrics_Cache_T.h index 037ae3bee81..d851c008e49 100644 --- a/ACE/ace/Metrics_Cache_T.h +++ b/ACE/ace/Metrics_Cache_T.h @@ -213,7 +213,6 @@ protected: int metrics_enabled_; private: - /// Allocation strategy object. ALLOCATOR* allocator_; diff --git a/ACE/ace/Monitor_Control/Constraint_Visitor.cpp b/ACE/ace/Monitor_Control/Constraint_Visitor.cpp index 6c844a12147..786ffe5ee72 100644 --- a/ACE/ace/Monitor_Control/Constraint_Visitor.cpp +++ b/ACE/ace/Monitor_Control/Constraint_Visitor.cpp @@ -18,9 +18,6 @@ namespace ACE : data_ (data) {} - Constraint_Visitor::~Constraint_Visitor (void) - {} - ACE_CDR::Boolean Constraint_Visitor::evaluate_constraint (ETCL_Constraint *root) { diff --git a/ACE/ace/Monitor_Control/Constraint_Visitor.h b/ACE/ace/Monitor_Control/Constraint_Visitor.h index 6278ad50ffa..784a0e8b514 100644 --- a/ACE/ace/Monitor_Control/Constraint_Visitor.h +++ b/ACE/ace/Monitor_Control/Constraint_Visitor.h @@ -52,14 +52,14 @@ namespace ACE { public: Constraint_Visitor (const Monitor_Control_Types::Data& data); - virtual ~Constraint_Visitor (void); + ~Constraint_Visitor () override = default; ACE_CDR::Boolean evaluate_constraint (ETCL_Constraint *root); - virtual int visit_literal (ETCL_Literal_Constraint *); - virtual int visit_identifier (ETCL_Identifier *); - virtual int visit_unary_expr (ETCL_Unary_Expr *); - virtual int visit_binary_expr (ETCL_Binary_Expr *); + int visit_literal (ETCL_Literal_Constraint *) override; + int visit_identifier (ETCL_Identifier *) override; + int visit_unary_expr (ETCL_Unary_Expr *) override; + int visit_binary_expr (ETCL_Binary_Expr *) override; private: /// Sub-methods for visit_binary_expr(). diff --git a/ACE/ace/Monitor_Control_Action.cpp b/ACE/ace/Monitor_Control_Action.cpp index 1eb9c1324ea..995c365dbf2 100644 --- a/ACE/ace/Monitor_Control_Action.cpp +++ b/ACE/ace/Monitor_Control_Action.cpp @@ -14,9 +14,6 @@ namespace ACE : ACE_Refcountable_T<ACE_SYNCH_MUTEX> (1) {} - Control_Action::~Control_Action () - {} - void Control_Action::add_ref () { diff --git a/ACE/ace/Monitor_Control_Action.h b/ACE/ace/Monitor_Control_Action.h index f25e57bf379..aea10b43b46 100644 --- a/ACE/ace/Monitor_Control_Action.h +++ b/ACE/ace/Monitor_Control_Action.h @@ -48,8 +48,8 @@ namespace ACE void remove_ref (void); protected: - Control_Action (void); - virtual ~Control_Action (void); + Control_Action (); + ~Control_Action () override = default; }; } } diff --git a/ACE/ace/Monitor_Size.cpp b/ACE/ace/Monitor_Size.cpp index d314c72f60b..fc5abba7608 100644 --- a/ACE/ace/Monitor_Size.cpp +++ b/ACE/ace/Monitor_Size.cpp @@ -20,10 +20,6 @@ namespace ACE { } - Size_Monitor::~Size_Monitor () - { - } - void Size_Monitor::update () { diff --git a/ACE/ace/Monitor_Size.h b/ACE/ace/Monitor_Size.h index 72b14e0d451..0ecf46533e6 100644 --- a/ACE/ace/Monitor_Size.h +++ b/ACE/ace/Monitor_Size.h @@ -41,14 +41,14 @@ namespace ACE public: Size_Monitor (); Size_Monitor (const char* name); - virtual ~Size_Monitor (); + ~Size_Monitor () override = default; /// Implemented by the most-derived class. Does the actual /// work of fetching the monitored value. - virtual void update (); + void update () override; /// Reset function. - virtual void clear (); + void clear () override; }; } } diff --git a/ACE/ace/Msg_WFMO_Reactor.cpp b/ACE/ace/Msg_WFMO_Reactor.cpp index 7852dceade3..b4488bb6e7d 100644 --- a/ACE/ace/Msg_WFMO_Reactor.cpp +++ b/ACE/ace/Msg_WFMO_Reactor.cpp @@ -1,7 +1,5 @@ #include "ace/Msg_WFMO_Reactor.h" - - #if defined (ACE_WIN32) && !defined (ACE_LACKS_MSG_WFMO) #if !defined (__ACE_INLINE__) diff --git a/ACE/ace/Mutex.h b/ACE/ace/Mutex.h index 2f371a772a5..ba784f63b7f 100644 --- a/ACE/ace/Mutex.h +++ b/ACE/ace/Mutex.h @@ -190,9 +190,8 @@ public: bool removed_; private: - // Prevent assignment and initialization. - ACE_Mutex &operator= (const ACE_Mutex &); - ACE_Mutex (const ACE_Mutex &); + ACE_Mutex &operator= (const ACE_Mutex &) = delete; + ACE_Mutex (const ACE_Mutex &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL 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/Name_Proxy.h b/ACE/ace/Name_Proxy.h index 0132dfe6f8e..7152cd76f96 100644 --- a/ACE/ace/Name_Proxy.h +++ b/ACE/ace/Name_Proxy.h @@ -76,7 +76,6 @@ public: void dump () const; private: - /// ACE_Connector factory used to establish connections actively. ACE_SOCK_Connector connector_; @@ -87,9 +86,8 @@ private: ACE_Reactor *reactor_; private: - // Prevent copying - ACE_Name_Proxy (const ACE_Name_Proxy &); - ACE_Name_Proxy &operator= (const ACE_Name_Proxy &); + ACE_Name_Proxy (const ACE_Name_Proxy &) = delete; + ACE_Name_Proxy &operator= (const ACE_Name_Proxy &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Naming_Context.cpp b/ACE/ace/Naming_Context.cpp index 46b6ebd975a..d5acc969031 100644 --- a/ACE/ace/Naming_Context.cpp +++ b/ACE/ace/Naming_Context.cpp @@ -13,8 +13,6 @@ # include "ace/Trace.h" #endif /* ACE_HAS_TRACE */ - - #if !defined (__ACE_INLINE__) #include "ace/Naming_Context.inl" #endif /* __ACE_INLINE__ */ 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/Netlink_Addr.h b/ACE/ace/Netlink_Addr.h index c204d628b66..2d934b14086 100644 --- a/ACE/ace/Netlink_Addr.h +++ b/ACE/ace/Netlink_Addr.h @@ -46,7 +46,7 @@ public: ACE_Netlink_Addr (const sockaddr_nl *, int len); /// Dtor - ~ACE_Netlink_Addr (void); + ~ACE_Netlink_Addr () = default; /** * @param naddr sets the nl_ member @see nl_ diff --git a/ACE/ace/Netlink_Addr.inl b/ACE/ace/Netlink_Addr.inl index 912f21cd834..06c31b65d17 100644 --- a/ACE/ace/Netlink_Addr.inl +++ b/ACE/ace/Netlink_Addr.inl @@ -3,8 +3,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_INLINE ACE_Netlink_Addr::~ACE_Netlink_Addr (void){} - ACE_INLINE ACE_Netlink_Addr::ACE_Netlink_Addr (void): ACE_Addr (this->determine_type(), sizeof (sockaddr_nl)) { diff --git a/ACE/ace/Null_Barrier.h b/ACE/ace/Null_Barrier.h index c1147907f4e..fc4ec18c576 100644 --- a/ACE/ace/Null_Barrier.h +++ b/ACE/ace/Null_Barrier.h @@ -4,8 +4,6 @@ /** * @file Null_Barrier.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== @@ -30,7 +28,7 @@ public: void * = 0) {}; /// Default dtor. - ~ACE_Null_Barrier () {}; + ~ACE_Null_Barrier () = default; /// Block the caller until all <count> threads have called <wait> and /// then allow all the caller threads to continue in parallel. @@ -43,9 +41,8 @@ public: //ACE_ALLOC_HOOK_DECLARE; private: - // = Prevent assignment and initialization. - void operator= (const ACE_Null_Barrier &); - ACE_Null_Barrier (const ACE_Null_Barrier &); + void operator= (const ACE_Null_Barrier &) = delete; + ACE_Null_Barrier (const ACE_Null_Barrier &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Null_Condition.h b/ACE/ace/Null_Condition.h index bf4d4313a4e..db68b6c0e0a 100644 --- a/ACE/ace/Null_Condition.h +++ b/ACE/ace/Null_Condition.h @@ -4,8 +4,6 @@ /** * @file Null_Condition.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== @@ -49,7 +47,7 @@ public: void * = 0) : mutex_ ((ACE_Null_Mutex &) m) {} - ~ACE_Condition () {} + ~ACE_Condition () = default; /// Returns 0. int remove () {return 0;} @@ -78,9 +76,8 @@ protected: ACE_Null_Mutex &mutex_; // Reference to mutex lock. private: - // = Prevent assignment and initialization. - void operator= (const ACE_Condition<ACE_Null_Mutex> &); - ACE_Condition (const ACE_Condition<ACE_Null_Mutex> &); + void operator= (const ACE_Condition<ACE_Null_Mutex> &) = delete; + ACE_Condition (const ACE_Condition<ACE_Null_Mutex> &) = delete; }; typedef ACE_Condition<ACE_Null_Mutex> ACE_Null_Condition; diff --git a/ACE/ace/Null_Mutex.h b/ACE/ace/Null_Mutex.h index 63d449ecd1e..86999a0f18c 100644 --- a/ACE/ace/Null_Mutex.h +++ b/ACE/ace/Null_Mutex.h @@ -4,8 +4,6 @@ /** * @file Null_Mutex.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== @@ -38,7 +36,7 @@ class ACE_Export ACE_Null_Mutex public: ACE_Null_Mutex (const ACE_TCHAR * = 0) : lock_ (0) {} - ~ACE_Null_Mutex () {} + ~ACE_Null_Mutex () = default; /// Return 0. int remove () {return 0;} @@ -103,7 +101,7 @@ public: ACE_Guard (ACE_Null_Mutex &, int) {} ACE_Guard (ACE_Null_Mutex &, int, int) {} #if defined (ACE_WIN32) - ~ACE_Guard (void) {} + ~ACE_Guard () = default; #endif /* ACE_WIN32 */ int acquire () { return 0; } diff --git a/ACE/ace/Null_Semaphore.h b/ACE/ace/Null_Semaphore.h index 8656098ead9..1e3e4dac0bb 100644 --- a/ACE/ace/Null_Semaphore.h +++ b/ACE/ace/Null_Semaphore.h @@ -4,8 +4,6 @@ /** * @file Null_Semaphore.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== @@ -51,7 +49,7 @@ public: const ACE_TCHAR * = 0, void * = 0, int = 0x7fffffff) {} - ~ACE_Null_Semaphore () {} + ~ACE_Null_Semaphore () = default; /// Return 0. int remove () {return 0;} diff --git a/ACE/ace/Numeric_Limits.h b/ACE/ace/Numeric_Limits.h index 0f888f8ca62..bcb140aa154 100644 --- a/ACE/ace/Numeric_Limits.h +++ b/ACE/ace/Numeric_Limits.h @@ -60,8 +60,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL template <typename T> struct ACE_Numeric_Limits { - static T min () { return std::numeric_limits<T>::min (); } - static T max () { return std::numeric_limits<T>::max (); } + static const T min () { return std::numeric_limits<T>::min (); } + static const T max () { return std::numeric_limits<T>::max (); } }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_Errno.h b/ACE/ace/OS_Errno.h index de7d8420a4c..d50463c9b68 100644 --- a/ACE/ace/OS_Errno.h +++ b/ACE/ace/OS_Errno.h @@ -4,7 +4,7 @@ /** * @file OS_Errno.h * - * @author (Originally in OS.h)Doug Schmidt <d.schmidt@vanderbilt.edu> + * @author Doug Schmidt <d.schmidt@vanderbilt.edu> */ //============================================================================= @@ -70,9 +70,8 @@ public: bool operator!= (int error); private: - // Prevent copying - ACE_Errno_Guard (const ACE_Errno_Guard &); - ACE_Errno_Guard &operator= (const ACE_Errno_Guard &); + ACE_Errno_Guard (const ACE_Errno_Guard &) = delete; + ACE_Errno_Guard &operator= (const ACE_Errno_Guard &) = delete; #if defined (ACE_MT_SAFE) ACE_ERRNO_TYPE *errno_ptr_; diff --git a/ACE/ace/OS_NS_Thread.h b/ACE/ace/OS_NS_Thread.h index 9419f1d0812..5a1da97c9df 100644 --- a/ACE/ace/OS_NS_Thread.h +++ b/ACE/ace/OS_NS_Thread.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= @@ -2030,9 +2028,8 @@ protected: /// Keeps track of whether we acquired the lock or failed. int owner_; - // = Prevent assignment and initialization. - ACE_OS_Thread_Mutex_Guard &operator= (const ACE_OS_Thread_Mutex_Guard &); - ACE_OS_Thread_Mutex_Guard (const ACE_OS_Thread_Mutex_Guard &); + ACE_OS_Thread_Mutex_Guard &operator= (const ACE_OS_Thread_Mutex_Guard &) = delete; + ACE_OS_Thread_Mutex_Guard (const ACE_OS_Thread_Mutex_Guard &) = delete; }; /** @@ -2075,11 +2072,8 @@ protected: /// Keeps track of whether we acquired the lock or failed. int owner_; - // = Prevent assignment and initialization. - ACE_OS_Recursive_Thread_Mutex_Guard &operator= ( - const ACE_OS_Recursive_Thread_Mutex_Guard &); - ACE_OS_Recursive_Thread_Mutex_Guard ( - const ACE_OS_Recursive_Thread_Mutex_Guard &); + ACE_OS_Recursive_Thread_Mutex_Guard &operator= (const ACE_OS_Recursive_Thread_Mutex_Guard &) = delete; + ACE_OS_Recursive_Thread_Mutex_Guard (const ACE_OS_Recursive_Thread_Mutex_Guard &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/OS_NS_arpa_inet.h b/ACE/ace/OS_NS_arpa_inet.h index caf7eb6c4bc..f33340376f6 100644 --- a/ACE/ace/OS_NS_arpa_inet.h +++ b/ACE/ace/OS_NS_arpa_inet.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_ctype.h b/ACE/ace/OS_NS_ctype.h index 702b9127a15..2bff7a3c3ad 100644 --- a/ACE/ace/OS_NS_ctype.h +++ b/ACE/ace/OS_NS_ctype.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_dirent.h b/ACE/ace/OS_NS_dirent.h index 562018d0390..d426e8a61a2 100644 --- a/ACE/ace/OS_NS_dirent.h +++ b/ACE/ace/OS_NS_dirent.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_dlfcn.h b/ACE/ace/OS_NS_dlfcn.h index f21e7dd20fb..733d8f7f2b4 100644 --- a/ACE/ace/OS_NS_dlfcn.h +++ b/ACE/ace/OS_NS_dlfcn.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_errno.h b/ACE/ace/OS_NS_errno.h index 407f68a2ee0..722241d7662 100644 --- a/ACE/ace/OS_NS_errno.h +++ b/ACE/ace/OS_NS_errno.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= @@ -66,7 +64,7 @@ namespace ACE_OS { class ACE_Export ACE_CE_Errno { public: - ACE_CE_Errno () {} + ACE_CE_Errno () = default; static void init (); static void fini (); static ACE_CE_Errno *instance (); diff --git a/ACE/ace/OS_NS_fcntl.h b/ACE/ace/OS_NS_fcntl.h index 3fd7d07482a..e95b50aa213 100644 --- a/ACE/ace/OS_NS_fcntl.h +++ b/ACE/ace/OS_NS_fcntl.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_macros.h b/ACE/ace/OS_NS_macros.h index 8f94cdad952..0714f574f7c 100644 --- a/ACE/ace/OS_NS_macros.h +++ b/ACE/ace/OS_NS_macros.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_math.h b/ACE/ace/OS_NS_math.h index 2072851f7f6..9bbb0dbc369 100644 --- a/ACE/ace/OS_NS_math.h +++ b/ACE/ace/OS_NS_math.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_netdb.h b/ACE/ace/OS_NS_netdb.h index 5885e178900..d08d2711d30 100644 --- a/ACE/ace/OS_NS_netdb.h +++ b/ACE/ace/OS_NS_netdb.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_poll.h b/ACE/ace/OS_NS_poll.h index f865f51bd7c..a4f21d62f49 100644 --- a/ACE/ace/OS_NS_poll.h +++ b/ACE/ace/OS_NS_poll.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_pwd.h b/ACE/ace/OS_NS_pwd.h index 86b91883639..169aee46cd8 100644 --- a/ACE/ace/OS_NS_pwd.h +++ b/ACE/ace/OS_NS_pwd.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_regex.h b/ACE/ace/OS_NS_regex.h index 8851abe4944..cffd6c94361 100644 --- a/ACE/ace/OS_NS_regex.h +++ b/ACE/ace/OS_NS_regex.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_signal.h b/ACE/ace/OS_NS_signal.h index 8cf09884e43..fc0b8101aee 100644 --- a/ACE/ace/OS_NS_signal.h +++ b/ACE/ace/OS_NS_signal.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_stdio.h b/ACE/ace/OS_NS_stdio.h index 68a7b56a0cd..1c4046f73a9 100644 --- a/ACE/ace/OS_NS_stdio.h +++ b/ACE/ace/OS_NS_stdio.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_stdlib.h b/ACE/ace/OS_NS_stdlib.h index 4e0e4442eeb..ab0f86884b1 100644 --- a/ACE/ace/OS_NS_stdlib.h +++ b/ACE/ace/OS_NS_stdlib.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_string.h b/ACE/ace/OS_NS_string.h index 7d98895b8ac..1bd15501d89 100644 --- a/ACE/ace/OS_NS_string.h +++ b/ACE/ace/OS_NS_string.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_strings.h b/ACE/ace/OS_NS_strings.h index 37d2befa570..5da352220ba 100644 --- a/ACE/ace/OS_NS_strings.h +++ b/ACE/ace/OS_NS_strings.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_stropts.h b/ACE/ace/OS_NS_stropts.h index 3ec7a76c64f..7b48d769b78 100644 --- a/ACE/ace/OS_NS_stropts.h +++ b/ACE/ace/OS_NS_stropts.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_sys_mman.h b/ACE/ace/OS_NS_sys_mman.h index 3d976aeaaa1..ffcd4df547c 100644 --- a/ACE/ace/OS_NS_sys_mman.h +++ b/ACE/ace/OS_NS_sys_mman.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_sys_msg.h b/ACE/ace/OS_NS_sys_msg.h index 2af245d9a43..aabf25768c2 100644 --- a/ACE/ace/OS_NS_sys_msg.h +++ b/ACE/ace/OS_NS_sys_msg.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_sys_resource.h b/ACE/ace/OS_NS_sys_resource.h index 90d85c56fc1..9b4fbc999e1 100644 --- a/ACE/ace/OS_NS_sys_resource.h +++ b/ACE/ace/OS_NS_sys_resource.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_sys_select.h b/ACE/ace/OS_NS_sys_select.h index 363c64b8f48..807cdbab7f7 100644 --- a/ACE/ace/OS_NS_sys_select.h +++ b/ACE/ace/OS_NS_sys_select.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_sys_shm.h b/ACE/ace/OS_NS_sys_shm.h index d7597ca9f9c..5ad517b49e9 100644 --- a/ACE/ace/OS_NS_sys_shm.h +++ b/ACE/ace/OS_NS_sys_shm.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_sys_socket.h b/ACE/ace/OS_NS_sys_socket.h index 757a3bb1cd1..27218a44dd9 100644 --- a/ACE/ace/OS_NS_sys_socket.h +++ b/ACE/ace/OS_NS_sys_socket.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_sys_stat.h b/ACE/ace/OS_NS_sys_stat.h index 06a0862234a..c8b7bb290f6 100644 --- a/ACE/ace/OS_NS_sys_stat.h +++ b/ACE/ace/OS_NS_sys_stat.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_sys_time.h b/ACE/ace/OS_NS_sys_time.h index f873d1044e7..d8154e23b15 100644 --- a/ACE/ace/OS_NS_sys_time.h +++ b/ACE/ace/OS_NS_sys_time.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_sys_uio.h b/ACE/ace/OS_NS_sys_uio.h index e03894b3007..ece317202be 100644 --- a/ACE/ace/OS_NS_sys_uio.h +++ b/ACE/ace/OS_NS_sys_uio.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_sys_utsname.h b/ACE/ace/OS_NS_sys_utsname.h index 2851122ec0b..6c9a71efa9b 100644 --- a/ACE/ace/OS_NS_sys_utsname.h +++ b/ACE/ace/OS_NS_sys_utsname.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_sys_wait.h b/ACE/ace/OS_NS_sys_wait.h index 58a7d01187a..dc9f1eafbd7 100644 --- a/ACE/ace/OS_NS_sys_wait.h +++ b/ACE/ace/OS_NS_sys_wait.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_time.h b/ACE/ace/OS_NS_time.h index a6c1f40dc21..6b115e6bc61 100644 --- a/ACE/ace/OS_NS_time.h +++ b/ACE/ace/OS_NS_time.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= @@ -37,9 +35,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Type-safe, and unsigned. -static const ACE_UINT32 ACE_U_ONE_SECOND_IN_MSECS = 1000U; -static const ACE_UINT32 ACE_U_ONE_SECOND_IN_USECS = 1000000U; -static const ACE_UINT32 ACE_U_ONE_SECOND_IN_NSECS = 1000000000U; +static constexpr ACE_UINT32 ACE_U_ONE_SECOND_IN_MSECS = 1000U; +static constexpr ACE_UINT32 ACE_U_ONE_SECOND_IN_USECS = 1000000U; +static constexpr ACE_UINT32 ACE_U_ONE_SECOND_IN_NSECS = 1000000000U; /// Helper for the ACE_OS::timezone() function /** diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl index 0e265607231..fee739324e7 100644 --- a/ACE/ace/OS_NS_time.inl +++ b/ACE/ace/OS_NS_time.inl @@ -84,7 +84,7 @@ ACE_OS::clock_settime (clockid_t clockid, const struct timespec *ts) } // Magic number declaration and definition for ctime and ctime_r () -static const int ctime_buf_size = 26; +static constexpr int ctime_buf_size = 26; ACE_INLINE ACE_TCHAR * ACE_OS::ctime (const time_t *t) diff --git a/ACE/ace/OS_NS_unistd.h b/ACE/ace/OS_NS_unistd.h index 091cc708452..6686583efa3 100644 --- a/ACE/ace/OS_NS_unistd.h +++ b/ACE/ace/OS_NS_unistd.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_NS_wchar.h b/ACE/ace/OS_NS_wchar.h index 5b42e80b2ae..6fa8c15197e 100644 --- a/ACE/ace/OS_NS_wchar.h +++ b/ACE/ace/OS_NS_wchar.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/OS_main.h b/ACE/ace/OS_main.h index 5a15bac6a27..5f90e56b2c2 100644 --- a/ACE/ace/OS_main.h +++ b/ACE/ace/OS_main.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/Obchunk.cpp b/ACE/ace/Obchunk.cpp index bcfc5c09a5f..db6ee4b94fe 100644 --- a/ACE/ace/Obchunk.cpp +++ b/ACE/ace/Obchunk.cpp @@ -3,10 +3,6 @@ # include "ace/Malloc_Base.h" #endif /* ACE_HAS_ALLOC_HOOKS */ -#if !defined (__ACE_INLINE__) -#include "ace/Obchunk.inl" -#endif /* __ACE_INLINE__ */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Obchunk) diff --git a/ACE/ace/Obchunk.h b/ACE/ace/Obchunk.h index 4ab76f8a3e8..87f0f258399 100644 --- a/ACE/ace/Obchunk.h +++ b/ACE/ace/Obchunk.h @@ -36,7 +36,7 @@ public: ACE_Obchunk (size_t size); /// Dtor. - ~ACE_Obchunk (); + ~ACE_Obchunk () = default; /// Dump the state of an object. void dump () const; @@ -66,9 +66,5 @@ public: ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (__ACE_INLINE__) -#include "ace/Obchunk.inl" -#endif /* __ACE_INLINE__ */ - #include /**/ "ace/post.h" #endif /* ACE_OBCHUNK_H */ diff --git a/ACE/ace/Obchunk.inl b/ACE/ace/Obchunk.inl deleted file mode 100644 index cb5b68ccef6..00000000000 --- a/ACE/ace/Obchunk.inl +++ /dev/null @@ -1,9 +0,0 @@ -// -*- C++ -*- -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -ACE_Obchunk::~ACE_Obchunk () -{ -} - -ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Object_Manager_Base.h b/ACE/ace/Object_Manager_Base.h index a1758e0a616..619311eb249 100644 --- a/ACE/ace/Object_Manager_Base.h +++ b/ACE/ace/Object_Manager_Base.h @@ -7,8 +7,6 @@ * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... - * - * Originally in OS.h. */ //============================================================================= diff --git a/ACE/ace/PI_Malloc.h b/ACE/ace/PI_Malloc.h index 12933958aa8..2fee63360c2 100644 --- a/ACE/ace/PI_Malloc.h +++ b/ACE/ace/PI_Malloc.h @@ -189,8 +189,7 @@ public: void dump () const; private: - // Disallow assignment. - void operator= (const ACE_Control_Block &); + void operator= (const ACE_Control_Block &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/POSIX_Proactor.h b/ACE/ace/POSIX_Proactor.h index 46ebef1fab0..3002550ad34 100644 --- a/ACE/ace/POSIX_Proactor.h +++ b/ACE/ace/POSIX_Proactor.h @@ -617,7 +617,6 @@ protected: */ class ACE_Export ACE_POSIX_Asynch_Timer : public ACE_POSIX_Asynch_Result { - /// The factory method for this class is with the POSIX_Proactor /// class. friend class ACE_POSIX_Proactor; @@ -635,13 +634,13 @@ protected: int signal_number = ACE_SIGRTMIN); /// Destructor. - virtual ~ACE_POSIX_Asynch_Timer (void) {} + ~ACE_POSIX_Asynch_Timer (void) override = default; /// This method calls the handler's handle_timeout method. - virtual void complete (size_t bytes_transferred, - int success, - const void *completion_key, - u_long error = 0); + void complete (size_t bytes_transferred, + int success, + const void *completion_key, + u_long error = 0) override; /// Time value requested by caller ACE_Time_Value time_; diff --git a/ACE/ace/Pagefile_Memory_Pool.cpp b/ACE/ace/Pagefile_Memory_Pool.cpp index ba803872c35..b04ebec525d 100644 --- a/ACE/ace/Pagefile_Memory_Pool.cpp +++ b/ACE/ace/Pagefile_Memory_Pool.cpp @@ -19,8 +19,6 @@ #include "ace/Based_Pointer_Repository.h" #endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */ - - #if defined (ACE_WIN32) && !defined (ACE_HAS_PHARLAP) #if !defined (ACE_HAS_WINCE) #define ACE_MAP_FILE(_hnd, _access, _offHigh, _offLow, _nBytes, _baseAdd)\ diff --git a/ACE/ace/Pagefile_Memory_Pool.h b/ACE/ace/Pagefile_Memory_Pool.h index 9c5f20337f8..4a78171b75a 100644 --- a/ACE/ace/Pagefile_Memory_Pool.h +++ b/ACE/ace/Pagefile_Memory_Pool.h @@ -119,7 +119,6 @@ public: void dump (void) const {} protected: - /** * Map portions or the entire pool into the local virtual address * space. To do this, we compute the new @c file_offset of the @@ -131,7 +130,6 @@ protected: int unmap (void); private: - /** * @class Control_Block * diff --git a/ACE/ace/Ping_Socket.h b/ACE/ace/Ping_Socket.h index 7391660de18..9e16cf18447 100644 --- a/ACE/ace/Ping_Socket.h +++ b/ACE/ace/Ping_Socket.h @@ -85,7 +85,6 @@ public: static ACE_Time_Value const time_default_; private: - int receive_echo_reply (ACE_Time_Value const * timeout); /// Do not allow this function to percolate up to this interface. diff --git a/ACE/ace/Pipe.cpp b/ACE/ace/Pipe.cpp index 0ae4f4cd13c..a6a9874e309 100644 --- a/ACE/ace/Pipe.cpp +++ b/ACE/ace/Pipe.cpp @@ -24,8 +24,6 @@ #include "ace/Pipe.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL void diff --git a/ACE/ace/Proactor_Impl.h b/ACE/ace/Proactor_Impl.h index f8851eacab3..ddd98917d7c 100644 --- a/ACE/ace/Proactor_Impl.h +++ b/ACE/ace/Proactor_Impl.h @@ -9,7 +9,6 @@ */ //============================================================================= - #ifndef ACE_PROACTOR_IMPL_H #define ACE_PROACTOR_IMPL_H #include /**/ "ace/pre.h" @@ -39,13 +38,12 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL */ class ACE_Export ACE_Proactor_Impl : public ACE_Event_Handler { - public: /// Virtual destruction. - virtual ~ACE_Proactor_Impl (void); + virtual ~ACE_Proactor_Impl (); /// Close the IO completion port. - virtual int close (void) = 0; + virtual int close () = 0; /// This method adds the @a handle to the I/O completion port. This /// function is a no-op function for Unix systems. @@ -67,22 +65,22 @@ public: * completion is dispatched, non-zero (-1) on errors and errno is * set accordingly. */ - virtual int handle_events (void) = 0; + virtual int handle_events () = 0; /// Add wakeup dispatch threads (reinit). - virtual int wake_up_dispatch_threads (void) = 0; + virtual int wake_up_dispatch_threads () = 0; /// Close all dispatch threads. virtual int close_dispatch_threads (int wait) = 0; /// Get number of thread used as a parameter to CreatIoCompletionPort. - virtual size_t number_of_threads (void) const = 0; + virtual size_t number_of_threads () const = 0; /// Set number of thread used as a parameter to CreatIoCompletionPort. virtual void number_of_threads (size_t threads) = 0; /// Get the event handle. - virtual ACE_HANDLE get_handle (void) const = 0; + virtual ACE_HANDLE get_handle () const = 0; // // = Factory methods for the operations @@ -91,33 +89,33 @@ public: // methods. /// Create the correct implementation class for doing Asynch_Read_Stream. - virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void) = 0; + virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream () = 0; /// Create the correct implementation class for doing Asynch_Write_Stream. - virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void) = 0; + virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream () = 0; /// Create the correct implementation class for doing Asynch_Read_File. - virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (void) = 0; + virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file () = 0; /// Create the correct implementation class for doing Asynch_Write_File. - virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (void) = 0; + virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file () = 0; /// Create the correct implementation class for doing Asynch_Accept. - virtual ACE_Asynch_Accept_Impl *create_asynch_accept (void) = 0; + virtual ACE_Asynch_Accept_Impl *create_asynch_accept () = 0; /// Create the correct implementation class for doing Asynch_Connect. - virtual ACE_Asynch_Connect_Impl *create_asynch_connect (void) = 0; + virtual ACE_Asynch_Connect_Impl *create_asynch_connect () = 0; /// Create the correct implementation class for doing Asynch_Transmit_File. - virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void) = 0; + virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file () = 0; /// Create the correct implementation class for doing /// Asynch_Read_Dgram. - virtual ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (void) = 0; + virtual ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram () = 0; /// Create the correct implementation class for doing /// Asynch_Write_Dgram. - virtual ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (void) = 0; + virtual ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram () = 0; // // = Factory methods for the results diff --git a/ACE/ace/Process.h b/ACE/ace/Process.h index 90adcae52fc..886d1cf6247 100644 --- a/ACE/ace/Process.h +++ b/ACE/ace/Process.h @@ -687,14 +687,12 @@ private: class ACE_Export ACE_Managed_Process : public ACE_Process { public: - /// Cleanup by deleting @c this. virtual void unmanage (); ACE_ALLOC_HOOK_DECLARE; protected: - /// Make sure that we're allocated dynamically! virtual ~ACE_Managed_Process (); }; diff --git a/ACE/ace/Process_Mutex.cpp b/ACE/ace/Process_Mutex.cpp index 3c0cd195b5a..5e89bf7c23a 100644 --- a/ACE/ace/Process_Mutex.cpp +++ b/ACE/ace/Process_Mutex.cpp @@ -9,8 +9,6 @@ #include "ace/Process_Mutex.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Process_Mutex) diff --git a/ACE/ace/Process_Semaphore.cpp b/ACE/ace/Process_Semaphore.cpp index 9b40f67d0db..fa90ff58a47 100644 --- a/ACE/ace/Process_Semaphore.cpp +++ b/ACE/ace/Process_Semaphore.cpp @@ -11,8 +11,6 @@ #include "ace/ACE.h" - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Process_Semaphore) diff --git a/ACE/ace/Process_Semaphore.h b/ACE/ace/Process_Semaphore.h index 57d47da2b05..1024d70b6da 100644 --- a/ACE/ace/Process_Semaphore.h +++ b/ACE/ace/Process_Semaphore.h @@ -148,7 +148,6 @@ public: ACE_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "ace/Process_Semaphore.inl" #endif /* __ACE_INLINE__ */ diff --git a/ACE/ace/Profile_Timer.cpp b/ACE/ace/Profile_Timer.cpp index 0d807f96dad..b0ae13790bc 100644 --- a/ACE/ace/Profile_Timer.cpp +++ b/ACE/ace/Profile_Timer.cpp @@ -12,8 +12,6 @@ #include "ace/OS_NS_unistd.h" #endif - - #if (defined (ACE_HAS_PRUSAGE_T) || defined (ACE_HAS_GETRUSAGE)) && !defined (ACE_WIN32) #include "ace/OS_NS_stdio.h" @@ -25,7 +23,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Profile_Timer) - void ACE_Profile_Timer::dump () const { diff --git a/ACE/ace/QoS/QoS_Session_Impl.h b/ACE/ace/QoS/QoS_Session_Impl.h index 28a905a2862..601b473e33b 100644 --- a/ACE/ace/QoS/QoS_Session_Impl.h +++ b/ACE/ace/QoS/QoS_Session_Impl.h @@ -19,7 +19,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ - #if defined (ACE_HAS_RAPI) #include "rapi_lib.h" @@ -37,9 +36,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL */ class ACE_QoS_Export ACE_RAPI_Session : public ACE_QoS_Session { - public: - /// Default destructor. ~ACE_RAPI_Session (void); @@ -125,7 +122,6 @@ public: friend class ACE_QoS_Session_Factory; private: - /// Default constuctor. Constructor is defined private so that only /// the friend factory can instantiate this class. ACE_RAPI_Session (void); @@ -162,7 +158,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL */ class ACE_QoS_Export ACE_GQoS_Session : public ACE_QoS_Session { - public: /// Default destructor. @@ -246,11 +241,9 @@ public: friend class ACE_QoS_Session_Factory; private: - /// Default constructor. Constructor is defined private so that only /// the friend factory can instantiate this class. - ACE_GQoS_Session (void); - + ACE_GQoS_Session (); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp index 787ca5555d1..511386ef638 100644 --- a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp +++ b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.cpp @@ -16,7 +16,6 @@ #define IMR_MULTIADDR imr_multiaddr #endif /* ! defined (IMR_MULTIADDR) */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Dgram_Mcast_QoS) diff --git a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h index b640f4c8082..3d1ca20e881 100644 --- a/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h +++ b/ACE/ace/QoS/SOCK_Dgram_Mcast_QoS.h @@ -113,7 +113,6 @@ public: private: // = Disable public <open> method to ensure class used properly. - /// Subscribe to the multicast interface using QoS-enabled semantics. int subscribe_ifs (const ACE_INET_Addr &mcast_addr, const ACE_QoS_Params &qos_params, @@ -125,7 +124,6 @@ private: /// Manages the QoS sessions that this socket subscribes to. ACE_QoS_Manager qos_manager_; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/RB_Tree.cpp b/ACE/ace/RB_Tree.cpp index b953a0e6cbe..19a716fc1c2 100644 --- a/ACE/ace/RB_Tree.cpp +++ b/ACE/ace/RB_Tree.cpp @@ -23,7 +23,6 @@ ACE_ALLOC_HOOK_DEFINE_Tc4(ACE_RB_Tree_Iterator) ACE_ALLOC_HOOK_DEFINE_Tc4(ACE_RB_Tree_Reverse_Iterator) // Constructor. - template <class EXT_ID, class INT_ID> ACE_RB_Tree_Node<EXT_ID, INT_ID>::ACE_RB_Tree_Node (const EXT_ID &k, const INT_ID &t) : k_ (k), diff --git a/ACE/ace/RB_Tree.h b/ACE/ace/RB_Tree.h index 4c7b773ef27..c8ef635b3a4 100644 --- a/ACE/ace/RB_Tree.h +++ b/ACE/ace/RB_Tree.h @@ -200,13 +200,13 @@ public: typedef ACE_RB_Tree_Reverse_Iterator<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> reverse_iterator; /// Constructor. - ACE_RB_Tree (ACE_Allocator *alloc = 0); + ACE_RB_Tree (ACE_Allocator *alloc = nullptr); /// Copy constructor. ACE_RB_Tree (const ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> &rbt); /// Initialize an RB Tree. - int open (ACE_Allocator *alloc = 0); + int open (ACE_Allocator *alloc = nullptr); /// Close down an RB_Tree and release dynamically allocated /// resources. @@ -870,7 +870,6 @@ public: * from the derived classes and placed in the base class. */ int next (ACE_RB_Tree_Node<EXT_ID, INT_ID> *&next_entry) const; - }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/RB_Tree.inl b/ACE/ace/RB_Tree.inl index 4e31894eb4d..1f9d1bdf420 100644 --- a/ACE/ace/RB_Tree.inl +++ b/ACE/ace/RB_Tree.inl @@ -10,7 +10,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ///////////////////////////////////////////////////// // Key accessor. - template <class EXT_ID, class INT_ID> ACE_INLINE EXT_ID & ACE_RB_Tree_Node<EXT_ID, INT_ID>::key () @@ -19,9 +18,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::key () return k_; } - // Item accessor. - template <class EXT_ID, class INT_ID> ACE_INLINE INT_ID & ACE_RB_Tree_Node<EXT_ID, INT_ID>::item () @@ -30,9 +27,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::item () return t_; } - // Set color of the node. - template <class EXT_ID, class INT_ID> ACE_INLINE void ACE_RB_Tree_Node<EXT_ID, INT_ID>::color (ACE_RB_Tree_Node_Base::RB_Tree_Node_Color c) @@ -41,9 +36,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::color (ACE_RB_Tree_Node_Base::RB_Tree_Node_Col color_ = c; } - // Get color of the node. - template <class EXT_ID, class INT_ID> ACE_INLINE ACE_RB_Tree_Node_Base::RB_Tree_Node_Color ACE_RB_Tree_Node<EXT_ID, INT_ID>::color () @@ -52,9 +45,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::color () return color_; } - // Accessor for node's parent pointer. - template <class EXT_ID, class INT_ID> ACE_INLINE ACE_RB_Tree_Node<EXT_ID, INT_ID> * ACE_RB_Tree_Node<EXT_ID, INT_ID>::parent () @@ -63,9 +54,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::parent () return parent_; } - // Mutator for node's parent pointer. - template <class EXT_ID, class INT_ID> ACE_INLINE void ACE_RB_Tree_Node<EXT_ID, INT_ID>::parent (ACE_RB_Tree_Node<EXT_ID, INT_ID> * p) @@ -74,10 +63,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::parent (ACE_RB_Tree_Node<EXT_ID, INT_ID> * p) parent_ = p; } - - // Accessor for node's left child pointer. - template <class EXT_ID, class INT_ID> ACE_INLINE ACE_RB_Tree_Node<EXT_ID, INT_ID> * ACE_RB_Tree_Node<EXT_ID, INT_ID>::left () @@ -86,9 +72,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::left () return left_; } - // Mutator for node's left child pointer. - template <class EXT_ID, class INT_ID> ACE_INLINE void ACE_RB_Tree_Node<EXT_ID, INT_ID>::left (ACE_RB_Tree_Node<EXT_ID, INT_ID> * l) @@ -97,9 +81,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::left (ACE_RB_Tree_Node<EXT_ID, INT_ID> * l) left_ = l; } - // Accessor for node's right child pointer. - template <class EXT_ID, class INT_ID> ACE_INLINE ACE_RB_Tree_Node<EXT_ID, INT_ID> * ACE_RB_Tree_Node<EXT_ID, INT_ID>::right () @@ -108,9 +90,7 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::right () return right_; } - // Mutator for node's right child pointer. - template <class EXT_ID, class INT_ID> ACE_INLINE void ACE_RB_Tree_Node<EXT_ID, INT_ID>::right (ACE_RB_Tree_Node<EXT_ID, INT_ID> * r) @@ -119,7 +99,6 @@ ACE_RB_Tree_Node<EXT_ID, INT_ID>::right (ACE_RB_Tree_Node<EXT_ID, INT_ID> * r) right_ = r; } - //////////////////////////////////////////////////////////////////////// // template class ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK> // //////////////////////////////////////////////////////////////////////// @@ -151,7 +130,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::open (ACE_Allocator *alloc) // Close down an RB_Tree and release dynamically allocated // resources. - template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close () @@ -162,12 +140,10 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::close () return this->close_i (); } - // Associate <ext_id> with <int_id>. If <ext_id> is already in the // tree then the <ACE_RB_Tree_Node> is not changed. Returns 0 if a // new entry is bound successfully, returns 1 if an attempt is made // to bind an existing entry, and returns -1 if failures occur. - template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::bind (const EXT_ID &ext_id, @@ -180,11 +156,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::bind (const EXT_ID &ext_id, return this->insert_i (ext_id, int_id, entry); } - // Same as a normal bind, except the tree entry is also passed back // to the caller. The entry in this case will either be the newly // created entry, or the existing one. - template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::bind (const EXT_ID &ext_id, @@ -197,13 +171,11 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::bind (const EXT_ID &ext_id, return this->insert_i (ext_id, int_id, entry); } - // Associate <ext_id> with <int_id> if and only if <ext_id> is not // in the tree. If <ext_id> is already in the tree then the <int_id> // parameter is assigned the existing value in the tree. Returns 0 // if a new entry is bound successfully, returns 1 if an attempt is // made to bind an existing entry, and returns -1 if failures occur. - template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::trybind (const EXT_ID &ext_id, @@ -223,11 +195,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::trybind (const EXT_ID &ext_ return result; } - // Same as a normal trybind, except the tree entry is also passed // back to the caller. The entry in this case will either be the // newly created entry, or the existing one. - template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::trybind (const EXT_ID &ext_id, @@ -237,7 +207,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::trybind (const EXT_ID &ext_ ACE_TRACE ("ACE_RB_Tree::trybind (const EXT_ID &ext_id, INT_ID &int_id, ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)"); ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - int result = this->insert_i (ext_id, int_id, entry); + int const result = this->insert_i (ext_id, int_id, entry); if (result == 1) { @@ -248,7 +218,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::trybind (const EXT_ID &ext_ return result; } - // Reassociate <ext_id> with <int_id>. If <ext_id> is not in the // tree then behaves just like <bind>. Returns 0 if a new entry is // bound successfully, returns 1 if an existing entry was rebound, @@ -274,11 +243,9 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i return result; } - // Same as a normal rebind, except the tree entry is also passed back // to the caller. The entry in this case will either be the newly // created entry, or the existing one. - template <class EXT_ID, class INT_ID, class COMPARE_KEYS, class ACE_LOCK> ACE_INLINE int ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_id, @@ -288,7 +255,7 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i ACE_TRACE ("ACE_RB_Tree::rebind (const EXT_ID &ext_id, const INT_ID &int_id, ACE_RB_Tree_Node<EXT_ID, INT_ID> *&entry)"); ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1); - int result = this->insert_i (ext_id, int_id, entry); + int const result = this->insert_i (ext_id, int_id, entry); if (result == 1) { @@ -299,7 +266,6 @@ ACE_RB_Tree<EXT_ID, INT_ID, COMPARE_KEYS, ACE_LOCK>::rebind (const EXT_ID &ext_i return result; } - // Associate <ext_id> with <int_id>. If <ext_id> is not in the tree // then behaves just like <bind>. Otherwise, store the old value of // <int_id> into the "out" parameter and rebind the new parameters. diff --git a/ACE/ace/RW_Mutex.cpp b/ACE/ace/RW_Mutex.cpp index 9a4fbaef0c1..3a9a7a488ae 100644 --- a/ACE/ace/RW_Mutex.cpp +++ b/ACE/ace/RW_Mutex.cpp @@ -1,8 +1,6 @@ /** * @file RW_Mutex.cpp * - * Originally in Synch.cpp - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ @@ -16,8 +14,6 @@ #include "ace/Log_Category.h" - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL void diff --git a/ACE/ace/RW_Mutex.h b/ACE/ace/RW_Mutex.h index f01f4dc035f..7dd515a84d3 100644 --- a/ACE/ace/RW_Mutex.h +++ b/ACE/ace/RW_Mutex.h @@ -4,8 +4,6 @@ /** * @file RW_Mutex.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== @@ -121,9 +119,8 @@ protected: bool removed_; private: - // = Prevent assignment and initialization. - void operator= (const ACE_RW_Mutex &); - ACE_RW_Mutex (const ACE_RW_Mutex &); + void operator= (const ACE_RW_Mutex &) = delete; + ACE_RW_Mutex (const ACE_RW_Mutex &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/RW_Process_Mutex.cpp b/ACE/ace/RW_Process_Mutex.cpp index 19acafb8577..af95146270e 100644 --- a/ACE/ace/RW_Process_Mutex.cpp +++ b/ACE/ace/RW_Process_Mutex.cpp @@ -2,8 +2,6 @@ #include "ace/Log_Category.h" #include "ace/ACE.h" - - #if !defined (__ACE_INLINE__) #include "ace/RW_Process_Mutex.inl" #endif /* __ACE_INLINE__ */ diff --git a/ACE/ace/RW_Thread_Mutex.cpp b/ACE/ace/RW_Thread_Mutex.cpp index c77a75c30d7..c71aca2eb4c 100644 --- a/ACE/ace/RW_Thread_Mutex.cpp +++ b/ACE/ace/RW_Thread_Mutex.cpp @@ -1,8 +1,6 @@ /** * @file RW_Thread_Mutex.cpp * - * Originally in Synch.cpp - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ @@ -20,8 +18,6 @@ #include "ace/Guard_T.h" - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_RW_Thread_Mutex) diff --git a/ACE/ace/RW_Thread_Mutex.h b/ACE/ace/RW_Thread_Mutex.h index 54a4ebcfaa5..265e4d161dc 100644 --- a/ACE/ace/RW_Thread_Mutex.h +++ b/ACE/ace/RW_Thread_Mutex.h @@ -4,8 +4,6 @@ /** * @file RW_Thread_Mutex.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== diff --git a/ACE/ace/Reactor.h b/ACE/ace/Reactor.h index c43a28be8d9..cf8b2bc291b 100644 --- a/ACE/ace/Reactor.h +++ b/ACE/ace/Reactor.h @@ -885,13 +885,12 @@ protected: static bool delete_reactor_; /// Deny access since member-wise won't work... - ACE_Reactor (const ACE_Reactor &); - ACE_Reactor &operator = (const ACE_Reactor &); + ACE_Reactor (const ACE_Reactor &) = delete; + ACE_Reactor &operator = (const ACE_Reactor &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL - #if defined (__ACE_INLINE__) #include "ace/Reactor.inl" #endif /* __ACE_INLINE__ */ diff --git a/ACE/ace/Recursive_Thread_Mutex.cpp b/ACE/ace/Recursive_Thread_Mutex.cpp index 047a334a24b..398f56bff1e 100644 --- a/ACE/ace/Recursive_Thread_Mutex.cpp +++ b/ACE/ace/Recursive_Thread_Mutex.cpp @@ -1,8 +1,6 @@ /** * @file Recursive_Thread_Mutex.cpp * - * Originally in Synch.cpp - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ diff --git a/ACE/ace/Recursive_Thread_Mutex.h b/ACE/ace/Recursive_Thread_Mutex.h index f88e7b79a1c..4cb90a99689 100644 --- a/ACE/ace/Recursive_Thread_Mutex.h +++ b/ACE/ace/Recursive_Thread_Mutex.h @@ -4,8 +4,6 @@ /** * @file Recursive_Thread_Mutex.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> and * Abdullah Sowayan <abdullah.sowayan@lmco.com> */ @@ -175,9 +173,8 @@ protected: bool removed_; private: - // = Prevent assignment and initialization. - void operator= (const ACE_Recursive_Thread_Mutex &); - ACE_Recursive_Thread_Mutex (const ACE_Recursive_Thread_Mutex &); + void operator= (const ACE_Recursive_Thread_Mutex &) = delete; + ACE_Recursive_Thread_Mutex (const ACE_Recursive_Thread_Mutex &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL 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/Remote_Tokens.h b/ACE/ace/Remote_Tokens.h index 4326ac3f80f..3433ba72fe1 100644 --- a/ACE/ace/Remote_Tokens.h +++ b/ACE/ace/Remote_Tokens.h @@ -301,9 +301,8 @@ protected: static ACE_INET_Addr server_address_; private: - /// Private: should not be used - ACE_TSS_Connection (const ACE_TSS_Connection &); - void operator= (const ACE_TSS_Connection &); + ACE_TSS_Connection (const ACE_TSS_Connection &) = delete; + void operator= (const ACE_TSS_Connection &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Reverse_Lock_T.h b/ACE/ace/Reverse_Lock_T.h index 571deb0de85..4cf546c6148 100644 --- a/ACE/ace/Reverse_Lock_T.h +++ b/ACE/ace/Reverse_Lock_T.h @@ -4,8 +4,6 @@ /** * @file Reverse_Lock_T.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== diff --git a/ACE/ace/SOCK.cpp b/ACE/ace/SOCK.cpp index 6dae4f91b79..651014e1d99 100644 --- a/ACE/ace/SOCK.cpp +++ b/ACE/ace/SOCK.cpp @@ -8,8 +8,6 @@ #include "ace/SOCK.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SOCK) diff --git a/ACE/ace/SOCK.h b/ACE/ace/SOCK.h index 62ef4b9121c..91ac4878cbd 100644 --- a/ACE/ace/SOCK.h +++ b/ACE/ace/SOCK.h @@ -39,7 +39,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_SOCK : public ACE_IPC_SAP { public: - /// Wrapper around the @c setsockopt system call. int set_option (int level, int option, @@ -94,7 +93,6 @@ public: int reuse_addr); protected: - /// Constructor with arguments to call the BSD-style @c socket system /// call (no QoS). ACE_SOCK (int type, diff --git a/ACE/ace/SOCK_Acceptor.cpp b/ACE/ace/SOCK_Acceptor.cpp index af0fd98670d..19af145fa81 100644 --- a/ACE/ace/SOCK_Acceptor.cpp +++ b/ACE/ace/SOCK_Acceptor.cpp @@ -17,8 +17,6 @@ #include "ace/OS_QoS.h" #endif // ACE_HAS_WINCE - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Acceptor) diff --git a/ACE/ace/SOCK_Dgram_Bcast.cpp b/ACE/ace/SOCK_Dgram_Bcast.cpp index 53fadc3e2c5..b3bf9c9f774 100644 --- a/ACE/ace/SOCK_Dgram_Bcast.cpp +++ b/ACE/ace/SOCK_Dgram_Bcast.cpp @@ -14,8 +14,6 @@ #include "ace/SOCK_Dgram_Bcast.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_Dgram_Bcast) diff --git a/ACE/ace/SOCK_IO.cpp b/ACE/ace/SOCK_IO.cpp index 65c261aaac2..ba586c153b6 100644 --- a/ACE/ace/SOCK_IO.cpp +++ b/ACE/ace/SOCK_IO.cpp @@ -12,8 +12,6 @@ #include "ace/SOCK_IO.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_IO) diff --git a/ACE/ace/SOCK_SEQPACK_Acceptor.cpp b/ACE/ace/SOCK_SEQPACK_Acceptor.cpp index 8efe8acfc9b..cacf3b076a8 100644 --- a/ACE/ace/SOCK_SEQPACK_Acceptor.cpp +++ b/ACE/ace/SOCK_SEQPACK_Acceptor.cpp @@ -11,21 +11,17 @@ #include "ace/SOCK_SEQPACK_Acceptor.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Acceptor) // Do nothing routine for constructor. - ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor () { ACE_TRACE ("ACE_SOCK_SEQPACK_Acceptor::ACE_SOCK_SEQPACK_Acceptor"); } // Performs the timed accept operation. - int ACE_SOCK_SEQPACK_Acceptor::shared_accept_start (ACE_Time_Value *timeout, bool restart, @@ -95,7 +91,6 @@ ACE_SOCK_SEQPACK_Acceptor::shared_accept_finish (ACE_SOCK_SEQPACK_Association ne } // General purpose routine for accepting new connections. - int ACE_SOCK_SEQPACK_Acceptor::accept (ACE_SOCK_SEQPACK_Association &new_association, ACE_Addr *remote_addr, diff --git a/ACE/ace/SOCK_SEQPACK_Association.cpp b/ACE/ace/SOCK_SEQPACK_Association.cpp index ef250e4bca1..4fa2da226f0 100644 --- a/ACE/ace/SOCK_SEQPACK_Association.cpp +++ b/ACE/ace/SOCK_SEQPACK_Association.cpp @@ -9,8 +9,6 @@ #include "ace/SOCK_SEQPACK_Association.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Association) diff --git a/ACE/ace/SOCK_SEQPACK_Connector.cpp b/ACE/ace/SOCK_SEQPACK_Connector.cpp index ba95da79993..61572837a45 100644 --- a/ACE/ace/SOCK_SEQPACK_Connector.cpp +++ b/ACE/ace/SOCK_SEQPACK_Connector.cpp @@ -16,8 +16,6 @@ #include "ace/SOCK_SEQPACK_Connector.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SOCK_SEQPACK_Connector) diff --git a/ACE/ace/SPIPE.cpp b/ACE/ace/SPIPE.cpp index 546307a9355..e84042104ff 100644 --- a/ACE/ace/SPIPE.cpp +++ b/ACE/ace/SPIPE.cpp @@ -10,8 +10,6 @@ #include "ace/SPIPE.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE) diff --git a/ACE/ace/SPIPE.h b/ACE/ace/SPIPE.h index 5435477e551..485e866274d 100644 --- a/ACE/ace/SPIPE.h +++ b/ACE/ace/SPIPE.h @@ -98,7 +98,7 @@ private: protected: /// Ensure that this class is an abstract base class - ACE_SPIPE (void); + ACE_SPIPE (); /// Our local address. ACE_SPIPE_Addr local_addr_; diff --git a/ACE/ace/SPIPE_Addr.cpp b/ACE/ace/SPIPE_Addr.cpp index a12c0c79e68..81240d557eb 100644 --- a/ACE/ace/SPIPE_Addr.cpp +++ b/ACE/ace/SPIPE_Addr.cpp @@ -14,8 +14,6 @@ ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Addr) void ACE_SPIPE_Addr::dump () const { -#if defined (ACE_HAS_DUMP) -#endif /* ACE_HAS_DUMP */ } // Set a pointer to the address. diff --git a/ACE/ace/SPIPE_Connector.cpp b/ACE/ace/SPIPE_Connector.cpp index bfb24eb91fd..2bcf32ce187 100644 --- a/ACE/ace/SPIPE_Connector.cpp +++ b/ACE/ace/SPIPE_Connector.cpp @@ -12,8 +12,6 @@ #include "ace/SPIPE_Connector.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Connector) diff --git a/ACE/ace/SPIPE_Stream.cpp b/ACE/ace/SPIPE_Stream.cpp index 003aa7c860d..b824d53a62e 100644 --- a/ACE/ace/SPIPE_Stream.cpp +++ b/ACE/ace/SPIPE_Stream.cpp @@ -9,7 +9,6 @@ # include "ace/Malloc_Base.h" #endif /* ACE_HAS_ALLOC_HOOKS */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SPIPE_Stream) diff --git a/ACE/ace/SSL/SSL_Asynch_Stream.h b/ACE/ace/SSL/SSL_Asynch_Stream.h index 7a965995a76..f6984515214 100644 --- a/ACE/ace/SSL/SSL_Asynch_Stream.h +++ b/ACE/ace/SSL/SSL_Asynch_Stream.h @@ -367,10 +367,8 @@ protected: //@} private: - - // Preventing copying through construction or assignment. - ACE_SSL_Asynch_Stream (ACE_SSL_Asynch_Stream const &); - ACE_SSL_Asynch_Stream & operator= (ACE_SSL_Asynch_Stream const &); + ACE_SSL_Asynch_Stream (ACE_SSL_Asynch_Stream const &) = delete; + ACE_SSL_Asynch_Stream & operator= (ACE_SSL_Asynch_Stream const &) = delete; protected: /// Stream Type ST_CLIENT/ST_SERVER diff --git a/ACE/ace/SSL/SSL_Context.h b/ACE/ace/SSL/SSL_Context.h index fc6d39fa637..f0c9dfac81d 100644 --- a/ACE/ace/SSL/SSL_Context.h +++ b/ACE/ace/SSL/SSL_Context.h @@ -367,11 +367,8 @@ private: void ssl_library_init (); void ssl_library_fini (); - // = Prevent assignment and copy initialization. - //@{ - ACE_SSL_Context (const ACE_SSL_Context &); - ACE_SSL_Context & operator= (const ACE_SSL_Context &); - //@} + ACE_SSL_Context (const ACE_SSL_Context &) = delete; + ACE_SSL_Context & operator= (const ACE_SSL_Context &) = delete; private: /// The SSL_CTX structure 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/SString.cpp b/ACE/ace/SString.cpp index d7732205bdf..abd86b337cb 100644 --- a/ACE/ace/SString.cpp +++ b/ACE/ace/SString.cpp @@ -13,7 +13,6 @@ #include "ace/SString.inl" #endif /* __ACE_INLINE__ */ - // ************************************************************ ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/SString.h b/ACE/ace/SString.h index 2d599c6e54a..81651b78dbb 100644 --- a/ACE/ace/SString.h +++ b/ACE/ace/SString.h @@ -59,39 +59,40 @@ public: using ACE_WString::size_type; /// Default constructor. - ACE_NS_WString (ACE_Allocator *alloc = 0); + ACE_NS_WString (ACE_Allocator *alloc = nullptr); /// Constructor that copies @a s into dynamically allocated memory. ACE_NS_WString (const char *s, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = nullptr); /// Constructor that copies @a s into dynamically allocated memory. ACE_NS_WString (const ACE_WSTRING_TYPE *s, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = nullptr); #if defined (ACE_WSTRING_HAS_USHORT_SUPPORT) /// Constructor that takes in a ushort16 string (mainly used by the /// ACE Name_Space classes) ACE_NS_WString (const ACE_UINT16 *s, size_type len, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = nullptr); #endif /* ACE_WSTRING_HAS_USHORT_SUPPORT */ /// Constructor that copies @a len ACE_WSTRING_TYPE's of @a s into dynamically /// allocated memory (will NUL terminate the result). ACE_NS_WString (const ACE_WSTRING_TYPE *s, size_type len, - ACE_Allocator *alloc = 0); + ACE_Allocator *alloc = nullptr); /// Constructor that dynamically allocates memory for @a len + 1 /// ACE_WSTRING_TYPE characters. The newly created memory is set memset to 0. - ACE_NS_WString (size_type len, ACE_Allocator *alloc = 0); + ACE_NS_WString (size_type len, ACE_Allocator *alloc = nullptr); /// Copy constructor. - ACE_NS_WString (const ACE_NS_WString &s); + ACE_NS_WString (const ACE_NS_WString &s) = default; + ACE_NS_WString &operator= (const ACE_NS_WString&) = default; /// Constructor that copies @a c into dynamically allocated memory. - ACE_NS_WString (ACE_WSTRING_TYPE c, ACE_Allocator *alloc = 0); + ACE_NS_WString (ACE_WSTRING_TYPE c, ACE_Allocator *alloc = nullptr); /// Transform into a copy of the ASCII character representation. /// (caller must delete) @@ -136,20 +137,20 @@ public: static const size_type npos; /// Default constructor. - ACE_SString (ACE_Allocator *alloc = 0); + ACE_SString (ACE_Allocator *alloc = nullptr); /// Constructor that copies @a s into dynamically allocated memory. - ACE_SString (const char *s, ACE_Allocator *alloc = 0); + ACE_SString (const char *s, ACE_Allocator *alloc = nullptr); /// Constructor that copies @a len chars of @a s into dynamically /// allocated memory (will NUL terminate the result). - ACE_SString (const char *s, size_type len, ACE_Allocator *alloc = 0); + ACE_SString (const char *s, size_type len, ACE_Allocator *alloc = nullptr); /// Copy constructor. ACE_SString (const ACE_SString &); /// Constructor that copies @a c into dynamically allocated memory. - ACE_SString (char c, ACE_Allocator *alloc = 0); + ACE_SString (char c, ACE_Allocator *alloc = nullptr); /// Default destructor. ~ACE_SString (); diff --git a/ACE/ace/SString.inl b/ACE/ace/SString.inl index 5079e51a174..dd4592928f6 100644 --- a/ACE/ace/SString.inl +++ b/ACE/ace/SString.inl @@ -38,12 +38,6 @@ ACE_NS_WString::ACE_NS_WString (size_type len, ACE_Allocator *alloc) } ACE_INLINE -ACE_NS_WString::ACE_NS_WString (const ACE_NS_WString &s) - : ACE_WString (s) -{ -} - -ACE_INLINE ACE_NS_WString::ACE_NS_WString (ACE_WSTRING_TYPE c, ACE_Allocator *alloc) : ACE_WString (c, alloc) { diff --git a/ACE/ace/SUN_Proactor.h b/ACE/ace/SUN_Proactor.h index 974fe9e1ef9..376a9cdf60a 100644 --- a/ACE/ace/SUN_Proactor.h +++ b/ACE/ace/SUN_Proactor.h @@ -62,10 +62,10 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_SUN_Proactor : public ACE_POSIX_AIOCB_Proactor { public: - virtual Proactor_Type get_impl_type (void); + virtual Proactor_Type get_impl_type (); /// Destructor. - virtual ~ACE_SUN_Proactor (void); + virtual ~ACE_SUN_Proactor (); /// Constructor defines max number asynchronous operations that can /// be started at the same time. @@ -86,7 +86,7 @@ protected: * completion is dispatched, non-zero (-1) on errors and errno is * set accordingly. */ - virtual int handle_events (void); + virtual int handle_events (); /// Internal completion detection and dispatching. int handle_events_i (ACE_Time_Value *delta); diff --git a/ACE/ace/SV_Message.cpp b/ACE/ace/SV_Message.cpp index 182f9ca6294..75b3bf62bf3 100644 --- a/ACE/ace/SV_Message.cpp +++ b/ACE/ace/SV_Message.cpp @@ -9,8 +9,6 @@ #include "ace/SV_Message.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SV_Message) diff --git a/ACE/ace/SV_Message_Queue.cpp b/ACE/ace/SV_Message_Queue.cpp index 36bab27f258..21fa9d1cb81 100644 --- a/ACE/ace/SV_Message_Queue.cpp +++ b/ACE/ace/SV_Message_Queue.cpp @@ -8,8 +8,6 @@ #include "ace/SV_Message_Queue.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SV_Message_Queue) diff --git a/ACE/ace/SV_Shared_Memory.cpp b/ACE/ace/SV_Shared_Memory.cpp index d98fc614695..19ac6980849 100644 --- a/ACE/ace/SV_Shared_Memory.cpp +++ b/ACE/ace/SV_Shared_Memory.cpp @@ -8,8 +8,6 @@ #include "ace/SV_Shared_Memory.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_SV_Shared_Memory) diff --git a/ACE/ace/Sched_Params.cpp b/ACE/ace/Sched_Params.cpp index f9eb92d7ccf..8f63c093432 100644 --- a/ACE/ace/Sched_Params.cpp +++ b/ACE/ace/Sched_Params.cpp @@ -7,7 +7,6 @@ */ //============================================================================= - #include "ace/Sched_Params.h" #if !defined (__ACE_INLINE__) @@ -19,8 +18,6 @@ # include /**/ <sys/priocntl.h> #endif /* ACE_HAS_PRIOCNTL && ACE_HAS_THREADS */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL int diff --git a/ACE/ace/Select_Reactor.h b/ACE/ace/Select_Reactor.h index 687ef4d382e..1c59c82a312 100644 --- a/ACE/ace/Select_Reactor.h +++ b/ACE/ace/Select_Reactor.h @@ -46,7 +46,7 @@ class ACE_Export ACE_Guard< ACE_Reactor_Token_T<ACE_Noop_Token> > public: ACE_Guard (ACE_Reactor_Token_T<ACE_Noop_Token> &) {} ACE_Guard (ACE_Reactor_Token_T<ACE_Noop_Token> &, int) {} - ~ACE_Guard (void) {} + ~ACE_Guard () = default int acquire (void) { return 0; } int tryacquire (void) { return 0; } diff --git a/ACE/ace/Select_Reactor_Base.h b/ACE/ace/Select_Reactor_Base.h index 2fa258d1f5b..e9cd8fbe2da 100644 --- a/ACE/ace/Select_Reactor_Base.h +++ b/ACE/ace/Select_Reactor_Base.h @@ -584,9 +584,8 @@ private: /// the notification message. bool supress_renew_; - /// Deny access since member-wise won't work... - ACE_Select_Reactor_Impl (const ACE_Select_Reactor_Impl &); - ACE_Select_Reactor_Impl &operator = (const ACE_Select_Reactor_Impl &); + ACE_Select_Reactor_Impl (const ACE_Select_Reactor_Impl &) = delete; + ACE_Select_Reactor_Impl &operator = (const ACE_Select_Reactor_Impl &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Select_Reactor_T.h b/ACE/ace/Select_Reactor_T.h index 9d901691d14..c142459a6ed 100644 --- a/ACE/ace/Select_Reactor_T.h +++ b/ACE/ace/Select_Reactor_T.h @@ -686,7 +686,6 @@ protected: sig_atomic_t deactivated_; private: - /// Deny access since member-wise won't work... ACE_Select_Reactor_T (const ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN> &) = delete; ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN> &operator= (const ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN> &) = delete; }; diff --git a/ACE/ace/Semaphore.h b/ACE/ace/Semaphore.h index 9b3c0dc1215..fc46aac8a64 100644 --- a/ACE/ace/Semaphore.h +++ b/ACE/ace/Semaphore.h @@ -4,8 +4,6 @@ /** * @file Semaphore.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== @@ -165,9 +163,8 @@ protected: bool removed_; private: - // = Prevent assignment and initialization. - void operator= (const ACE_Semaphore &); - ACE_Semaphore (const ACE_Semaphore &); + void operator= (const ACE_Semaphore &) = delete; + ACE_Semaphore (const ACE_Semaphore &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Service_Config.h b/ACE/ace/Service_Config.h index 062fdd07daf..d77fc253625 100644 --- a/ACE/ace/Service_Config.h +++ b/ACE/ace/Service_Config.h @@ -718,9 +718,8 @@ public: ~ACE_Service_Config_Guard (); private: - // Private AND not implemented to disable copying - ACE_Service_Config_Guard(const ACE_Service_Config_Guard&); - ACE_Service_Config_Guard& operator= (const ACE_Service_Config_Guard&); + ACE_Service_Config_Guard(const ACE_Service_Config_Guard&) = delete; + ACE_Service_Config_Guard& operator= (const ACE_Service_Config_Guard&) = delete; private: ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> saved_; 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/Shared_Object.cpp b/ACE/ace/Shared_Object.cpp index f1d369e2ce9..0c1cdcf2ef5 100644 --- a/ACE/ace/Shared_Object.cpp +++ b/ACE/ace/Shared_Object.cpp @@ -12,7 +12,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Initializes object when dynamic linking occurs. - int ACE_Shared_Object::init (int, ACE_TCHAR *[]) { @@ -21,7 +20,6 @@ ACE_Shared_Object::init (int, ACE_TCHAR *[]) } // Terminates object when dynamic unlinking occurs. - int ACE_Shared_Object::fini () { @@ -30,7 +28,6 @@ ACE_Shared_Object::fini () } // Returns information on active object. - int ACE_Shared_Object::info (ACE_TCHAR **, size_t) const { @@ -39,7 +36,6 @@ ACE_Shared_Object::info (ACE_TCHAR **, size_t) const } // Need to give a default implementation. - ACE_Shared_Object::~ACE_Shared_Object () { ACE_TRACE ("ACE_Shared_Object::~ACE_Shared_Object"); diff --git a/ACE/ace/Signal.cpp b/ACE/ace/Signal.cpp index 0867edbe20e..74c60bb2f5c 100644 --- a/ACE/ace/Signal.cpp +++ b/ACE/ace/Signal.cpp @@ -1,5 +1,4 @@ #include "ace/Signal.h" -// #include "ace/Log_Category.h" #if defined (ACE_HAS_ALLOC_HOOKS) # include "ace/Malloc_Base.h" @@ -9,9 +8,6 @@ #include "ace/Signal.inl" #endif /* __ACE_INLINE__ */ - - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Action) diff --git a/ACE/ace/Stats.cpp b/ACE/ace/Stats.cpp index 30d60338c40..9af7cb4a35e 100644 --- a/ACE/ace/Stats.cpp +++ b/ACE/ace/Stats.cpp @@ -7,8 +7,6 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_UINT32 diff --git a/ACE/ace/Stream.cpp b/ACE/ace/Stream.cpp index 47315c40131..8e240e6dcd7 100644 --- a/ACE/ace/Stream.cpp +++ b/ACE/ace/Stream.cpp @@ -1,9 +1,6 @@ -// Stream.cpp #ifndef ACE_STREAM_CPP #define ACE_STREAM_CPP - -//#include "ace/Module.h" #include "ace/Stream.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/ACE/ace/Svc_Conf_y.cpp b/ACE/ace/Svc_Conf_y.cpp index 5e1265369d6..3ca0d39ae80 100644 --- a/ACE/ace/Svc_Conf_y.cpp +++ b/ACE/ace/Svc_Conf_y.cpp @@ -147,8 +147,6 @@ static ACE_Module_Type * ACE_END_VERSIONED_NAMESPACE_DECL - - /* Enabling traces. */ #ifndef YYDEBUG # define YYDEBUG 0 diff --git a/ACE/ace/Synch_Traits.h b/ACE/ace/Synch_Traits.h index 3a4c52dd1ab..9232bf4c969 100644 --- a/ACE/ace/Synch_Traits.h +++ b/ACE/ace/Synch_Traits.h @@ -4,8 +4,6 @@ /** * @file Synch_Traits.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== diff --git a/ACE/ace/TLI.cpp b/ACE/ace/TLI.cpp index 2c101d82709..0e2548c014d 100644 --- a/ACE/ace/TLI.cpp +++ b/ACE/ace/TLI.cpp @@ -1,6 +1,5 @@ // Defines the member functions for the base class of the ACE_TLI // abstraction. - #include "ace/TLI.h" #include "ace/Log_Category.h" #include "ace/OS_Memory.h" @@ -9,8 +8,6 @@ #include "ace/OS_NS_sys_socket.h" #include "ace/Auto_Ptr.h" - - #if defined (ACE_HAS_TLI) #if !defined (__ACE_INLINE__) diff --git a/ACE/ace/TLI.h b/ACE/ace/TLI.h index d2091787c38..bfa0e19584c 100644 --- a/ACE/ace/TLI.h +++ b/ACE/ace/TLI.h @@ -59,7 +59,7 @@ public: struct t_info *info = 0); /// Close a TLI endpoint and release resources. - int close (void); + int close (); /// Set underlying protocol options. int set_option (int level, int option, void *optval, int optlen); @@ -68,11 +68,11 @@ public: int get_option (int level, int option, void *optval, int &optlen); // = Calls to underlying TLI operations. - int look (void) const; + int look () const; int rcvdis (struct t_discon * = 0) const; int snddis (struct t_call * = 0) const; - int sndrel (void) const; - int rcvrel (void) const; + int sndrel () const; + int rcvrel () const; /// Return our local endpoint address. int get_local_addr (ACE_Addr &) const; @@ -86,10 +86,10 @@ public: protected: // = Ensure we are an abstract class. /// Default constructor. - ACE_TLI (void); + ACE_TLI (); /// Destructor. - ~ACE_TLI (void); + ~ACE_TLI (); /// Initialize a TLI endpoint. ACE_TLI (const char device[], int oflag = O_RDWR, struct t_info *info = 0); diff --git a/ACE/ace/TLI_Acceptor.cpp b/ACE/ace/TLI_Acceptor.cpp index 4014907521f..bd81572e2e1 100644 --- a/ACE/ace/TLI_Acceptor.cpp +++ b/ACE/ace/TLI_Acceptor.cpp @@ -4,8 +4,6 @@ #include "ace/OS_NS_string.h" #include "ace/OS_Memory.h" - - #if defined (ACE_HAS_TLI) ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -23,7 +21,7 @@ struct ACE_TLI_Request class ACE_TLI_Request_Queue { public: - ACE_TLI_Request_Queue (void); + ACE_TLI_Request_Queue (); ACE_HANDLE open (ACE_HANDLE fd, int size); int close (void); @@ -32,10 +30,10 @@ public: int dequeue (ACE_TLI_Request *&ptr); int remove (int sequence_number); - int is_empty (void) const; - int is_full (void) const; + int is_empty () const; + int is_full () const; - ACE_TLI_Request *alloc (void); + ACE_TLI_Request *alloc (); void free (ACE_TLI_Request *node); void dump () const; diff --git a/ACE/ace/TLI_Connector.cpp b/ACE/ace/TLI_Connector.cpp index 42682e4dc29..ba4d6524d0c 100644 --- a/ACE/ace/TLI_Connector.cpp +++ b/ACE/ace/TLI_Connector.cpp @@ -1,7 +1,5 @@ #include "ace/TLI_Connector.h" - - #if defined (ACE_HAS_TLI) #if !defined (__ACE_INLINE__) diff --git a/ACE/ace/TLI_Connector.h b/ACE/ace/TLI_Connector.h index 38b2e7d4b54..3b2a99e09a3 100644 --- a/ACE/ace/TLI_Connector.h +++ b/ACE/ace/TLI_Connector.h @@ -8,7 +8,6 @@ */ //============================================================================= - #ifndef ACE_TLI_CONNECTOR_H #define ACE_TLI_CONNECTOR_H #include /**/ "ace/pre.h" diff --git a/ACE/ace/TLI_Stream.cpp b/ACE/ace/TLI_Stream.cpp index 3f20739a477..3577169396a 100644 --- a/ACE/ace/TLI_Stream.cpp +++ b/ACE/ace/TLI_Stream.cpp @@ -5,8 +5,6 @@ #include "ace/ACE.h" #include "ace/OS_NS_unistd.h" - - #if defined (ACE_HAS_TLI) #if !defined (__ACE_INLINE__) diff --git a/ACE/ace/TP_Reactor.h b/ACE/ace/TP_Reactor.h index 0a8a326443c..f8e59ccc0b7 100644 --- a/ACE/ace/TP_Reactor.h +++ b/ACE/ace/TP_Reactor.h @@ -302,9 +302,8 @@ private: int post_process_socket_event (ACE_EH_Dispatch_Info &dispatch_info,int status); private: - /// Deny access since member-wise won't work... - ACE_TP_Reactor (const ACE_TP_Reactor &); - ACE_TP_Reactor &operator = (const ACE_TP_Reactor &); + ACE_TP_Reactor (const ACE_TP_Reactor &) = delete; + ACE_TP_Reactor &operator = (const ACE_TP_Reactor &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/TSS_Adapter.cpp b/ACE/ace/TSS_Adapter.cpp index 38a31872e30..938ca6bb822 100644 --- a/ACE/ace/TSS_Adapter.cpp +++ b/ACE/ace/TSS_Adapter.cpp @@ -1,8 +1,6 @@ /** * @file TSS_Adapter.cpp * - * Originally in Synch.cpp - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ diff --git a/ACE/ace/TSS_Adapter.h b/ACE/ace/TSS_Adapter.h index 06abdac3803..f5dbc99fd0f 100644 --- a/ACE/ace/TSS_Adapter.h +++ b/ACE/ace/TSS_Adapter.h @@ -4,8 +4,6 @@ /** * @file TSS_Adapter.h * - * Originally in Synch.h - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== diff --git a/ACE/ace/TSS_T.h b/ACE/ace/TSS_T.h index f894912f50b..963c2a8b07f 100644 --- a/ACE/ace/TSS_T.h +++ b/ACE/ace/TSS_T.h @@ -4,8 +4,6 @@ /** * @file TSS_T.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== diff --git a/ACE/ace/TTY_IO.h b/ACE/ace/TTY_IO.h index 860184d7de2..5b2a414fcbc 100644 --- a/ACE/ace/TTY_IO.h +++ b/ACE/ace/TTY_IO.h @@ -34,7 +34,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL class ACE_Export ACE_TTY_IO : public ACE_DEV_IO { public: - ACE_TTY_IO (void); + ACE_TTY_IO (); enum Control_Mode { @@ -44,7 +44,7 @@ public: struct ACE_Export Serial_Params { - Serial_Params (void); + Serial_Params (); /** Specifies the baudrate at which the communication port operates. */ int baudrate; diff --git a/ACE/ace/Task.h b/ACE/ace/Task.h index 92a6e788f41..4d6cd358eba 100644 --- a/ACE/ace/Task.h +++ b/ACE/ace/Task.h @@ -282,10 +282,8 @@ protected: /// Holds the thread ID of the last thread to exit svc() in this object. ACE_thread_t last_thread_id_; private: - - // = Disallow these operations. - ACE_Task_Base &operator= (const ACE_Task_Base &); - ACE_Task_Base (const ACE_Task_Base &); + ACE_Task_Base &operator= (const ACE_Task_Base &) = delete; + ACE_Task_Base (const ACE_Task_Base &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Task_T.h b/ACE/ace/Task_T.h index 69b235668e7..c8aafb5e050 100644 --- a/ACE/ace/Task_T.h +++ b/ACE/ace/Task_T.h @@ -168,7 +168,6 @@ public: // Should be protected: ACE_ALLOC_HOOK_DECLARE; private: - // = Disallow these operations. void operator= (const ACE_Task<ACE_SYNCH_USE, TIME_POLICY> &) = delete; ACE_Task (const ACE_Task<ACE_SYNCH_USE, TIME_POLICY> &) = delete; }; diff --git a/ACE/ace/Thread_Mutex.cpp b/ACE/ace/Thread_Mutex.cpp index 1881d405579..4bf4cca5e83 100644 --- a/ACE/ace/Thread_Mutex.cpp +++ b/ACE/ace/Thread_Mutex.cpp @@ -1,8 +1,6 @@ /** * @file Thread_Mutex.cpp * - * Originally in Synch.cpp - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ @@ -17,8 +15,6 @@ #include "ace/Log_Category.h" #include "ace/Malloc_T.h" - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Mutex) diff --git a/ACE/ace/Thread_Mutex.h b/ACE/ace/Thread_Mutex.h index 72e1e5e6e37..3793c5654ed 100644 --- a/ACE/ace/Thread_Mutex.h +++ b/ACE/ace/Thread_Mutex.h @@ -4,8 +4,6 @@ /** * @file Thread_Mutex.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== @@ -156,9 +154,8 @@ protected: bool removed_; private: - // = Prevent assignment and initialization. - void operator= (const ACE_Thread_Mutex &); - ACE_Thread_Mutex (const ACE_Thread_Mutex &); + void operator= (const ACE_Thread_Mutex &) = delete; + ACE_Thread_Mutex (const ACE_Thread_Mutex &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Thread_Semaphore.cpp b/ACE/ace/Thread_Semaphore.cpp index a4a18d5e788..41eabea789a 100644 --- a/ACE/ace/Thread_Semaphore.cpp +++ b/ACE/ace/Thread_Semaphore.cpp @@ -1,8 +1,6 @@ /** * @file Thread_Semaphore.cpp * - * Originally in Synch.cpp - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ @@ -20,9 +18,6 @@ #include "ace/ACE.h" - - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Thread_Semaphore) diff --git a/ACE/ace/Thread_Semaphore.h b/ACE/ace/Thread_Semaphore.h index f1d80beb55c..f5ada7cad3b 100644 --- a/ACE/ace/Thread_Semaphore.h +++ b/ACE/ace/Thread_Semaphore.h @@ -4,8 +4,6 @@ /** * @file Thread_Semaphore.h * - * Moved from Synch.h. - * * @author Douglas C. Schmidt <d.schmidt@vanderbilt.edu> */ //========================================================================== diff --git a/ACE/ace/Throughput_Stats.cpp b/ACE/ace/Throughput_Stats.cpp index 5db90f1d593..4a472d27c3d 100644 --- a/ACE/ace/Throughput_Stats.cpp +++ b/ACE/ace/Throughput_Stats.cpp @@ -5,16 +5,8 @@ #include "ace/High_Res_Timer.h" #include "ace/Log_Category.h" - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL -ACE_Throughput_Stats::ACE_Throughput_Stats () - : ACE_Basic_Stats () - , throughput_last_ (0) -{ -} - void ACE_Throughput_Stats::sample (ACE_UINT64 throughput, ACE_UINT64 latency) diff --git a/ACE/ace/Throughput_Stats.h b/ACE/ace/Throughput_Stats.h index f3d1744c562..0d3f71f53eb 100644 --- a/ACE/ace/Throughput_Stats.h +++ b/ACE/ace/Throughput_Stats.h @@ -44,7 +44,7 @@ class ACE_Export ACE_Throughput_Stats : public ACE_Basic_Stats { public: /// Constructor - ACE_Throughput_Stats (void); + ACE_Throughput_Stats () = default; /// Store one sample void sample (ACE_UINT64 throughput, ACE_UINT64 latency); @@ -62,7 +62,7 @@ public: ACE_UINT32 samples_count); private: /// The last throughput measurement. - ACE_UINT64 throughput_last_; + ACE_UINT64 throughput_last_ {}; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Time_Value.cpp b/ACE/ace/Time_Value.cpp index 24b8ee58efe..6e8678860fb 100644 --- a/ACE/ace/Time_Value.cpp +++ b/ACE/ace/Time_Value.cpp @@ -39,9 +39,6 @@ const ACE_Time_Value ACE_Time_Value::max_time ( ACE_ALLOC_HOOK_DEFINE (ACE_Time_Value) -ACE_Time_Value::~ACE_Time_Value() -{} - /// Increment microseconds (the only reason this is here is to allow /// the use of ACE_Atomic_Op with ACE_Time_Value). ACE_Time_Value diff --git a/ACE/ace/Time_Value.h b/ACE/ace/Time_Value.h index c543896ca90..8e1f7de6383 100644 --- a/ACE/ace/Time_Value.h +++ b/ACE/ace/Time_Value.h @@ -88,7 +88,7 @@ public: } /// Destructor - virtual ~ACE_Time_Value (); + virtual ~ACE_Time_Value () = default; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Timeprobe.cpp b/ACE/ace/Timeprobe.cpp index d1895827f2a..be7fe698c89 100644 --- a/ACE/ace/Timeprobe.cpp +++ b/ACE/ace/Timeprobe.cpp @@ -1,7 +1,5 @@ #include "ace/config-all.h" - - #if defined (ACE_COMPILE_TIMEPROBES) #include "ace/Timeprobe.h" diff --git a/ACE/ace/Timer_Heap_T.cpp b/ACE/ace/Timer_Heap_T.cpp index b29d8bc7b7d..0a1be5f8434 100644 --- a/ACE/ace/Timer_Heap_T.cpp +++ b/ACE/ace/Timer_Heap_T.cpp @@ -39,7 +39,6 @@ ACE_HEAP_LCHILD (size_t X) } // Constructor that takes in an <ACE_Timer_Heap_T> to iterate over. - template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::ACE_Timer_Heap_Iterator_T ( Heap & heap) @@ -49,13 +48,7 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::ACE_Timer_Heap_ this->first (); } -template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> -ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::~ACE_Timer_Heap_Iterator_T () -{ -} - // Positions the iterator at the first node in the heap array - template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> void ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first () @@ -64,7 +57,6 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::first () } // Positions the iterator at the next node in the heap array - template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> void ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::next () @@ -74,7 +66,6 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::next () } // Returns true the <position_> is at the end of the heap array - template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> bool ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::isdone () const { @@ -82,7 +73,6 @@ ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::isdone () const } // Returns the node at the current position in the heap or 0 if at the end - template <class TYPE, class FUNCTOR, class ACE_LOCK, typename TIME_POLICY> ACE_Timer_Node_T<TYPE> * ACE_Timer_Heap_Iterator_T<TYPE, FUNCTOR, ACE_LOCK, TIME_POLICY>::item () { diff --git a/ACE/ace/Timer_Heap_T.h b/ACE/ace/Timer_Heap_T.h index eed63517e1c..4dcd896665d 100644 --- a/ACE/ace/Timer_Heap_T.h +++ b/ACE/ace/Timer_Heap_T.h @@ -45,19 +45,19 @@ public: ACE_Timer_Heap_Iterator_T (Heap &); /// Destructor. - virtual ~ACE_Timer_Heap_Iterator_T (); + ~ACE_Timer_Heap_Iterator_T () override = default; /// Positions the iterator at the earliest node in the Timer Queue - virtual void first (); + void first () override; /// Positions the iterator at the next node in the Timer Queue - virtual void next (); + void next () override; /// Returns true when there are no more nodes in the sequence - virtual bool isdone () const; + bool isdone () const override; /// Returns the node at the current position in the sequence - virtual ACE_Timer_Node_T<TYPE> *item (); + ACE_Timer_Node_T<TYPE> *item () override; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; 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/ace/Timer_Queue_Iterator.cpp b/ACE/ace/Timer_Queue_Iterator.cpp index 40965be1433..5caf9098553 100644 --- a/ACE/ace/Timer_Queue_Iterator.cpp +++ b/ACE/ace/Timer_Queue_Iterator.cpp @@ -51,11 +51,6 @@ ACE_Timer_Node_T<TYPE>::~ACE_Timer_Node_T () } template <class TYPE> -ACE_Timer_Queue_Iterator_T<TYPE>::ACE_Timer_Queue_Iterator_T () -{ -} - -template <class TYPE> ACE_Timer_Queue_Iterator_T<TYPE>::~ACE_Timer_Queue_Iterator_T () { } diff --git a/ACE/ace/Timer_Queue_Iterator.h b/ACE/ace/Timer_Queue_Iterator.h index 51aa013518a..ebb30d5dddf 100644 --- a/ACE/ace/Timer_Queue_Iterator.h +++ b/ACE/ace/Timer_Queue_Iterator.h @@ -163,7 +163,7 @@ class ACE_Timer_Queue_Iterator_T { public: /// Constructor. - ACE_Timer_Queue_Iterator_T (); + ACE_Timer_Queue_Iterator_T () = default; /// Destructor. virtual ~ACE_Timer_Queue_Iterator_T (); diff --git a/ACE/ace/Token.cpp b/ACE/ace/Token.cpp index e142ea5e007..b8312287a85 100644 --- a/ACE/ace/Token.cpp +++ b/ACE/ace/Token.cpp @@ -4,8 +4,6 @@ # include "ace/Token.inl" #endif /* __ACE_INLINE__ */ - - #if defined (ACE_HAS_THREADS) #include "ace/Thread.h" diff --git a/ACE/ace/Token_Collection.cpp b/ACE/ace/Token_Collection.cpp index c15d7cf9c51..c67950243ad 100644 --- a/ACE/ace/Token_Collection.cpp +++ b/ACE/ace/Token_Collection.cpp @@ -6,7 +6,6 @@ #include "ace/Token_Collection.inl" #endif /* __ACE_INLINE__ */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_Token_Collection::ACE_Token_Collection (bool debug, diff --git a/ACE/ace/Token_Invariants.cpp b/ACE/ace/Token_Invariants.cpp index 4d664c02b2f..e8a6d03684d 100644 --- a/ACE/ace/Token_Invariants.cpp +++ b/ACE/ace/Token_Invariants.cpp @@ -35,7 +35,7 @@ ACE_Token_Invariant_Manager::instance (void) return instance_; } -ACE_Token_Invariant_Manager::ACE_Token_Invariant_Manager (void) +ACE_Token_Invariant_Manager::ACE_Token_Invariant_Manager () { ACE_TRACE ("ACE_Token_Invariant_Manager::ACE_Token_Invariant_Manager"); } @@ -225,13 +225,8 @@ ACE_Token_Invariant_Manager::~ACE_Token_Invariant_Manager (void) // ************************************************** // ************************************************** -ACE_Mutex_Invariants::ACE_Mutex_Invariants (void) -: owners_ (0) -{ -} - int -ACE_Mutex_Invariants::acquired (void) +ACE_Mutex_Invariants::acquired () { if (++owners_ > 1) { @@ -243,23 +238,12 @@ ACE_Mutex_Invariants::acquired (void) } void -ACE_Mutex_Invariants::releasing (void) +ACE_Mutex_Invariants::releasing () { if (owners_ == 1) --owners_; } -ACE_Mutex_Invariants::ACE_Mutex_Invariants (const ACE_Mutex_Invariants &rhs) -: owners_ (rhs.owners_) -{ -} - -void -ACE_Mutex_Invariants::operator= (const ACE_Mutex_Invariants &rhs) -{ - owners_ = rhs.owners_; -} - void ACE_Mutex_Invariants::dump (void) const { @@ -272,14 +256,6 @@ ACE_Mutex_Invariants::dump (void) const } // ************************************************** -// ************************************************** -// ************************************************** - -ACE_RWLock_Invariants::ACE_RWLock_Invariants (void) -: writers_ (0), - readers_ (0) -{ -} int ACE_RWLock_Invariants::writer_acquired (void) @@ -322,19 +298,6 @@ ACE_RWLock_Invariants::releasing (void) --readers_; } -ACE_RWLock_Invariants::ACE_RWLock_Invariants (const ACE_RWLock_Invariants &rhs) -: writers_ (rhs.writers_), - readers_ (rhs.readers_) -{ -} - -void -ACE_RWLock_Invariants::operator= (const ACE_RWLock_Invariants &rhs) -{ - writers_ = rhs.writers_; - readers_ = rhs.readers_; -} - void ACE_RWLock_Invariants::dump (void) const { diff --git a/ACE/ace/Token_Invariants.h b/ACE/ace/Token_Invariants.h index 78603ced6a0..209fb1c32a9 100644 --- a/ACE/ace/Token_Invariants.h +++ b/ACE/ace/Token_Invariants.h @@ -41,29 +41,29 @@ class ACE_Export ACE_Mutex_Invariants { public: /// Default construction. - ACE_Mutex_Invariants (void); + ACE_Mutex_Invariants () = default; /// Returns 1 on success, 0 when an invariant has been violated and /// -1 on error. - int acquired (void); + int acquired (); /// Updates internal database. - void releasing (void); + void releasing (); // = Map_Manager operations. /// Copy construction. - ACE_Mutex_Invariants (const ACE_Mutex_Invariants &rhs); + ACE_Mutex_Invariants (const ACE_Mutex_Invariants &rhs) = default; /// Copy. - void operator= (const ACE_Mutex_Invariants &rhs); + void operator= (const ACE_Mutex_Invariants &rhs) = default; /// Dump the state of the class. void dump () const; private: /// Number of owners. This had better be 0 >= owners_ <= 1; - int owners_; + int owners_ {}; }; /** @@ -79,36 +79,36 @@ class ACE_Export ACE_RWLock_Invariants { public: /// Default construction. - ACE_RWLock_Invariants (void); + ACE_RWLock_Invariants () = default; /// Returns 1 on success, 0 when an invariant has been violated and /// -1 on error. - int writer_acquired (void); + int writer_acquired (); /// Returns 1 on success, 0 when an invariant has been violated and /// -1 on error. - int reader_acquired (void); + int reader_acquired (); /// Updates internal database. - void releasing (void); + void releasing (); // = Map_Manager operations. /// Copy construction. - ACE_RWLock_Invariants (const ACE_RWLock_Invariants &rhs); + ACE_RWLock_Invariants (const ACE_RWLock_Invariants &rhs) = default; /// Copy. - void operator= (const ACE_RWLock_Invariants &rhs); + void operator= (const ACE_RWLock_Invariants &rhs) = default; /// Dump the state of the class. void dump () const; private: /// Number of owning writers. - int writers_; + int writers_ {}; /// Number of owning readers. - int readers_; + int readers_ {}; }; /** diff --git a/ACE/ace/Token_Request_Reply.cpp b/ACE/ace/Token_Request_Reply.cpp index 3df3541ef9c..8737e7576bb 100644 --- a/ACE/ace/Token_Request_Reply.cpp +++ b/ACE/ace/Token_Request_Reply.cpp @@ -6,12 +6,9 @@ #include "ace/Token_Request_Reply.inl" #endif /* __ACE_INLINE__ */ - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL // Default "do nothing" constructor. - ACE_Token_Request::ACE_Token_Request (void) : token_name_ (0), client_id_ (0) diff --git a/ACE/ace/Token_Request_Reply.h b/ACE/ace/Token_Request_Reply.h index 85987ff3861..7452648809c 100644 --- a/ACE/ace/Token_Request_Reply.h +++ b/ACE/ace/Token_Request_Reply.h @@ -58,7 +58,7 @@ public: }; /// Default constructor. - ACE_Token_Request (void); + ACE_Token_Request (); /** * @param token_type MUTEX, RWLOCK @@ -76,45 +76,45 @@ public: const ACE_Synch_Options &options); /// Get the length of the encoded/decoded message. - ACE_UINT32 length (void) const; + ACE_UINT32 length () const; /// Set the length of the encoded/decoded message. void length (ACE_UINT32); /// Get the type of proxy - int proxy_type (void) const; + int proxy_type () const; /// Set the type of proxy void proxy_type (int proxy_type); /// Get the type of token - int token_type (void) const; + int token_type () const; /// Set the type of token void token_type (int token_type); /// Get the type of the operation. - ACE_UINT32 operation_type (void) const; + ACE_UINT32 operation_type () const; /// Set the type of the operation. void operation_type (ACE_UINT32); /// Get the requeue position. These should be used when renew /// is the operation type. - ACE_UINT32 requeue_position (void) const; + ACE_UINT32 requeue_position () const; /// Set the requeue position. These should be used when renew /// is the operation type. void requeue_position (ACE_UINT32); /// Get notify. These should be used when acquire is the operation type. - ACE_UINT32 notify (void) const; + ACE_UINT32 notify () const; /// Set notify. These should be used when acquire is the operation type. void notify (ACE_UINT32); /// Get the timeout. - ACE_Synch_Options &options (void) const; + ACE_Synch_Options &options () const; /// Set the timeout. void options (const ACE_Synch_Options &options); @@ -122,8 +122,8 @@ public: // = Set/get the name of the token and the client id. The set // method is combined to make it easier on us. We're copying the // names as a contiguous buffer. - ACE_TCHAR *token_name (void) const; - ACE_TCHAR *client_id (void) const; + ACE_TCHAR *token_name () const; + ACE_TCHAR *client_id () const; void token_name (const ACE_TCHAR *token_name, const ACE_TCHAR *client_id); /// Encode the message before transmission. @@ -131,7 +131,7 @@ public: /// Decode message after reception. This must be called to set the /// internal options. - int decode (void); + int decode (); /// Print out the values of the message for debugging purposes. void dump () const; @@ -204,22 +204,22 @@ class ACE_Export ACE_Token_Reply { public: /// Default constructor. - ACE_Token_Reply (void); + ACE_Token_Reply (); /// Get the length of the encoded/decoded message. - ACE_UINT32 length (void) const; + ACE_UINT32 length () const; /// Set the length of the encoded/decoded message. void length (ACE_UINT32); /// Get the errno of a reply. - ACE_UINT32 errnum (void) const; + ACE_UINT32 errnum () const; /// Set the errno of a reply. void errnum (ACE_UINT32); /// Get the arg of a reply. - ACE_UINT32 arg (void) const; + ACE_UINT32 arg () const; /// Set the arg of a reply. void arg (ACE_UINT32); @@ -228,14 +228,13 @@ public: int encode (void *&); /// Decode a message after reception. - int decode (void); + int decode (); /// Print out the values of the message for debugging purposes. void dump () const; private: - // = The 2 fields in the <Transfer> struct are transmitted to the server. - + /// The 2 fields in the <Transfer> struct are transmitted to the server. struct Transfer { /// Length of entire reply. @@ -251,7 +250,6 @@ private: /// magic cookie ACE_UINT32 arg_; - } transfer_; }; diff --git a/ACE/ace/UNIX_Addr.cpp b/ACE/ace/UNIX_Addr.cpp index bae284b79ca..d75c227c3e2 100644 --- a/ACE/ace/UNIX_Addr.cpp +++ b/ACE/ace/UNIX_Addr.cpp @@ -1,7 +1,5 @@ #include "ace/UNIX_Addr.h" - - #if !defined (ACE_LACKS_UNIX_DOMAIN_SOCKETS) #if defined (ACE_HAS_ALLOC_HOOKS) diff --git a/ACE/ace/UNIX_Addr.h b/ACE/ace/UNIX_Addr.h index 255832d51b3..fed5df7fab6 100644 --- a/ACE/ace/UNIX_Addr.h +++ b/ACE/ace/UNIX_Addr.h @@ -38,7 +38,7 @@ class ACE_Export ACE_UNIX_Addr : public ACE_Addr { public: /// Default constructor. - ACE_UNIX_Addr (void); + ACE_UNIX_Addr (); /// Copy constructor. ACE_UNIX_Addr (const ACE_UNIX_Addr &sa); @@ -59,7 +59,7 @@ public: int set (const sockaddr_un *, int len); /// Return a pointer to the underlying network address. - virtual void *get_addr (void) const; + virtual void *get_addr () const; /// Set a pointer to the underlying network address. virtual void set_addr (const void *addr, int len); @@ -85,10 +85,10 @@ public: bool operator != (const ACE_UNIX_Addr &SAP) const; /// Return the path name of the underlying rendezvous point. - const char *get_path_name (void) const; + const char *get_path_name () const; /// Computes and returns hash value. - virtual u_long hash (void) const; + virtual u_long hash () const; /// Dump the state of an object. void dump () const; diff --git a/ACE/ace/UPIPE_Acceptor.cpp b/ACE/ace/UPIPE_Acceptor.cpp index 33d62eab73a..686fad0c811 100644 --- a/ACE/ace/UPIPE_Acceptor.cpp +++ b/ACE/ace/UPIPE_Acceptor.cpp @@ -1,7 +1,5 @@ #include "ace/UPIPE_Acceptor.h" - - #if defined (ACE_HAS_THREADS) #include "ace/OS_NS_unistd.h" @@ -36,7 +34,6 @@ ACE_UPIPE_Acceptor::~ACE_UPIPE_Acceptor () } // General purpose routine for performing server ACE_UPIPE. - int ACE_UPIPE_Acceptor::open (const ACE_UPIPE_Addr &local_addr, int reuse_addr) @@ -53,7 +50,6 @@ ACE_UPIPE_Acceptor::close () } // General purpose routine for accepting new connections. - ACE_UPIPE_Acceptor::ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_addr, int reuse_addr) : mb_ (sizeof (ACE_UPIPE_Stream *)) diff --git a/ACE/ace/UPIPE_Acceptor.h b/ACE/ace/UPIPE_Acceptor.h index 6516ba45339..14f824ab924 100644 --- a/ACE/ace/UPIPE_Acceptor.h +++ b/ACE/ace/UPIPE_Acceptor.h @@ -37,7 +37,7 @@ class ACE_Export ACE_UPIPE_Acceptor : public ACE_SPIPE_Acceptor { public: /// Default constructor. - ACE_UPIPE_Acceptor (void); + ACE_UPIPE_Acceptor (); /// Initialize passive endpoint. ACE_UPIPE_Acceptor (const ACE_UPIPE_Addr &local_sap, @@ -48,14 +48,14 @@ public: int reuse_addr = 0); /// Close down and release resources. - ~ACE_UPIPE_Acceptor (void); + ~ACE_UPIPE_Acceptor (); /// Close down and release resources. - int close (void); + int close (); /// Close down and release resources and remove the underlying SPIPE /// rendezvous point. - int remove (void); + int remove (); // = Passive connection acceptance method. /** diff --git a/ACE/ace/UPIPE_Connector.cpp b/ACE/ace/UPIPE_Connector.cpp index 48d854d7cd4..03c61ea5999 100644 --- a/ACE/ace/UPIPE_Connector.cpp +++ b/ACE/ace/UPIPE_Connector.cpp @@ -1,7 +1,5 @@ #include "ace/UPIPE_Connector.h" - - #if defined (ACE_HAS_THREADS) #include "ace/Handle_Ops.h" diff --git a/ACE/ace/UPIPE_Stream.cpp b/ACE/ace/UPIPE_Stream.cpp index 69c7e6e3733..49c1fa24d51 100644 --- a/ACE/ace/UPIPE_Stream.cpp +++ b/ACE/ace/UPIPE_Stream.cpp @@ -1,7 +1,5 @@ #include "ace/UPIPE_Stream.h" - - #if defined (ACE_HAS_THREADS) #include "ace/OS_NS_string.h" diff --git a/ACE/ace/UTF16_Encoding_Converter.cpp b/ACE/ace/UTF16_Encoding_Converter.cpp index 941ab11b24e..b1455d3b5f9 100644 --- a/ACE/ace/UTF16_Encoding_Converter.cpp +++ b/ACE/ace/UTF16_Encoding_Converter.cpp @@ -30,17 +30,17 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -static const ACE_UINT32 halfShift = 10; -static const ACE_UINT32 halfBase = 0x00010000; -static const ACE_UINT32 halfMask = 0x000003FF; - -static const ACE_UINT32 UNI_SUR_HIGH_START = 0x0000D800; -static const ACE_UINT32 UNI_SUR_HIGH_END = 0x0000DBFF; -static const ACE_UINT32 UNI_SUR_LOW_START = 0x0000DC00; -static const ACE_UINT32 UNI_SUR_LOW_END = 0x0000DFFF; -static const ACE_UINT32 UNI_REPLACEMENT_CHAR = 0x0000FFFD; -static const ACE_UINT32 UNI_MAX_BMP = 0x0000FFFF; -static const ACE_UINT32 UNI_MAX_UTF16 = 0x0010FFFF; +static constexpr ACE_UINT32 halfShift = 10; +static constexpr ACE_UINT32 halfBase = 0x00010000; +static constexpr ACE_UINT32 halfMask = 0x000003FF; + +static constexpr ACE_UINT32 UNI_SUR_HIGH_START = 0x0000D800; +static constexpr ACE_UINT32 UNI_SUR_HIGH_END = 0x0000DBFF; +static constexpr ACE_UINT32 UNI_SUR_LOW_START = 0x0000DC00; +static constexpr ACE_UINT32 UNI_SUR_LOW_END = 0x0000DFFF; +static constexpr ACE_UINT32 UNI_REPLACEMENT_CHAR = 0x0000FFFD; +static constexpr ACE_UINT32 UNI_MAX_BMP = 0x0000FFFF; +static constexpr ACE_UINT32 UNI_MAX_UTF16 = 0x0010FFFF; // Once the bits are split out into bytes of UTF-8, this is a mask OR-ed // into the first byte, depending on how many bytes follow. There are diff --git a/ACE/ace/UTF8_Encoding_Converter.h b/ACE/ace/UTF8_Encoding_Converter.h index 3cca2f41d15..fbb96c3d559 100644 --- a/ACE/ace/UTF8_Encoding_Converter.h +++ b/ACE/ace/UTF8_Encoding_Converter.h @@ -29,10 +29,10 @@ class ACE_UTF8_Encoding_Converter: public ACE_Encoding_Converter public: /// Allocate the converter to be used by the from_utf8() method based /// on the size of the native wide character. - ACE_UTF8_Encoding_Converter (void); + ACE_UTF8_Encoding_Converter (); /// De-allocate the native converter. - virtual ~ACE_UTF8_Encoding_Converter (void); + virtual ~ACE_UTF8_Encoding_Converter (); /// Since the source *must be* UTF-8, there is no conversion required. /// This method just copies the source to the target given that there diff --git a/ACE/ace/Unbounded_Queue.h b/ACE/ace/Unbounded_Queue.h index 172f0b84319..f0773b44ccc 100644 --- a/ACE/ace/Unbounded_Queue.h +++ b/ACE/ace/Unbounded_Queue.h @@ -157,7 +157,7 @@ public: /** * Initialize an empty queue using the strategy provided. */ - ACE_Unbounded_Queue (ACE_Allocator *alloc = 0); + ACE_Unbounded_Queue (ACE_Allocator *alloc = nullptr); /// Copy constructor. /** diff --git a/ACE/ace/Unbounded_Set.h b/ACE/ace/Unbounded_Set.h index 56dc0fbdedd..2fc19a24a3e 100644 --- a/ACE/ace/Unbounded_Set.h +++ b/ACE/ace/Unbounded_Set.h @@ -77,7 +77,7 @@ class ACE_Unbounded_Set : public ACE_Unbounded_Set_Ex<T, ACE_Unbounded_Set_Default_Comparator<T> > { public: - ACE_Unbounded_Set (ACE_Allocator *alloc = 0); + ACE_Unbounded_Set (ACE_Allocator *alloc = nullptr); }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/Unbounded_Set_Ex.h b/ACE/ace/Unbounded_Set_Ex.h index c59c1ec81ae..6b289c0a415 100644 --- a/ACE/ace/Unbounded_Set_Ex.h +++ b/ACE/ace/Unbounded_Set_Ex.h @@ -234,13 +234,13 @@ public: * Initialize an empty set using the allocation strategy of the user if * provided. */ - ACE_Unbounded_Set_Ex (ACE_Allocator *alloc = 0); + ACE_Unbounded_Set_Ex (ACE_Allocator *alloc = nullptr); /** * Initialize an empty set using the allocation strategy of the user if * provided, and a given comparator functor. */ - ACE_Unbounded_Set_Ex (const C &comparator, ACE_Allocator *alloc = 0); + ACE_Unbounded_Set_Ex (const C &comparator, ACE_Allocator *alloc = nullptr); /// Copy constructor. /** diff --git a/ACE/ace/Value_Ptr.h b/ACE/ace/Value_Ptr.h index f099bd6ebac..2f558b98c15 100644 --- a/ACE/ace/Value_Ptr.h +++ b/ACE/ace/Value_Ptr.h @@ -65,9 +65,8 @@ namespace ACE class Value_Ptr { public: - /// Constructor. - explicit Value_Ptr (T * p = 0) : p_ (p) { } + explicit Value_Ptr (T * p = 0) : p_ (p) {} /// Destructor. ~Value_Ptr () { delete this->p_; } @@ -117,7 +116,6 @@ namespace ACE } private: - /// Copying method invoked when copy constructing. template <typename U> T * create_from (U const * p) const @@ -130,7 +128,6 @@ namespace ACE /// Object owned by this @c Value_Ptr. T * p_; - }; } diff --git a/ACE/ace/Vector_T.h b/ACE/ace/Vector_T.h index e132dd9851c..e4cf710602e 100644 --- a/ACE/ace/Vector_T.h +++ b/ACE/ace/Vector_T.h @@ -25,7 +25,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL /* * Default size for an ACE_Vector. */ -static const size_t ACE_VECTOR_DEFAULT_SIZE = 32; +static constexpr size_t ACE_VECTOR_DEFAULT_SIZE = 32; // Forward declaration. template <class T, size_t DEFAULT_SIZE> class ACE_Vector_Iterator; @@ -88,7 +88,7 @@ public: /** * Destructor. */ - ~ACE_Vector (); + ~ACE_Vector () = default; /// Declare the dynamic allocation hooks. ACE_ALLOC_HOOK_DECLARE; diff --git a/ACE/ace/Vector_T.inl b/ACE/ace/Vector_T.inl index 9079375a5d6..8ed7d5c1a2a 100644 --- a/ACE/ace/Vector_T.inl +++ b/ACE/ace/Vector_T.inl @@ -13,11 +13,6 @@ ACE_Vector<T, DEFAULT_SIZE>::ACE_Vector (const size_t init_size, } template <class T, size_t DEFAULT_SIZE> ACE_INLINE -ACE_Vector<T, DEFAULT_SIZE>::~ACE_Vector () -{ -} - -template <class T, size_t DEFAULT_SIZE> ACE_INLINE size_t ACE_Vector<T, DEFAULT_SIZE>::capacity () const { return curr_max_size_; diff --git a/ACE/ace/WFMO_Reactor.h b/ACE/ace/WFMO_Reactor.h index fb778aba0cf..0c1d5dab885 100644 --- a/ACE/ace/WFMO_Reactor.h +++ b/ACE/ace/WFMO_Reactor.h @@ -188,10 +188,10 @@ public: bool suspend_entry_; /// Default constructor - Current_Info (void); + Current_Info (); /// Reset the state of the structure - void reset (void); + void reset (); /// Set the structure to these new values void set (bool io_entry, @@ -227,10 +227,10 @@ public: bool suspend_entry_; /// Default constructor - To_Be_Added_Info (void); + To_Be_Added_Info (); /// Reset the state of the structure - void reset (void); + void reset (); /// Set the structure to these new values void set (ACE_HANDLE event_handle, @@ -268,10 +268,10 @@ public: bool resume_entry_; /// Constructor used for initializing the structure - Suspended_Info (void); + Suspended_Info (); /// Reset the state of the structure - void reset (void); + void reset (); /// Set the structure to these new values void set (ACE_HANDLE event_handle, @@ -1343,9 +1343,8 @@ protected: sig_atomic_t deactivated_; private: - /// Deny access since member-wise won't work... - ACE_WFMO_Reactor (const ACE_WFMO_Reactor &); - ACE_WFMO_Reactor &operator = (const ACE_WFMO_Reactor &); + ACE_WFMO_Reactor (const ACE_WFMO_Reactor &) = delete; + ACE_WFMO_Reactor &operator = (const ACE_WFMO_Reactor &) = delete; }; ACE_END_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/WIN32_Proactor.h b/ACE/ace/WIN32_Proactor.h index e370ee08ddc..8ce6d744c25 100644 --- a/ACE/ace/WIN32_Proactor.h +++ b/ACE/ace/WIN32_Proactor.h @@ -57,10 +57,10 @@ public: bool used_with_reactor_event_loop = false); /// Virtual destruction. - virtual ~ACE_WIN32_Proactor (void); + virtual ~ACE_WIN32_Proactor (); /// Close the IO completion port. - virtual int close (void); + virtual int close (); /// This method adds the @a handle to the I/O completion port. This /// function is a no-op function for Unix systems. @@ -81,7 +81,7 @@ public: * completion is dispatched, non-zero (-1) on errors and errno is * set accordingly. */ - virtual int handle_events (void); + virtual int handle_events (); /** * Post a result to the completion port of the Proactor. If errors @@ -94,13 +94,13 @@ public: virtual int post_completion (ACE_WIN32_Asynch_Result *result); /// Add wakeup dispatch threads (reinit). - int wake_up_dispatch_threads (void); + int wake_up_dispatch_threads (); /// Close all dispatch threads. int close_dispatch_threads (int wait); /// Get number of thread used as a parameter to @c CreateIoCompletionPort. - size_t number_of_threads (void) const; + size_t number_of_threads () const; /// Set number of thread used as a parameter to @c CreateIoCompletionPort. void number_of_threads (size_t threads); @@ -108,15 +108,15 @@ public: /// Get the event handle. virtual ACE_HANDLE get_handle (void) const; - virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (void); - virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (void); - virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (void); - virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (void); - virtual ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (void); - virtual ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (void); - virtual ACE_Asynch_Accept_Impl *create_asynch_accept (void); - virtual ACE_Asynch_Connect_Impl *create_asynch_connect (void); - virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (void); + virtual ACE_Asynch_Read_Stream_Impl *create_asynch_read_stream (); + virtual ACE_Asynch_Write_Stream_Impl *create_asynch_write_stream (); + virtual ACE_Asynch_Read_File_Impl *create_asynch_read_file (); + virtual ACE_Asynch_Write_File_Impl *create_asynch_write_file (); + virtual ACE_Asynch_Read_Dgram_Impl *create_asynch_read_dgram (); + virtual ACE_Asynch_Write_Dgram_Impl *create_asynch_write_dgram (); + virtual ACE_Asynch_Accept_Impl *create_asynch_accept (); + virtual ACE_Asynch_Connect_Impl *create_asynch_connect (); + virtual ACE_Asynch_Transmit_File_Impl *create_asynch_transmit_file (); // Methods used to create Asynch_IO_Result objects. We create the right // objects here in these methods. @@ -227,7 +227,7 @@ public: protected: /// Task to process pseudo-asynchronous operations - ACE_Asynch_Pseudo_Task & get_asynch_pseudo_task (void); + ACE_Asynch_Pseudo_Task & get_asynch_pseudo_task (); /// Called when object is signaled by OS (either via UNIX signals or /// when a Win32 object becomes signaled). diff --git a/ACE/ace/XTI_ATM_Mcast.cpp b/ACE/ace/XTI_ATM_Mcast.cpp index 44da82975ac..0e1ef23299b 100644 --- a/ACE/ace/XTI_ATM_Mcast.cpp +++ b/ACE/ace/XTI_ATM_Mcast.cpp @@ -1,7 +1,5 @@ #include "ace/XTI_ATM_Mcast.h" - - #if defined (ACE_HAS_XTI_ATM) #if !defined (__ACE_INLINE__) diff --git a/ACE/ace/config-all.h b/ACE/ace/config-all.h index 06d8eeb2b5a..106f73a66e9 100644 --- a/ACE/ace/config-all.h +++ b/ACE/ace/config-all.h @@ -4,7 +4,7 @@ /** * @file config-all.h * - * @author (Originally in OS.h)Doug Schmidt <d.schmidt@vanderbilt.edu> + * @author Doug Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... */ diff --git a/ACE/ace/config-lite.h b/ACE/ace/config-lite.h index 27a63cf6ca9..50b4398b706 100644 --- a/ACE/ace/config-lite.h +++ b/ACE/ace/config-lite.h @@ -4,7 +4,7 @@ /** * @file config-lite.h * - * @author (Originally in OS.h)Doug Schmidt <d.schmidt@vanderbilt.edu> + * @author Doug Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... * diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index 498e7bbe951..1a2bcbaad48 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -4,7 +4,7 @@ /** * @file config-macros.h * - * @author (Originally in OS.h)Doug Schmidt <d.schmidt@vanderbilt.edu> + * @author Doug Schmidt <d.schmidt@vanderbilt.edu> * @author Jesper S. M|ller<stophph@diku.dk> * @author and a cast of thousands... * 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/New_Fail_Test.cpp b/ACE/tests/New_Fail_Test.cpp index 5e1a5921802..10957e455fe 100644 --- a/ACE/tests/New_Fail_Test.cpp +++ b/ACE/tests/New_Fail_Test.cpp @@ -20,7 +20,6 @@ #include "ace/Log_Msg.h" #include "ace/OS_Memory.h" #include "ace/CORBA_macros.h" - #include "ace/Numeric_Limits.h" // This test allocates all of the heap memory, forcing 'new' to fail @@ -37,7 +36,7 @@ static const size_t BIG_BLOCK = ACE_Numeric_Limits<size_t>::max () / 2; // Shouldn't take many "as much as possible" tries to get a failure. -static const int MAX_ALLOCS_IN_TEST = 4; +static const int MAX_ALLOCS_IN_TEST = 2; static void try_ace_new (char **p) @@ -49,15 +48,15 @@ try_ace_new (char **p) static char * try_ace_new_return () { - char *p = 0; - ACE_NEW_RETURN (p, char[BIG_BLOCK], 0); + char *p {}; + ACE_NEW_RETURN (p, char[BIG_BLOCK], nullptr); return p; } static char * try_ace_new_noreturn () { - char *p = 0; + char *p {}; ACE_NEW_NORETURN (p, char[BIG_BLOCK]); return p; } @@ -66,10 +65,10 @@ int run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("New_Fail_Test")); - int status = 0; + int status {}; char *blocks[MAX_ALLOCS_IN_TEST]; - int i; + int i {}; try { diff --git a/ACE/tests/Notify_Performance_Test.cpp b/ACE/tests/Notify_Performance_Test.cpp index 84f61e6ff43..5bfb4207632 100644 --- a/ACE/tests/Notify_Performance_Test.cpp +++ b/ACE/tests/Notify_Performance_Test.cpp @@ -1,4 +1,3 @@ - //============================================================================= /** * @file Notify_Performance_Test.cpp @@ -12,7 +11,6 @@ */ //============================================================================= - #include <utility> #include "test_config.h" @@ -26,8 +24,6 @@ #include "ace/Auto_Ptr.h" #include "ace/Atomic_Op.h" - - #if defined (ACE_HAS_THREADS) // Number of client (user) threads 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: |