diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-09-23 09:20:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-23 09:20:32 +0200 |
| commit | 7b7e65323459375cda40274c9b5828b3f5aebda9 (patch) | |
| tree | 245edb7a6b35afa3c674202784cc9ac894e6b512 /TAO | |
| parent | 0b7e12778ae92315cbd51c901cb8402d6bd646a7 (diff) | |
| parent | 2aab75d5fddc126e8085c70fe8e1b875b75a30ef (diff) | |
| download | ATCD-7b7e65323459375cda40274c9b5828b3f5aebda9.tar.gz | |
Merge pull request #1941 from knutpett/knutpett/remove_void_part2
Part 2: Remove obsolescent (void) in functions with no parameters
Diffstat (limited to 'TAO')
322 files changed, 930 insertions, 930 deletions
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 988d7442bfe..715ce0199e2 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -3724,7 +3724,7 @@ TAO_CodeGen::make_rand_extension (char * const t) size_t const NUM_CHARS = ACE_OS::strlen (t); /// Use ACE_Time_Value::msec(ACE_UINT64&) as opposed to - /// ACE_Time_Value::msec(void) to avoid truncation. + /// ACE_Time_Value::msec() to avoid truncation. ACE_UINT64 msec; /// Use a const ACE_Time_Value to resolve ambiguity between diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp index 4bacf9ed310..fa78839f90e 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp @@ -842,7 +842,7 @@ be_visitor_valuetype::gen_init_defn (be_valuetype *node) << "public:" << be_idt_nl << "virtual ~" << node->local_name () << "_init ();" << be_nl; - *os << "virtual const char* tao_repository_id (void);\n" << be_nl; + *os << "virtual const char* tao_repository_id ();\n" << be_nl; *os << "// create () goes here" << be_nl; *os << be_uidt_nl << "};" << be_nl; diff --git a/TAO/TAO_IDL/fe/idl.yy.cpp b/TAO/TAO_IDL/fe/idl.yy.cpp index c23a831d94d..566e026cb55 100644 --- a/TAO/TAO_IDL/fe/idl.yy.cpp +++ b/TAO/TAO_IDL/fe/idl.yy.cpp @@ -543,10 +543,10 @@ YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size ); void yy_delete_buffer ( YY_BUFFER_STATE b ); void yy_flush_buffer ( YY_BUFFER_STATE b ); void yypush_buffer_state ( YY_BUFFER_STATE new_buffer ); -void yypop_buffer_state ( void ); +void yypop_buffer_state (); -static void yyensure_buffer_stack ( void ); -static void yy_load_buffer_state ( void ); +static void yyensure_buffer_stack (); +static void yy_load_buffer_state (); static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file ); #define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER ) @@ -591,9 +591,9 @@ int yylineno = 1; extern char yytext[]; -static yy_state_type yy_get_previous_state ( void ); +static yy_state_type yy_get_previous_state (); static yy_state_type yy_try_NUL_trans ( yy_state_type current_state ); -static int yy_get_next_buffer ( void ); +static int yy_get_next_buffer (); static void yynoreturn yy_fatal_error ( const char* msg ); /* Done after the current pattern has been matched and before the @@ -1468,34 +1468,34 @@ static AST_Decl * idl_find_node (const char *); #define YY_EXTRA_TYPE void * #endif -static int yy_init_globals ( void ); +static int yy_init_globals (); /* Accessor methods to globals. These are made visible to non-reentrant scanners for convenience. */ -int yylex_destroy ( void ); +int yylex_destroy (); -int yyget_debug ( void ); +int yyget_debug (); void yyset_debug ( int debug_flag ); -YY_EXTRA_TYPE yyget_extra ( void ); +YY_EXTRA_TYPE yyget_extra (); void yyset_extra ( YY_EXTRA_TYPE user_defined ); -FILE *yyget_in ( void ); +FILE *yyget_in (); void yyset_in ( FILE * _in_str ); -FILE *yyget_out ( void ); +FILE *yyget_out (); void yyset_out ( FILE * _out_str ); - int yyget_leng ( void ); + int yyget_leng (); -char *yyget_text ( void ); +char *yyget_text (); -int yyget_lineno ( void ); +int yyget_lineno (); void yyset_lineno ( int _line_number ); @@ -1505,9 +1505,9 @@ void yyset_lineno ( int _line_number ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap ( void ); +extern "C" int yywrap (); #else -extern int yywrap ( void ); +extern int yywrap (); #endif #endif @@ -1527,9 +1527,9 @@ static int yy_flex_strlen ( const char * ); #ifndef YY_NO_INPUT #ifdef __cplusplus -static int yyinput ( void ); +static int yyinput (); #else -static int input ( void ); +static int input (); #endif #endif diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.inl b/TAO/examples/AMH/Sink_Server/Base_Server.inl index 87240a2232c..1f966fa6302 100644 --- a/TAO/examples/AMH/Sink_Server/Base_Server.inl +++ b/TAO/examples/AMH/Sink_Server/Base_Server.inl @@ -1,7 +1,7 @@ #include "Base_Server.h" ACE_INLINE CORBA::ORB_ptr -Base_Server::orb (void) +Base_Server::orb () { return this->orb_.in(); } diff --git a/TAO/examples/Event_Comm/Consumer_Handler.h b/TAO/examples/Event_Comm/Consumer_Handler.h index de31459a273..71e5acd405d 100644 --- a/TAO/examples/Event_Comm/Consumer_Handler.h +++ b/TAO/examples/Event_Comm/Consumer_Handler.h @@ -35,7 +35,7 @@ public: Consumer_Handler (); /// Destructor. - virtual ~Consumer_Handler (void) = default; + virtual ~Consumer_Handler () = default; /// Initializes the ORB, gets the Notifier reference from the Naming /// Service, and starts the servant for the Consumer object. diff --git a/TAO/examples/Event_Comm/Consumer_Input_Handler.h b/TAO/examples/Event_Comm/Consumer_Input_Handler.h index 43a37afbbfe..b8a91aea145 100644 --- a/TAO/examples/Event_Comm/Consumer_Input_Handler.h +++ b/TAO/examples/Event_Comm/Consumer_Input_Handler.h @@ -40,7 +40,7 @@ public: Consumer_Input_Handler(); /// Destructor. - ~Consumer_Input_Handler (void) = default; + ~Consumer_Input_Handler () = default; /// registers the input event handler. /// returns 0 on success, -1 on error. diff --git a/TAO/examples/Event_Comm/Event_Comm_i.h b/TAO/examples/Event_Comm/Event_Comm_i.h index 4f45b0de3bd..19037ec172c 100644 --- a/TAO/examples/Event_Comm/Event_Comm_i.h +++ b/TAO/examples/Event_Comm/Event_Comm_i.h @@ -36,7 +36,7 @@ public: virtual ~ShutdownCallback (); /// This method is to be called to shutdown the application. - virtual void close (void) = 0; + virtual void close () = 0; }; /** diff --git a/TAO/examples/Event_Comm/Notifier_Handler.h b/TAO/examples/Event_Comm/Notifier_Handler.h index 6ed203716ca..84d310297e7 100644 --- a/TAO/examples/Event_Comm/Notifier_Handler.h +++ b/TAO/examples/Event_Comm/Notifier_Handler.h @@ -32,10 +32,10 @@ class Notifier_Handler public: /// This constructor gets the notifier object from the Naming /// Service. - Notifier_Handler (void) = default; + Notifier_Handler () = default; /// Destructor. - virtual ~Notifier_Handler (void) = default; + virtual ~Notifier_Handler () = default; /// Initialize the client communication endpoint with server. int init (int argc, ACE_TCHAR *argv[], ShutdownCallback* _shutdowncallback); diff --git a/TAO/examples/Event_Comm/supplier.h b/TAO/examples/Event_Comm/supplier.h index e67879e34fa..feaa231c36c 100644 --- a/TAO/examples/Event_Comm/supplier.h +++ b/TAO/examples/Event_Comm/supplier.h @@ -19,10 +19,10 @@ class Supplier : public ACE_Event_Handler, public ShutdownCallback public: // Initialization and Termination methods. /// Constructor. - Supplier (void) = default; + Supplier () = default; /// Destructor. - ~Supplier (void) = default; + ~Supplier () = default; /// Initialization method. returns 0 on success, -1 on error. int init (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h index 0cbd5aad84d..dafa78778de 100644 --- a/TAO/examples/Load_Balancing/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h @@ -180,7 +180,7 @@ public: * ``round robin.'' If the group contains no members, <no_such_member> * exception is thrown. */ - CORBA::Object_ptr resolve (void) = 0; + CORBA::Object_ptr resolve () = 0; /** * Returns an object with the specified <Member_ID>. If this diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h index d9cfd46c15d..76defd00883 100644 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h @@ -217,7 +217,7 @@ public: * ``round robin.'' If the group contains no members, <no_such_member> * exception is thrown. */ - char * resolve (void) = 0; + char * resolve () = 0; /** * Returns an object with the specified <Member_ID>. If this diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp index 17fac18d59f..ba15981cc5b 100644 --- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp +++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp @@ -68,7 +68,7 @@ public: /// ctor Client (Simple_Server_ptr server, ACE_UINT32 niterations); - virtual ~Client (void) {}; + virtual ~Client () {}; /// The thread entry point. virtual int svc (); diff --git a/TAO/examples/RTScheduling/DT_Creator.h b/TAO/examples/RTScheduling/DT_Creator.h index 020b8108712..90b818f2bab 100644 --- a/TAO/examples/RTScheduling/DT_Creator.h +++ b/TAO/examples/RTScheduling/DT_Creator.h @@ -41,7 +41,7 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object virtual void yield (time_t suspend_time, Thread_Task* task) = 0; - virtual void wait (void) = 0; + virtual void wait () = 0; virtual CORBA::Policy_ptr sched_param (int importance) = 0; @@ -51,7 +51,7 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object int iter, int dist, char *job_name) = 0; - // virtual Task* task (void) = 0; + // virtual Task* task () = 0; /// Resolve the naming service. int resolve_naming_service (); @@ -73,7 +73,7 @@ class RTSCHEDTESTLIB_Export DT_Creator : public ACE_Service_Object ACE_hrtime_t base_hr_time (); - virtual int total_load (void) = 0; + virtual int total_load () = 0; Synch_i* synch (); diff --git a/TAO/examples/Simple/bank/AccountManager_i.cpp b/TAO/examples/Simple/bank/AccountManager_i.cpp index 6dcb1c83216..7cd2405208e 100644 --- a/TAO/examples/Simple/bank/AccountManager_i.cpp +++ b/TAO/examples/Simple/bank/AccountManager_i.cpp @@ -4,7 +4,7 @@ #include "tao/Utils/ORB_Manager.h" // Constructor -AccountManager_i::AccountManager_i (void) : +AccountManager_i::AccountManager_i () : orb_manager_ (0) { } diff --git a/TAO/examples/Simple/chat/Broadcaster_i.h b/TAO/examples/Simple/chat/Broadcaster_i.h index edb64d53b42..8ba5d447ccc 100644 --- a/TAO/examples/Simple/chat/Broadcaster_i.h +++ b/TAO/examples/Simple/chat/Broadcaster_i.h @@ -35,10 +35,10 @@ class Broadcaster_i : public POA_Broadcaster { public: /// Constructor. - Broadcaster_i (void) = default; + Broadcaster_i () = default; /// Destructor. - virtual ~Broadcaster_i (void) = default; + virtual ~Broadcaster_i () = default; /// Saves receiver references in a list. virtual void add (Receiver_ptr receiver, diff --git a/TAO/examples/Simple/echo/Echo_i.h b/TAO/examples/Simple/echo/Echo_i.h index b93825f1e0e..88a6fee506e 100644 --- a/TAO/examples/Simple/echo/Echo_i.h +++ b/TAO/examples/Simple/echo/Echo_i.h @@ -30,10 +30,10 @@ class Echo_i : public POA_Echo { public: /// Constructor. - Echo_i (void) = default; + Echo_i () = default; /// Destructor. - virtual ~Echo_i (void) = default; + virtual ~Echo_i () = default; /// Return the mesg string back from the server. virtual Echo::List *echo_list (const char *mesg); diff --git a/TAO/interop-tests/CdrOutArg/orbix/test_i.h b/TAO/interop-tests/CdrOutArg/orbix/test_i.h index 57f5a544703..3562dda71ce 100644 --- a/TAO/interop-tests/CdrOutArg/orbix/test_i.h +++ b/TAO/interop-tests/CdrOutArg/orbix/test_i.h @@ -26,7 +26,7 @@ public: void get_out (CORBA::Long_out arg) IT_THROW_DECL((CORBA::SystemException)); - void shutdown (void) IT_THROW_DECL((CORBA::SystemException)); + void shutdown () IT_THROW_DECL((CORBA::SystemException)); private: /// The ORB pseudo-reference (for shutdown). diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp index c823ba14583..f51a46180bf 100644 --- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp +++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp @@ -29,7 +29,7 @@ Concurrency_Service::Concurrency_Service () pid_file_name_ (0) { ORBSVCS_DEBUG ((LM_DEBUG, - ACE_TEXT("Concurrency_Service::Concurrency_Service (void)\n"))); + ACE_TEXT("Concurrency_Service::Concurrency_Service ()\n"))); } // Constructor taking command-line arguments. @@ -198,7 +198,7 @@ Concurrency_Service::run () Concurrency_Service::~Concurrency_Service () { ORBSVCS_DEBUG ((LM_DEBUG, - "Concurrency_Service::~Concurrency_Service (void)\n")); + "Concurrency_Service::~Concurrency_Service ()\n")); } int diff --git a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h index e2a5ed189c9..f24b40bdb06 100644 --- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h +++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h @@ -95,13 +95,13 @@ public: virtual int parse (int argc, ACE_TCHAR **argv) = 0; /// Do the work. - virtual int run (void) = 0; + virtual int run () = 0; /// Sets the implrepo locator pointer void set_imr (ImplementationRepository::Administration_ptr imr); protected: - TAO_IMR_Op (void) : imr_ (0), quiet_ (false) {} + TAO_IMR_Op () : imr_ (0), quiet_ (false) {} // = Helper methods diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp index 85d56eba259..f296fa5f1e9 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp @@ -137,7 +137,7 @@ Consumer::init_Consumer () } catch (const CORBA::Exception& ex) { - ex._tao_print_exception ("Exception in Consumer::connect (void)\n"); + ex._tao_print_exception ("Exception in Consumer::connect ()\n"); return -1; } diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp index 735ce7ef005..93a0105808b 100644 --- a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp +++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp @@ -15,10 +15,10 @@ using namespace PortableServer; class test_i : public virtual POA_test { int n_; public: - test_i (void) : n_(0) + test_i () : n_(0) { } - virtual ~test_i (void) { + virtual ~test_i () { } virtual CORBA::Long get () { diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl index fb5072ec91d..978c26126d3 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_AV_QoS & -TAO_Base_StreamEndPoint::qos (void) +TAO_Base_StreamEndPoint::qos () { return this->qos_; } diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h index b4fa74ad221..aad83b4c600 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h @@ -93,7 +93,7 @@ protected: * endpoint (which will be in the child process) * Subclasses will define the functionality for this */ - virtual int get_stream_endpoint (void) = 0; + virtual int get_stream_endpoint () = 0; /// Get the Vdev object reference for the newly created /// endpoint diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h index 2ce48375ab8..e4e93dd5ba5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h +++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h @@ -38,7 +38,7 @@ protected: virtual int activate (); /// activates the stream_endpoint with the POA - virtual int activate_stream_endpoint (void) = 0; + virtual int activate_stream_endpoint () = 0; /// activates the vdev with the POA virtual int activate_vdev (); diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h index ea9d1237fb4..2ce728f6324 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h @@ -107,7 +107,7 @@ public: /// accessor to the direction. int direction (); - virtual Role role (void) = 0; + virtual Role role () = 0; void role (Role role); /// accessor to string version of direction . const char * direction_str () const; @@ -142,7 +142,7 @@ public: const char *flowname () const; /// converts the entry to a string. - virtual const char *entry_to_string (void) = 0; + virtual const char *entry_to_string () = 0; int set_peer_addr (ACE_Addr *peer_addr); ACE_Addr *get_peer_addr (); diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl index 85c5e0b0e43..acd5d7a5ebb 100644 --- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl +++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.inl @@ -39,7 +39,7 @@ TAO_FlowSpec_Entry::parse_flow_protocol_string (const char *flow_string) ACE_INLINE int -TAO_FlowSpec_Entry::direction (void) +TAO_FlowSpec_Entry::direction () { return this->direction_; } @@ -67,7 +67,7 @@ TAO_FlowSpec_Entry::flow_protocol_str (const char *str) ACE_INLINE TAO_AV_Core::Protocol -TAO_FlowSpec_Entry::carrier_protocol (void) +TAO_FlowSpec_Entry::carrier_protocol () { return this->protocol_; } @@ -81,7 +81,7 @@ TAO_FlowSpec_Entry::carrier_protocol_str () const ACE_INLINE ACE_Addr * -TAO_FlowSpec_Entry::address (void) +TAO_FlowSpec_Entry::address () { return this->address_; } @@ -99,7 +99,7 @@ TAO_FlowSpec_Entry::address (ACE_Addr *addr, bool cleanup) ACE_INLINE ACE_Addr * -TAO_FlowSpec_Entry::control_address (void) +TAO_FlowSpec_Entry::control_address () { return this->control_address_; } @@ -150,7 +150,7 @@ TAO_FlowSpec_Entry::set_peer_addr (ACE_Addr *peer_addr) ACE_INLINE ACE_Addr * -TAO_FlowSpec_Entry::get_peer_addr (void) +TAO_FlowSpec_Entry::get_peer_addr () { return this->peer_addr_; } @@ -173,14 +173,14 @@ TAO_FlowSpec_Entry::set_local_control_addr (ACE_Addr *local_addr) ACE_INLINE ACE_Addr* -TAO_FlowSpec_Entry::get_local_addr (void) +TAO_FlowSpec_Entry::get_local_addr () { return this->local_addr_; } ACE_INLINE ACE_Addr* -TAO_FlowSpec_Entry::get_local_control_addr (void) +TAO_FlowSpec_Entry::get_local_control_addr () { return this->local_control_addr_; } @@ -197,14 +197,14 @@ TAO_FlowSpec_Entry::set_local_sec_addr (char** local_sec_addr, ACE_INLINE char** -TAO_FlowSpec_Entry::get_local_sec_addr (void) +TAO_FlowSpec_Entry::get_local_sec_addr () { return this->local_sec_addr_; } ACE_INLINE int -TAO_FlowSpec_Entry::num_local_sec_addrs (void) +TAO_FlowSpec_Entry::num_local_sec_addrs () { return this->num_local_sec_addrs_; } @@ -221,21 +221,21 @@ TAO_FlowSpec_Entry::set_peer_sec_addr (char** peer_sec_addr, ACE_INLINE char** -TAO_FlowSpec_Entry::get_peer_sec_addr (void) +TAO_FlowSpec_Entry::get_peer_sec_addr () { return this->peer_sec_addr_; } ACE_INLINE int -TAO_FlowSpec_Entry::num_peer_sec_addrs (void) +TAO_FlowSpec_Entry::num_peer_sec_addrs () { return this->num_peer_sec_addrs_; } ACE_INLINE TAO_AV_Transport* -TAO_FlowSpec_Entry::transport (void) +TAO_FlowSpec_Entry::transport () { return this->transport_; } @@ -249,7 +249,7 @@ TAO_FlowSpec_Entry::transport (TAO_AV_Transport *transport) ACE_INLINE TAO_AV_Transport* -TAO_FlowSpec_Entry::control_transport (void) +TAO_FlowSpec_Entry::control_transport () { return this->control_transport_; } @@ -263,14 +263,14 @@ TAO_FlowSpec_Entry::control_transport (TAO_AV_Transport *control_transport) ACE_INLINE TAO_AV_Flow_Handler * -TAO_FlowSpec_Entry::handler (void) +TAO_FlowSpec_Entry::handler () { return this->handler_; } ACE_INLINE TAO_AV_Flow_Handler * -TAO_FlowSpec_Entry::control_handler (void) +TAO_FlowSpec_Entry::control_handler () { return this->control_handler_; } @@ -305,7 +305,7 @@ TAO_FlowSpec_Entry::control_handler (TAO_AV_Flow_Handler *handler) ACE_INLINE TAO_AV_Protocol_Object* -TAO_FlowSpec_Entry::protocol_object (void) +TAO_FlowSpec_Entry::protocol_object () { return this->protocol_object_; } @@ -319,7 +319,7 @@ TAO_FlowSpec_Entry::protocol_object (TAO_AV_Protocol_Object *object) ACE_INLINE TAO_AV_Protocol_Object* -TAO_FlowSpec_Entry::control_protocol_object (void) +TAO_FlowSpec_Entry::control_protocol_object () { return this->control_protocol_object_; } @@ -333,7 +333,7 @@ TAO_FlowSpec_Entry::control_protocol_object (TAO_AV_Protocol_Object *object) ACE_INLINE int -TAO_FlowSpec_Entry::is_multicast (void) +TAO_FlowSpec_Entry::is_multicast () { return this->is_multicast_; } diff --git a/TAO/orbsvcs/orbsvcs/AV/MCast.h b/TAO/orbsvcs/orbsvcs/AV/MCast.h index dbffd8ff7e9..624b37f9a8a 100644 --- a/TAO/orbsvcs/orbsvcs/AV/MCast.h +++ b/TAO/orbsvcs/orbsvcs/AV/MCast.h @@ -95,7 +95,7 @@ public: virtual int handle_input (ACE_HANDLE fd); virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0); ACE_SOCK_Dgram_Mcast *get_mcast_socket () const; - virtual ACE_Event_Handler* event_handler (void){ return this; } + virtual ACE_Event_Handler* event_handler () { return this; } void set_peer_addr (ACE_INET_Addr *peer_addr); protected: ACE_INET_Addr *peer_addr_; diff --git a/TAO/orbsvcs/orbsvcs/AV/Policy.inl b/TAO/orbsvcs/orbsvcs/AV/Policy.inl index 54793355891..2f8157e7c03 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Policy.inl +++ b/TAO/orbsvcs/orbsvcs/AV/Policy.inl @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL //-------------------------------------------------- ACE_INLINE CORBA::ULong -TAO_AV_Policy::type (void) +TAO_AV_Policy::type () { return this->type_; } @@ -16,7 +16,7 @@ TAO_AV_Policy::type (void) //-------------------------------------------------- ACE_INLINE CORBA::ULong -TAO_AV_SSRC_Policy::value (void) +TAO_AV_SSRC_Policy::value () { return this->ssrc_; } @@ -38,7 +38,7 @@ TAO_AV_Payload_Type_Policy::value (int pt) } ACE_INLINE int -TAO_AV_Payload_Type_Policy::value (void) +TAO_AV_Payload_Type_Policy::value () { return this->payload_type_; } @@ -46,7 +46,7 @@ TAO_AV_Payload_Type_Policy::value (void) // TAO_AV_RTCP_Sdes_Policy ACE_INLINE TAO_AV_RTCP_Sdes & -TAO_AV_RTCP_Sdes_Policy::value (void) +TAO_AV_RTCP_Sdes_Policy::value () { return this->sdes_; } @@ -70,7 +70,7 @@ TAO_AV_SFP_Credit_Policy::value (int credit) ACE_INLINE int -TAO_AV_SFP_Credit_Policy::value (void) +TAO_AV_SFP_Credit_Policy::value () { return this->value_; } diff --git a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h index 56ccfd45ef0..5ae2158e849 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h +++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h @@ -39,7 +39,7 @@ public: virtual int open (TAO_AV_Callback *callback, TAO_AV_Transport *transport); - virtual int handle_input (void) = 0; + virtual int handle_input () = 0; /// Called on a control object. virtual int handle_control_input (ACE_Message_Block *control_frame, @@ -67,7 +67,7 @@ public: /// end the stream. virtual void control_object (TAO_AV_Protocol_Object *object); - virtual int destroy (void) = 0; + virtual int destroy () = 0; TAO_AV_Transport *transport (); protected: TAO_AV_Transport *transport_; diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h index 13b2653fd4e..f8aabc16a90 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.h @@ -125,7 +125,7 @@ public: /// prints a message. virtual int handle_qos (ACE_HANDLE fd); ACE_SOCK_Dgram_Mcast_QoS *get_socket (); - virtual ACE_Event_Handler* event_handler (void){ return this; } + virtual ACE_Event_Handler* event_handler () { return this; } virtual ACE_QoS_Session* qos_session (); virtual void qos_session (ACE_QoS_Session *qos_session); diff --git a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl index 2961bdac0d5..eae0a699a6d 100644 --- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl +++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.inl @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_SOCK_Dgram_Mcast_QoS * -TAO_AV_UDP_QoS_Flow_Handler::get_socket (void) +TAO_AV_UDP_QoS_Flow_Handler::get_socket () { return &this->qos_sock_dgram_; } @@ -22,7 +22,7 @@ TAO_AV_UDP_QoS_Flow_Handler::open (ACE_Addr &address) } ACE_INLINE ACE_QoS_Session* -TAO_AV_UDP_QoS_Flow_Handler::qos_session (void) +TAO_AV_UDP_QoS_Flow_Handler::qos_session () { return this->qos_session_; } @@ -46,7 +46,7 @@ TAO_AV_UDP_QoS_Flow_Handler::endpoint (TAO_Base_StreamEndPoint *endpoint) } ACE_INLINE TAO_Base_StreamEndPoint * -TAO_AV_UDP_QoS_Flow_Handler::endpoint (void) +TAO_AV_UDP_QoS_Flow_Handler::endpoint () { return this->endpoint_; } @@ -58,7 +58,7 @@ TAO_AV_UDP_QoS_Flow_Handler::flowspec_entry (TAO_FlowSpec_Entry *entry) } ACE_INLINE TAO_FlowSpec_Entry * -TAO_AV_UDP_QoS_Flow_Handler::flowspec_entry (void) +TAO_AV_UDP_QoS_Flow_Handler::flowspec_entry () { return this->entry_; } @@ -70,7 +70,7 @@ TAO_AV_UDP_QoS_Flow_Handler::av_core (TAO_AV_Core *avcore) } ACE_INLINE TAO_AV_Core * -TAO_AV_UDP_QoS_Flow_Handler::av_core (void) +TAO_AV_UDP_QoS_Flow_Handler::av_core () { return this->av_core_; } diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP.h b/TAO/orbsvcs/orbsvcs/AV/RTCP.h index 4f211b6750e..c9ed999f8a5 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h @@ -229,7 +229,7 @@ public: virtual int destroy (); void ssrc (ACE_UINT32 ssrc) {this->ssrc_ = ssrc; } - ACE_UINT32 ssrc (void) { return this->ssrc_; } + ACE_UINT32 ssrc () { return this->ssrc_; } void ts_offset (ACE_UINT32 ts_offset); diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h index a60bc441255..fffb2dc60fb 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h @@ -55,10 +55,10 @@ public: int updateStatistics(RTCP_RR_Packet *rr); /// Returns 1 if data has been sent since the last report, 0 if not. - int sender (void) { return this->data_since_last_report_; } + int sender () { return this->data_since_last_report_; } /// Returns 1 if this is an active source, 0 if not. - int active (void) { return this->active_; } + int active () { return this->active_; } private: /// Don't want default constructor. @@ -187,7 +187,7 @@ public: void cname (const char *cname) { this->cname_ = cname; } /// Returns the canonical name of the source. - const char *cname (void) { return this->cname_.c_str(); } + const char *cname () { return this->cname_.c_str(); } /// Returns whether or not this source is active. char active (); diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h index d96d1ae33e1..e12627729da 100644 --- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h +++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h @@ -56,7 +56,7 @@ public: /// Returns the size of the packet. /// Defined in child class. - virtual unsigned int packet_size(void) = 0; + virtual unsigned int packet_size() = 0; /// Checks the validity of an RTCP packet. RTCP packets can be sent /// together in a compound packet and is_first indicates the first packet @@ -72,7 +72,7 @@ protected: /// Used to create the byte representation of the RTCP packet. /// Defined in child class. - virtual void build_packet(void) = 0; + virtual void build_packet() = 0; }; /** @@ -186,7 +186,7 @@ public: unsigned int packet_size(); /// Returns the synchronization source id of the source sending this packet. - ACE_INT32 ssrc (void) { return this->ssrc_; } + ACE_INT32 ssrc () { return this->ssrc_; } /// Prints the contents of the packet. void dump (); @@ -311,7 +311,7 @@ public: /// This returns the synchronization source id for this packet. This assumes /// that this source is only receiving messages from end systems (i.e. only /// one source id per SDES) - ACE_UINT32 ssrc (void) { return this->chunk_->ssrc_; } + ACE_UINT32 ssrc () { return this->chunk_->ssrc_; } private: /// Used to create the byte representation of the RTCP packet. @@ -360,13 +360,13 @@ public: unsigned int packet_size(); /// Returns the synchronization source id for the sender of this packet. - ACE_UINT32 ssrc (void) { return this->ssrc_; } + ACE_UINT32 ssrc () { return this->ssrc_; } /// Returns the most significant word of the NTP timestamp. - ACE_UINT32 ntp_ts_msw (void) { return this->ntp_ts_msw_; } + ACE_UINT32 ntp_ts_msw () { return this->ntp_ts_msw_; } /// Returns the least significant word of the NTP timestamp. - ACE_UINT32 ntp_ts_lsw (void) { return this->ntp_ts_lsw_; } + ACE_UINT32 ntp_ts_lsw () { return this->ntp_ts_lsw_; } /// Prints the contents of the packet. void dump (); diff --git a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h index 1bc5115cab1..bde2dbdf451 100644 --- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h +++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.h @@ -106,7 +106,7 @@ public: int iovcnt, ACE_Time_Value *s = 0); - TAO_AV_SCTP_SEQ_Flow_Handler *handler (void) { return this->handler_; } + TAO_AV_SCTP_SEQ_Flow_Handler *handler () { return this->handler_; } protected: TAO_AV_SCTP_SEQ_Flow_Handler *handler_; @@ -128,7 +128,7 @@ public: virtual int open (void * = 0); virtual int handle_input (ACE_HANDLE fd); virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0); - virtual ACE_Event_Handler* event_handler (void){ return this; } + virtual ACE_Event_Handler* event_handler () { return this; } /// Change the QoS virtual int change_qos (AVStreams::QoS); diff --git a/TAO/orbsvcs/orbsvcs/AV/TCP.h b/TAO/orbsvcs/orbsvcs/AV/TCP.h index 9558975fb0b..ee2690ae122 100644 --- a/TAO/orbsvcs/orbsvcs/AV/TCP.h +++ b/TAO/orbsvcs/orbsvcs/AV/TCP.h @@ -110,7 +110,7 @@ public: virtual int open (void * = 0); virtual int handle_input (ACE_HANDLE fd); virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0); - virtual ACE_Event_Handler* event_handler (void){ return this; } + virtual ACE_Event_Handler* event_handler () { return this; } protected: TAO_AV_Core *av_core_; }; diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h index 8aff37eb556..e9eba73347c 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.h +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h @@ -132,7 +132,7 @@ public: virtual int set_remote_address (ACE_Addr *address); /// get the underlying event handler. To be overridden by the derived clases. - virtual ACE_Event_Handler* event_handler (void) = 0; + virtual ACE_Event_Handler* event_handler () = 0; virtual int change_qos (AVStreams::QoS); @@ -161,11 +161,11 @@ public: virtual int open (ACE_Addr *address) = 0; - virtual int close (void) = 0; + virtual int close () = 0; /// Write the complete Message_Block chain to the connection. - virtual int mtu (void) = 0; - virtual ACE_Addr *get_peer_addr (void) = 0; + virtual int mtu () = 0; + virtual ACE_Addr *get_peer_addr () = 0; virtual ACE_Addr *get_local_addr (); virtual ssize_t send (const ACE_Message_Block *mblk, ACE_Time_Value *s = 0) = 0; @@ -223,7 +223,7 @@ public: TAO_AV_Core::Flow_Component flow_comp) = 0; const char *flowname (); - virtual int close (void) = 0; + virtual int close () = 0; protected: ACE_CString flowname_; TAO_AV_Core *av_core_; @@ -249,7 +249,7 @@ public: TAO_AV_Transport *&transport, TAO_AV_Core::Flow_Component flow_component) = 0; - virtual int close (void) = 0; + virtual int close () = 0; protected: ACE_CString flowname_; }; diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.inl b/TAO/orbsvcs/orbsvcs/AV/Transport.inl index 7c78c72c1f8..3deba20196b 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Transport.inl +++ b/TAO/orbsvcs/orbsvcs/AV/Transport.inl @@ -6,14 +6,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL //------------------------------------------------------------ ACE_INLINE const ACE_CString & -TAO_AV_Transport_Item::name (void) +TAO_AV_Transport_Item::name () { return this->name_; } ACE_INLINE TAO_AV_Transport_Factory * -TAO_AV_Transport_Item::factory (void) +TAO_AV_Transport_Item::factory () { return this->factory_; } @@ -31,14 +31,14 @@ TAO_AV_Transport_Item::factory (TAO_AV_Transport_Factory *factory) //------------------------------------------------------------ ACE_INLINE const ACE_CString & -TAO_AV_Flow_Protocol_Item::name (void) +TAO_AV_Flow_Protocol_Item::name () { return this->name_; } ACE_INLINE TAO_AV_Flow_Protocol_Factory * -TAO_AV_Flow_Protocol_Item::factory (void) +TAO_AV_Flow_Protocol_Item::factory () { return this->factory_; } @@ -56,14 +56,14 @@ TAO_AV_Flow_Protocol_Item::factory (TAO_AV_Flow_Protocol_Factory *factory) ACE_INLINE TAO_AV_ConnectorSetItor -TAO_AV_Connector_Registry::begin (void) +TAO_AV_Connector_Registry::begin () { return this->connectors_.begin (); } ACE_INLINE TAO_AV_ConnectorSetItor -TAO_AV_Connector_Registry::end (void) +TAO_AV_Connector_Registry::end () { return this->connectors_.end (); } @@ -73,14 +73,14 @@ TAO_AV_Connector_Registry::end (void) //------------------------------------------------------------ ACE_INLINE TAO_AV_AcceptorSetItor -TAO_AV_Acceptor_Registry::begin (void) +TAO_AV_Acceptor_Registry::begin () { return this->acceptors_.begin (); } ACE_INLINE TAO_AV_AcceptorSetItor -TAO_AV_Acceptor_Registry::end (void) +TAO_AV_Acceptor_Registry::end () { return this->acceptors_.end (); } @@ -90,7 +90,7 @@ TAO_AV_Acceptor_Registry::end (void) //------------------------------------------------------------ ACE_INLINE const char * -TAO_AV_Acceptor::flowname (void) +TAO_AV_Acceptor::flowname () { return this->flowname_.c_str (); } @@ -100,7 +100,7 @@ TAO_AV_Acceptor::flowname (void) //------------------------------------------------------------ ACE_INLINE const char * -TAO_AV_Connector::flowname (void) +TAO_AV_Connector::flowname () { return this->flowname_.c_str (); } diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.h b/TAO/orbsvcs/orbsvcs/AV/UDP.h index 5b2f13a2018..75dd1aa0722 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.h +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h @@ -92,7 +92,7 @@ public: int iovcnt, ACE_Time_Value *s = 0); - TAO_AV_UDP_Flow_Handler *handler (void) { return this->handler_; } + TAO_AV_UDP_Flow_Handler *handler () { return this->handler_; } protected: TAO_AV_UDP_Flow_Handler *handler_; @@ -121,7 +121,7 @@ public: virtual int handle_input (ACE_HANDLE fd); virtual int handle_timeout (const ACE_Time_Value &tv, const void *arg = 0); const ACE_SOCK_Dgram *get_socket () const; - virtual ACE_Event_Handler* event_handler (void){ return this; } + virtual ACE_Event_Handler* event_handler () { return this; } /// Change the QoS virtual int change_qos (AVStreams::QoS); diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.inl b/TAO/orbsvcs/orbsvcs/AV/UDP.inl index d1d330728fb..1f883056803 100644 --- a/TAO/orbsvcs/orbsvcs/AV/UDP.inl +++ b/TAO/orbsvcs/orbsvcs/AV/UDP.inl @@ -21,7 +21,7 @@ TAO_AV_UDP_Flow_Handler::open (ACE_Addr &address) ACE_INLINE int -TAO_AV_UDP_Flow_Handler::close (void) +TAO_AV_UDP_Flow_Handler::close () { return this->sock_dgram_.close (); } diff --git a/TAO/orbsvcs/orbsvcs/AV/sfp.h b/TAO/orbsvcs/orbsvcs/AV/sfp.h index 9e8c51af060..ea45cc9a3da 100644 --- a/TAO/orbsvcs/orbsvcs/AV/sfp.h +++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h @@ -42,7 +42,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_SFP_Fragment_Node { public: - TAO_SFP_Fragment_Node (void) : data_ (0) {} + TAO_SFP_Fragment_Node () : data_ (0) {} flowProtocol::fragment fragment_info_; ACE_Message_Block *data_; friend bool operator< (const TAO_SFP_Fragment_Node& left, @@ -220,7 +220,7 @@ public: virtual ~TAO_SFP_Object (); // Dtor - virtual int handle_input (void) = 0; + virtual int handle_input () = 0; virtual int send_frame (ACE_Message_Block *frame, TAO_AV_frame_info *frame_info = 0); diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp index 99d6a1b442e..5fbb84bab35 100644 --- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp +++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp @@ -24,7 +24,7 @@ CC_LockSet::CC_LockSet () } catch (const CORBA::Exception& ex) { - ex._tao_print_exception ("CC_LockSet::CC_LockSet (void)"); + ex._tao_print_exception ("CC_LockSet::CC_LockSet ()"); } } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl index c33f0c7672f..41321de6851 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_CEC_Default_Factory::TAO_CEC_Default_Factory (void) +TAO_CEC_Default_Factory::TAO_CEC_Default_Factory () : dispatching_ (TAO_CEC_DEFAULT_DISPATCHING), pulling_strategy_ (TAO_CEC_DEFAULT_PULLING_STRATEGY), consumer_collection_ (TAO_CEC_DEFAULT_CONSUMER_COLLECTION), diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h index 599d80974b3..f0c04bb8599 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h @@ -48,14 +48,14 @@ public: /// Initialize all the data structures, activate any internal threads, /// etc. - virtual void activate (void) = 0; + virtual void activate () = 0; /** * Deactivate any internal threads and cleanup internal data * structures, it should only return once the threads have finished * their jobs. */ - virtual void shutdown (void) = 0; + virtual void shutdown () = 0; /// The consumer represented by @a proxy should receive @a event. virtual void push (TAO_CEC_ProxyPushSupplier *proxy, diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h index ac9311ddbf0..d4a609cf86e 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h @@ -81,7 +81,7 @@ public: virtual ~TAO_CEC_Dispatch_Command (); /// Command callback - virtual int execute (void) = 0; + virtual int execute () = 0; }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl index 1de0e16e264..1a8aaae29ca 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.inl @@ -140,19 +140,19 @@ TAO_CEC_EventChannel::destroy_proxy_collection (TAO_CEC_ProxyPullSupplier_Collec } ACE_INLINE PortableServer::POA_ptr -TAO_CEC_EventChannel::supplier_poa (void) +TAO_CEC_EventChannel::supplier_poa () { return PortableServer::POA::_duplicate (this->supplier_poa_.in ()); } ACE_INLINE PortableServer::POA_ptr -TAO_CEC_EventChannel::consumer_poa (void) +TAO_CEC_EventChannel::consumer_poa () { return PortableServer::POA::_duplicate (this->consumer_poa_.in ()); } ACE_INLINE ACE_Lock* -TAO_CEC_EventChannel::create_consumer_lock (void) +TAO_CEC_EventChannel::create_consumer_lock () { return this->factory_->create_consumer_lock (); } @@ -164,7 +164,7 @@ TAO_CEC_EventChannel::destroy_consumer_lock (ACE_Lock* x) } ACE_INLINE ACE_Lock* -TAO_CEC_EventChannel::create_supplier_lock (void) +TAO_CEC_EventChannel::create_supplier_lock () { return this->factory_->create_supplier_lock (); } @@ -194,7 +194,7 @@ TAO_CEC_EventChannel::disconnect_callbacks () const } ACE_INLINE TAO_CEC_EventChannel::ServantRetryMap& -TAO_CEC_EventChannel::get_servant_retry_map (void) +TAO_CEC_EventChannel::get_servant_retry_map () { return this->retry_map_; } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h index c8d591898f9..f91be9f4b5a 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h @@ -199,9 +199,9 @@ public: /// Create and destroy the locking strategies for both /// ProxyPushConsumers and ProxyPushSuppliers - virtual ACE_Lock* create_consumer_lock (void) = 0; + virtual ACE_Lock* create_consumer_lock () = 0; virtual void destroy_consumer_lock (ACE_Lock*) = 0; - virtual ACE_Lock* create_supplier_lock (void) = 0; + virtual ACE_Lock* create_supplier_lock () = 0; virtual void destroy_supplier_lock (ACE_Lock*) = 0; /// The ConsumerControl and SupplierControl strategies are used to diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h index 9d11bbdff53..90b37c27cad 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h @@ -43,14 +43,14 @@ public: /// Initialize all the data structures, activate any internal threads, /// etc. - virtual void activate (void) = 0; + virtual void activate () = 0; /** * Deactivate any internal threads and cleanup internal data * structures, it should only return once the threads have finished * their jobs. */ - virtual void shutdown (void) = 0; + virtual void shutdown () = 0; #if 0 /// Some strategies may want to keep track of connected consumers. diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl index f5897f1f124..6abb9bf56e8 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_CEC_TypedEvent::TAO_CEC_TypedEvent (void) +TAO_CEC_TypedEvent::TAO_CEC_TypedEvent () { } diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl index b7e5dc7e0fd..61be2f67742 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.inl @@ -99,19 +99,19 @@ TAO_CEC_TypedEventChannel::destroy_proxy_collection (TAO_CEC_TypedProxyPushConsu } ACE_INLINE PortableServer::POA_ptr -TAO_CEC_TypedEventChannel::typed_supplier_poa (void) +TAO_CEC_TypedEventChannel::typed_supplier_poa () { return PortableServer::POA::_duplicate (this->typed_supplier_poa_.in ()); } ACE_INLINE PortableServer::POA_ptr -TAO_CEC_TypedEventChannel::typed_consumer_poa (void) +TAO_CEC_TypedEventChannel::typed_consumer_poa () { return PortableServer::POA::_duplicate (this->typed_consumer_poa_.in ()); } ACE_INLINE ACE_Lock* -TAO_CEC_TypedEventChannel::create_consumer_lock (void) +TAO_CEC_TypedEventChannel::create_consumer_lock () { return this->factory_->create_consumer_lock (); } @@ -123,7 +123,7 @@ TAO_CEC_TypedEventChannel::destroy_consumer_lock (ACE_Lock* x) } ACE_INLINE ACE_Lock* -TAO_CEC_TypedEventChannel::create_supplier_lock (void) +TAO_CEC_TypedEventChannel::create_supplier_lock () { return this->factory_->create_supplier_lock (); } @@ -171,18 +171,18 @@ TAO_CEC_TypedEventChannel::number_of_base_interfaces () const } ACE_INLINE TAO_CEC_TypedEventChannel::ServantRetryMap& -TAO_CEC_TypedEventChannel::get_servant_retry_map (void) +TAO_CEC_TypedEventChannel::get_servant_retry_map () { return this->retry_map_; } ACE_INLINE -TAO_CEC_Param::TAO_CEC_Param (void) +TAO_CEC_Param::TAO_CEC_Param () { } ACE_INLINE -TAO_CEC_Param::~TAO_CEC_Param (void) +TAO_CEC_Param::~TAO_CEC_Param () { } @@ -194,7 +194,7 @@ TAO_CEC_Operation_Params::TAO_CEC_Operation_Params (CORBA::ULong num_params) } ACE_INLINE -TAO_CEC_Operation_Params::~TAO_CEC_Operation_Params (void) +TAO_CEC_Operation_Params::~TAO_CEC_Operation_Params () { delete [] parameters_; } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl index 39f67a9b21f..0a14eefb447 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class COLLECTION, class ITERATOR> ACE_INLINE TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>:: - TAO_ESF_Copy_On_Write_Collection (void) + TAO_ESF_Copy_On_Write_Collection () : refcount_ (1) { } @@ -24,7 +24,7 @@ TAO_ESF_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR,ACE_LOCK>:: template<class COLLECTION, class ITERATOR, class ACE_LOCK> ACE_INLINE TAO_ESF_Copy_On_Write_Read_Guard<COLLECTION,ITERATOR,ACE_LOCK>:: - ~TAO_ESF_Copy_On_Write_Read_Guard (void) + ~TAO_ESF_Copy_On_Write_Read_Guard () { if (this->collection != 0) { diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h index ceb4b3ab3f3..dbb9b9cfa80 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h @@ -55,7 +55,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL * * /// activate the proxy and return the object reference * PROXY::_ptr_type - * PROXY::activate (void) throw (); + * PROXY::activate () throw (); * @endverbatim */ template<class EVENT_CHANNEL, class PROXY, class INTERFACE> diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl index 34c682b59a6..8b83bc94e07 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class PROXY> ACE_INLINE ACE_Unbounded_Set_Iterator<PROXY*> -TAO_ESF_Proxy_List<PROXY>::begin (void) +TAO_ESF_Proxy_List<PROXY>::begin () { return this->impl_.begin (); } template<class PROXY> ACE_INLINE ACE_Unbounded_Set_Iterator<PROXY*> -TAO_ESF_Proxy_List<PROXY>::end (void) +TAO_ESF_Proxy_List<PROXY>::end () { return this->impl_.end (); } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl index a5cf13695a9..69291d20800 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.inl @@ -23,7 +23,7 @@ TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>::operator != ( } template<class PROXY> ACE_INLINE TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>& -TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>::operator++ (void) +TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>::operator++ () { ++this->impl_; return *this; @@ -38,7 +38,7 @@ TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>::operator++ (int) } template<class PROXY> ACE_INLINE PROXY* -TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>::operator *(void) +TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>::operator *() { return (*this->impl_).key (); } @@ -46,13 +46,13 @@ TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>::operator *(void) // **************************************************************** template<class PROXY> ACE_INLINE TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> -TAO_ESF_Proxy_RB_Tree<PROXY>::begin (void) +TAO_ESF_Proxy_RB_Tree<PROXY>::begin () { return Iterator (this->impl_.begin ()); } template<class PROXY> ACE_INLINE TAO_ESF_Proxy_RB_Tree_Iterator<PROXY> -TAO_ESF_Proxy_RB_Tree<PROXY>::end (void) +TAO_ESF_Proxy_RB_Tree<PROXY>::end () { return Iterator (this->impl_.end ()); } diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl index 590b187dae9..d62013e40c0 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.inl @@ -11,7 +11,7 @@ TAO_ESF_RefCount_Guard<T>:: template<class T> ACE_INLINE TAO_ESF_RefCount_Guard<T>:: - ~TAO_ESF_RefCount_Guard (void) + ~TAO_ESF_RefCount_Guard () { --this->refcount_; } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl index ac3b70296da..0d595ebf4e2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_ECG_CDR_Message_Receiver::Requests::Requests (void) +TAO_ECG_CDR_Message_Receiver::Requests::Requests () : fragmented_requests_ (0) , size_ (0) , id_range_low_ (0) @@ -27,7 +27,7 @@ TAO_ECG_CDR_Message_Receiver::TAO_ECG_CDR_Message_Receiver (CORBA::Boolean crc) } ACE_INLINE -TAO_ECG_CDR_Message_Receiver::~TAO_ECG_CDR_Message_Receiver (void) +TAO_ECG_CDR_Message_Receiver::~TAO_ECG_CDR_Message_Receiver () { this->shutdown (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl index c941146ebac..9197c1c7d42 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.inl @@ -12,7 +12,7 @@ TAO_ECG_CDR_Message_Sender::TAO_ECG_CDR_Message_Sender (CORBA::Boolean crc) } ACE_INLINE void -TAO_ECG_CDR_Message_Sender::shutdown (void) +TAO_ECG_CDR_Message_Sender::shutdown () { // Release the endpoint. TAO_ECG_Refcounted_Endpoint empty_endpoint_rptr; @@ -20,7 +20,7 @@ TAO_ECG_CDR_Message_Sender::shutdown (void) } ACE_INLINE ACE_SOCK_Dgram& -TAO_ECG_CDR_Message_Sender::dgram (void) +TAO_ECG_CDR_Message_Sender::dgram () { ACE_ASSERT (this->endpoint_rptr_.get ()); return this->endpoint_rptr_->dgram (); diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl index 332d4f0d465..7e6de94975c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_ECG_Mcast_EH:: -Observer_Disconnect_Command::Observer_Disconnect_Command (void) +Observer_Disconnect_Command::Observer_Disconnect_Command () : handle_ () , ec_ () { @@ -42,7 +42,7 @@ Observer_Disconnect_Command::operator= ( ACE_INLINE void TAO_ECG_Mcast_EH:: -Observer_Disconnect_Command::execute (void) +Observer_Disconnect_Command::execute () { if (CORBA::is_nil (this->ec_.in ())) // We are not connected. diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl index 1b18f69c414..240421f0405 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_ECG_Mcast_Gateway::TAO_ECG_Mcast_Gateway (void) +TAO_ECG_Mcast_Gateway::TAO_ECG_Mcast_Gateway () : service_type_ (TAO_ECG_DEFAULT_SERVICE) , handler_type_ (TAO_ECG_DEFAULT_HANDLER) , address_server_type_ (TAO_ECG_DEFAULT_ADDRESS_SERVER) @@ -17,7 +17,7 @@ TAO_ECG_Mcast_Gateway::TAO_ECG_Mcast_Gateway (void) } ACE_INLINE -TAO_ECG_Mcast_Gateway::Attributes::Attributes (void) +TAO_ECG_Mcast_Gateway::Attributes::Attributes () : address_server_type (TAO_ECG_DEFAULT_ADDRESS_SERVER) , handler_type (TAO_ECG_DEFAULT_HANDLER) , service_type (TAO_ECG_DEFAULT_SERVICE) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl index 833ca1df6bb..41e0a41a768 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE PortableServer::Servant_var<TAO_ECG_Simple_Address_Server> -TAO_ECG_Simple_Address_Server::create (void) +TAO_ECG_Simple_Address_Server::create () { PortableServer::Servant_var<TAO_ECG_Simple_Address_Server> s; ACE_NEW_RETURN (s, diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl index 43231a83b01..c2dce190a86 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_SOCK_Dgram& -TAO_ECG_UDP_EH::dgram (void) +TAO_ECG_UDP_EH::dgram () { return this->dgram_; } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl index 331d9ac2bdf..51ec31d56c3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_ECG_UDP_Out_Endpoint::TAO_ECG_UDP_Out_Endpoint (void) +TAO_ECG_UDP_Out_Endpoint::TAO_ECG_UDP_Out_Endpoint () : request_id_generator_ (static_cast<CORBA::ULong> (ACE_OS::time (0))), port_number_ (0), if_count_ (0), @@ -22,13 +22,13 @@ TAO_ECG_UDP_Out_Endpoint::TAO_ECG_UDP_Out_Endpoint (const TAO_ECG_UDP_Out_Endpoi } ACE_INLINE ACE_SOCK_Dgram& -TAO_ECG_UDP_Out_Endpoint::dgram (void) +TAO_ECG_UDP_Out_Endpoint::dgram () { return this->dgram_; } ACE_INLINE CORBA::ULong -TAO_ECG_UDP_Out_Endpoint::next_request_id (void) +TAO_ECG_UDP_Out_Endpoint::next_request_id () { return this->request_id_generator_++; } diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl index 6b6aec4d55c..6f112ad9d8c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.inl @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_ECG_UDP_Receiver_Disconnect_Command:: -TAO_ECG_UDP_Receiver_Disconnect_Command (void) +TAO_ECG_UDP_Receiver_Disconnect_Command () : proxy_ () { } @@ -41,7 +41,7 @@ TAO_ECG_UDP_Receiver_Disconnect_Command::operator= ( ACE_INLINE void TAO_ECG_UDP_Receiver_Disconnect_Command:: -execute (void) +execute () { if (CORBA::is_nil (this->proxy_.in ())) // We are not connected. diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl index e800afa98bb..d8d47b0bf03 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl @@ -44,7 +44,7 @@ TAO_ECG_UDP_Sender::get_local_addr (ACE_INET_Addr& addr) ACE_INLINE TAO_ECG_UDP_Sender_Disconnect_Command:: -TAO_ECG_UDP_Sender_Disconnect_Command (void) +TAO_ECG_UDP_Sender_Disconnect_Command () : proxy_ () { } @@ -77,7 +77,7 @@ TAO_ECG_UDP_Sender_Disconnect_Command::operator= ( } ACE_INLINE void -TAO_ECG_UDP_Sender_Disconnect_Command::execute (void) +TAO_ECG_UDP_Sender_Disconnect_Command::execute () { if (CORBA::is_nil (this->proxy_.in ())) // We are not connected. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl index e6a6308afea..af798e51a7d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_EC_Default_Factory::TAO_EC_Default_Factory (void) +TAO_EC_Default_Factory::TAO_EC_Default_Factory () : dispatching_ (TAO_EC_DEFAULT_DISPATCHING), filtering_ (TAO_EC_DEFAULT_CONSUMER_FILTER), supplier_filtering_ (TAO_EC_DEFAULT_SUPPLIER_FILTER), diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl index d412117261f..0a705bed274 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_EC_Filter::TAO_EC_Filter (void) +TAO_EC_Filter::TAO_EC_Filter () : parent_ (0) { } @@ -33,7 +33,7 @@ TAO_EC_Filter::matches (const RtecEventComm::EventHeader& rhs, // **************************************************************** ACE_INLINE -TAO_EC_Null_Filter::TAO_EC_Null_Filter (void) +TAO_EC_Null_Filter::TAO_EC_Null_Filter () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl index 6a2b2f859fb..5001b5772cf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_EC_Null_Filter_Builder::TAO_EC_Null_Filter_Builder (void) +TAO_EC_Null_Filter_Builder::TAO_EC_Null_Filter_Builder () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl index 99852966866..5e9ec37bbff 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_EC_Kokyu_Factory::TAO_EC_Kokyu_Factory (void) +TAO_EC_Kokyu_Factory::TAO_EC_Kokyu_Factory () : TAO_EC_Default_Factory (), disp_sched_policy_ (ACE_SCHED_FIFO), disp_sched_scope_ (ACE_SCOPE_THREAD) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl index f37cc2d6a4b..3b11819fdf5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_EC_Object_Deactivator::TAO_EC_Object_Deactivator (void) +TAO_EC_Object_Deactivator::TAO_EC_Object_Deactivator () : poa_ () , id_ () , deactivate_ (0) @@ -20,7 +20,7 @@ TAO_EC_Object_Deactivator::TAO_EC_Object_Deactivator ( } ACE_INLINE void -TAO_EC_Object_Deactivator::deactivate (void) +TAO_EC_Object_Deactivator::deactivate () { if (this->deactivate_ && !CORBA::is_nil (this->poa_.in ())) { @@ -37,7 +37,7 @@ TAO_EC_Object_Deactivator::deactivate (void) } ACE_INLINE -TAO_EC_Object_Deactivator::~TAO_EC_Object_Deactivator (void) +TAO_EC_Object_Deactivator::~TAO_EC_Object_Deactivator () { this->deactivate (); } @@ -49,13 +49,13 @@ TAO_EC_Object_Deactivator::poa () const } ACE_INLINE void -TAO_EC_Object_Deactivator::allow_deactivation (void) +TAO_EC_Object_Deactivator::allow_deactivation () { this->deactivate_ = 1; } ACE_INLINE void -TAO_EC_Object_Deactivator::disallow_deactivation (void) +TAO_EC_Object_Deactivator::disallow_deactivation () { this->deactivate_ = 0; } @@ -84,13 +84,13 @@ TAO_EC_Object_Deactivator::set_values (TAO_EC_Object_Deactivator & deactivator) // **************************************************************** ACE_INLINE -TAO_EC_Deactivated_Object::TAO_EC_Deactivated_Object (void) +TAO_EC_Deactivated_Object::TAO_EC_Deactivated_Object () : deactivator_ () { } ACE_INLINE -TAO_EC_Deactivated_Object::~TAO_EC_Deactivated_Object (void) +TAO_EC_Deactivated_Object::~TAO_EC_Deactivated_Object () { // Prevent automatic deactivation in deactivator's destructor. this->deactivator_.disallow_deactivation (); @@ -106,13 +106,13 @@ TAO_EC_Deactivated_Object::set_deactivator ( // **************************************************************** ACE_INLINE -TAO_EC_ORB_Holder::TAO_EC_ORB_Holder (void) +TAO_EC_ORB_Holder::TAO_EC_ORB_Holder () : orb_ () { } ACE_INLINE -TAO_EC_ORB_Holder::~TAO_EC_ORB_Holder (void) +TAO_EC_ORB_Holder::~TAO_EC_ORB_Holder () { if (!CORBA::is_nil (this->orb_.in ())) { @@ -136,13 +136,13 @@ TAO_EC_ORB_Holder::init (CORBA::ORB_var orb_var) // **************************************************************** ACE_INLINE -TAO_EC_Event_Channel_Holder::TAO_EC_Event_Channel_Holder (void) +TAO_EC_Event_Channel_Holder::TAO_EC_Event_Channel_Holder () : ec_ () { } ACE_INLINE -TAO_EC_Event_Channel_Holder::~TAO_EC_Event_Channel_Holder (void) +TAO_EC_Event_Channel_Holder::~TAO_EC_Event_Channel_Holder () { if (!CORBA::is_nil (this->ec_.in ())) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h index 8855e9962bd..83fd3944ffa 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h @@ -45,7 +45,7 @@ void activate (T & obj_ref, * * Template argument requirements: * - * Has void execute (void); method which + * Has void execute (); method which * can throw ONLY CORBA exceptions. * Has default and copy constructors. */ diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl index 4b85ab2aaae..adfe4237b0e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class T> ACE_INLINE -TAO_EC_Auto_Command<T>::TAO_EC_Auto_Command (void) +TAO_EC_Auto_Command<T>::TAO_EC_Auto_Command () : command_ () , allow_command_ (false) { @@ -19,7 +19,7 @@ TAO_EC_Auto_Command<T>::TAO_EC_Auto_Command (const T & command) template <class T> ACE_INLINE -TAO_EC_Auto_Command<T>::~TAO_EC_Auto_Command (void) +TAO_EC_Auto_Command<T>::~TAO_EC_Auto_Command () { this->execute (); } @@ -46,7 +46,7 @@ TAO_EC_Auto_Command<T>::set_command (TAO_EC_Auto_Command<T> & auto_command) template <class T> ACE_INLINE void -TAO_EC_Auto_Command<T>::execute (void) +TAO_EC_Auto_Command<T>::execute () { if (this->allow_command_) { @@ -65,14 +65,14 @@ TAO_EC_Auto_Command<T>::execute (void) template <class T> ACE_INLINE void -TAO_EC_Auto_Command<T>::allow_command (void) +TAO_EC_Auto_Command<T>::allow_command () { this->allow_command_ = true; } template <class T> ACE_INLINE void -TAO_EC_Auto_Command<T>::disallow_command (void) +TAO_EC_Auto_Command<T>::disallow_command () { this->allow_command_ = false; } @@ -82,7 +82,7 @@ TAO_EC_Auto_Command<T>::disallow_command (void) template <class T> ACE_INLINE -TAO_EC_Shutdown_Command<T>::TAO_EC_Shutdown_Command (void) +TAO_EC_Shutdown_Command<T>::TAO_EC_Shutdown_Command () : target_ () { } @@ -96,7 +96,7 @@ TAO_EC_Shutdown_Command<T>::TAO_EC_Shutdown_Command (T target) template <class T> ACE_INLINE void -TAO_EC_Shutdown_Command<T>::execute (void) +TAO_EC_Shutdown_Command<T>::execute () { if (this->target_.in ()) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl index c30de3be660..22a28750a72 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.inl @@ -2,14 +2,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_EC_Null_ObserverStrategy::TAO_EC_Null_ObserverStrategy (void) +TAO_EC_Null_ObserverStrategy::TAO_EC_Null_ObserverStrategy () { } // **************************************************************** ACE_INLINE -TAO_EC_Basic_ObserverStrategy::Observer_Entry::Observer_Entry (void) +TAO_EC_Basic_ObserverStrategy::Observer_Entry::Observer_Entry () : handle (0) { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl index 72b948b752f..06c05097c76 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void -TAO_EC_ProxyPushSupplier::suspend_connection_i (void) +TAO_EC_ProxyPushSupplier::suspend_connection_i () { this->suspended_ = 1; } ACE_INLINE void -TAO_EC_ProxyPushSupplier::suspend_connection_locked (void) +TAO_EC_ProxyPushSupplier::suspend_connection_locked () { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, @@ -19,13 +19,13 @@ TAO_EC_ProxyPushSupplier::suspend_connection_locked (void) } ACE_INLINE void -TAO_EC_ProxyPushSupplier::resume_connection_i (void) +TAO_EC_ProxyPushSupplier::resume_connection_i () { this->suspended_ = 0; } ACE_INLINE void -TAO_EC_ProxyPushSupplier::resume_connection_locked (void) +TAO_EC_ProxyPushSupplier::resume_connection_locked () { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl index e1ee9410d4b..f75178c929a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_EC_QOS_Info::TAO_EC_QOS_Info (void) +TAO_EC_QOS_Info::TAO_EC_QOS_Info () : rt_info (-1), preemption_priority (0), timer_id_ (-1) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl index 707e9dbd4e2..7c4c07c27b2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_EC_Sched_Factory::TAO_EC_Sched_Factory (void) +TAO_EC_Sched_Factory::TAO_EC_Sched_Factory () : TAO_EC_Default_Factory () { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl index 9b8c73a7755..6686bfd2436 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_EC_Timeout_Adapter::TAO_EC_Timeout_Adapter (void) +TAO_EC_Timeout_Adapter::TAO_EC_Timeout_Adapter () { } diff --git a/TAO/orbsvcs/orbsvcs/Event_Utilities.inl b/TAO/orbsvcs/orbsvcs/Event_Utilities.inl index 23ec7c5559d..a6267b29774 100644 --- a/TAO/orbsvcs/orbsvcs/Event_Utilities.inl +++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.inl @@ -46,7 +46,7 @@ ACE_ConsumerQOS_Factory::insert_bitmasked_value (CORBA::ULong source_mask, } ACE_INLINE int -ACE_ConsumerQOS_Factory::insert_null_terminator (void) +ACE_ConsumerQOS_Factory::insert_null_terminator () { RtecEventChannelAdmin::Dependency dependency; if (this->event_initializer_ != 0) @@ -121,13 +121,13 @@ ACE_ConsumerQOS_Factory::insert_act (RtecEventComm::EventData act) } ACE_INLINE const RtecEventChannelAdmin::ConsumerQOS& -ACE_ConsumerQOS_Factory::get_ConsumerQOS (void) +ACE_ConsumerQOS_Factory::get_ConsumerQOS () { return qos_; } ACE_INLINE -ACE_ConsumerQOS_Factory::operator const RtecEventChannelAdmin::ConsumerQOS& (void) +ACE_ConsumerQOS_Factory::operator const RtecEventChannelAdmin::ConsumerQOS& () { return qos_; } @@ -135,13 +135,13 @@ ACE_ConsumerQOS_Factory::operator const RtecEventChannelAdmin::ConsumerQOS& (voi // ************************************************************ ACE_INLINE const RtecEventChannelAdmin::SupplierQOS& -ACE_SupplierQOS_Factory::get_SupplierQOS (void) +ACE_SupplierQOS_Factory::get_SupplierQOS () { return qos_; } ACE_INLINE -ACE_SupplierQOS_Factory::operator const RtecEventChannelAdmin::SupplierQOS& (void) +ACE_SupplierQOS_Factory::operator const RtecEventChannelAdmin::SupplierQOS& () { return qos_; } diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl index 2c4dfc673ce..26839c1ca0e 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl @@ -10,13 +10,13 @@ TAO_FT_IOGR_Property::TAO_FT_IOGR_Property ( } ACE_INLINE -TAO_FT_IOGR_Property::TAO_FT_IOGR_Property (void) +TAO_FT_IOGR_Property::TAO_FT_IOGR_Property () :ft_group_tagged_component_ (0) { } ACE_INLINE -TAO_FT_IOGR_Property::~TAO_FT_IOGR_Property (void) +TAO_FT_IOGR_Property::~TAO_FT_IOGR_Property () { } diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h index abca6dd0cfc..ac2b5d01431 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h @@ -60,9 +60,9 @@ public: virtual Replication_Strategy* make_primary_strategy(); - virtual int acquire_read (void)=0; - virtual int acquire_write (void)=0; - virtual int release (void)=0; + virtual int acquire_read () = 0; + virtual int acquire_write () = 0; + virtual int release () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl index ac9edd8cd7a..2be05a261b6 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_FTRTEC { ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr - FTEC_Gateway::_this(void) + FTEC_Gateway::_this() { PortableServer::POA_var poa = _default_POA(); return activate(poa.in()); diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl index 66763452d71..f35d706a1ba 100644 --- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl +++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.inl @@ -15,7 +15,7 @@ TAO::HTIOP::Acceptor::address () const } ACE_INLINE const ACE::HTBP::Addr * -TAO::HTIOP::Acceptor::endpoints (void) +TAO::HTIOP::Acceptor::endpoints () { ACE_ASSERT (this->addrs_ != 0); diff --git a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h index 01440540acb..0390c50b5ed 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h @@ -40,10 +40,10 @@ public: virtual ~TAO_LogRecordStore (); /// Initialization. - virtual int open (void) = 0; + virtual int open () = 0; /// Close the record store. - virtual int close (void) = 0; + virtual int close () = 0; // = Log Parameters @@ -113,7 +113,7 @@ public: /// Get the weekly scheduling parameters virtual DsLogAdmin::WeekMask* - get_week_mask (void) = 0; + get_week_mask () = 0; /// Set the weekly scheduling parameters. virtual void @@ -124,11 +124,11 @@ public: /// Gets the current size of the log data. virtual CORBA::ULongLong - get_current_size (void) = 0; + get_current_size () = 0; /// Get the number of records in the log right now. virtual CORBA::ULongLong - get_n_records (void) = 0; + get_n_records () = 0; // = LogRecordStore gauge @@ -136,11 +136,11 @@ public: /// Gets the current value of the "gauge" that measures the total /// size of the records written to the log. virtual CORBA::ULongLong - get_gauge(void) = 0; + get_gauge() = 0; /// Resets the "gauge" to 0 virtual void - reset_gauge(void) = 0; + reset_gauge() = 0; // = Record logging, retrieval, update and removal methods. @@ -152,7 +152,7 @@ public: /// Deletes "old" records from the store. virtual int - purge_old_records (void) = 0; + purge_old_records () = 0; /// Set single record attributes. virtual void @@ -174,7 +174,7 @@ public: /// Ensure changes have been flushed to persistent media /// Returns 0 on success, -1 on failure virtual int - flush (void) = 0; + flush () = 0; /// Returns all records in the log that match the given constraint @@ -207,7 +207,7 @@ public: virtual CORBA::ULong - remove_old_records (void) = 0; + remove_old_records () = 0; /// Read-Write Lock virtual ACE_SYNCH_RW_MUTEX& lock() = 0; diff --git a/TAO/orbsvcs/orbsvcs/Log/LogStore.h b/TAO/orbsvcs/orbsvcs/Log/LogStore.h index 62abf1d6d8b..6a512fc412a 100644 --- a/TAO/orbsvcs/orbsvcs/Log/LogStore.h +++ b/TAO/orbsvcs/orbsvcs/Log/LogStore.h @@ -35,11 +35,11 @@ public: /// Lists all logs created by the log factory. virtual DsLogAdmin::LogList * - list_logs (void) = 0; + list_logs () = 0; /// Lists all log ids. virtual DsLogAdmin::LogIdList * - list_logs_by_id (void) = 0; + list_logs_by_id () = 0; /// Returns a reference to the log with the supplied id. virtual DsLogAdmin::Log_ptr diff --git a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h index 96dc10c433e..464f46def2e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.h @@ -54,7 +54,7 @@ public: /// Return current number of entries (name bindings) in the /// underlying hash map. - virtual size_t current_size (void) = 0; + virtual size_t current_size () = 0; /** * Add a binding with the specified parameters to the table. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h index 854368998e1..4b011f7bf15 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h @@ -305,7 +305,7 @@ public: * same naming server in which the operation was invoked. The * context is not bound. */ - virtual CosNaming::NamingContext_ptr new_context (void) = 0; + virtual CosNaming::NamingContext_ptr new_context () = 0; /** * This operation creates a new context and binds it to the name @@ -323,7 +323,7 @@ public: * NOTE: after <destroy> is invoked on a Naming Context, all * BindingIterators associated with that Naming Context are also destroyed. */ - virtual void destroy (void) = 0; + virtual void destroy () = 0; /** * Returns at most the requested number of bindings <how_many> in @@ -336,7 +336,7 @@ public: CosNaming::BindingIterator_out &bi) = 0; /// Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (void) = 0; + virtual PortableServer::POA_ptr _default_POA () = 0; /** * Set the stale flag for replicated persistence support. diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp index 490b057d00d..09f4e02918c 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp +++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.cpp @@ -328,7 +328,7 @@ ACE_Unbounded_List_Iterator<T>::operator++ (int) template <class T> ACE_Unbounded_List_Iterator<T>& ACE_Unbounded_List_Iterator<T>::operator++ () { - // ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::operator++ (void)"); + // ACE_TRACE ("ACE_Unbounded_List_Iterator<T>::operator++ ()"); // prefix operator diff --git a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl index db6dd43b5bf..e83f0799973 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl @@ -10,7 +10,7 @@ TAO_Notify_Admin::event_channel () const ACE_INLINE TAO_Notify_FilterAdmin& -TAO_Notify_Admin::filter_admin (void) +TAO_Notify_Admin::filter_admin () { return this->filter_admin_; } @@ -22,7 +22,7 @@ TAO_Notify_Admin::filter_operator (CosNotifyChannelAdmin::InterFilterGroupOperat } ACE_INLINE CosNotifyChannelAdmin::InterFilterGroupOperator -TAO_Notify_Admin::filter_operator (void) +TAO_Notify_Admin::filter_operator () { return this->filter_operator_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl index 7ef751cc024..c35e3bf6748 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl @@ -8,7 +8,7 @@ TAO_Notify_AdminProperties::max_global_queue_length () const } ACE_INLINE TAO_Notify_Property_Long& -TAO_Notify_AdminProperties::max_global_queue_length (void) +TAO_Notify_AdminProperties::max_global_queue_length () { return this->max_global_queue_length_; } @@ -20,7 +20,7 @@ TAO_Notify_AdminProperties::max_consumers () const } ACE_INLINE TAO_Notify_Property_Long& -TAO_Notify_AdminProperties::max_consumers (void) +TAO_Notify_AdminProperties::max_consumers () { return this->max_consumers_; } @@ -32,7 +32,7 @@ TAO_Notify_AdminProperties::max_suppliers () const } ACE_INLINE TAO_Notify_Property_Long& -TAO_Notify_AdminProperties::max_suppliers (void) +TAO_Notify_AdminProperties::max_suppliers () { return this->max_suppliers_; } @@ -44,37 +44,37 @@ TAO_Notify_AdminProperties::reject_new_events () const } ACE_INLINE TAO_Notify_Property_Boolean& -TAO_Notify_AdminProperties::reject_new_events (void) +TAO_Notify_AdminProperties::reject_new_events () { return this->reject_new_events_; } ACE_INLINE CORBA::Long& -TAO_Notify_AdminProperties::global_queue_length (void) +TAO_Notify_AdminProperties::global_queue_length () { return this->global_queue_length_; } ACE_INLINE TAO_SYNCH_MUTEX& -TAO_Notify_AdminProperties::global_queue_lock (void) +TAO_Notify_AdminProperties::global_queue_lock () { return this->global_queue_lock_; } ACE_INLINE TAO_SYNCH_CONDITION& -TAO_Notify_AdminProperties::global_queue_not_full(void) +TAO_Notify_AdminProperties::global_queue_not_full() { return this->global_queue_not_full_; } ACE_INLINE TAO_Notify_Atomic_Property_Long& -TAO_Notify_AdminProperties::consumers (void) +TAO_Notify_AdminProperties::consumers () { return this->consumers_; } ACE_INLINE TAO_Notify_Atomic_Property_Long& -TAO_Notify_AdminProperties::suppliers (void) +TAO_Notify_AdminProperties::suppliers () { return this->suppliers_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h index 709e9a7dbc6..bacb92f417f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h @@ -123,7 +123,7 @@ typedef TAO_Notify_Refcountable_Guard_T< TAO_Notify_Consumer > Ptr; protected: /// This method is called by the is_alive() method. It should provide /// the connected consumer or nil if there is none. - virtual CORBA::Object_ptr get_consumer (void) = 0; + virtual CORBA::Object_ptr get_consumer () = 0; typedef ACE_Unbounded_Queue<TAO_Notify_Method_Request_Event_Queueable *> Request_Queue; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl index 474fe1e0229..e241c7cbb43 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl @@ -10,19 +10,19 @@ TAO_Notify_Consumer::pending_events() } ACE_INLINE CORBA::Boolean -TAO_Notify_Consumer::is_suspended (void) +TAO_Notify_Consumer::is_suspended () { return this->is_suspended_; } ACE_INLINE void -TAO_Notify_Consumer::suspend (void) +TAO_Notify_Consumer::suspend () { this->is_suspended_ = 1; } ACE_INLINE size_t -TAO_Notify_Consumer::pending_count (void) +TAO_Notify_Consumer::pending_count () { return this->pending_events_->size(); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl index 5a1c4a268cf..1133b56d995 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class TYPE> ACE_INLINE typename TAO_Notify_Container_T<TYPE>::COLLECTION* -TAO_Notify_Container_T<TYPE>:: collection (void) +TAO_Notify_Container_T<TYPE>:: collection () { return this->collection_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl index b472c831377..4417f2df506 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl @@ -3,24 +3,24 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class PROXY> ACE_INLINE typename TAO_Notify_Event_Map_Entry_T<PROXY>::COLLECTION* -TAO_Notify_Event_Map_Entry_T<PROXY>::collection (void) { +TAO_Notify_Event_Map_Entry_T<PROXY>::collection () { return collection_; } template <class PROXY> ACE_INLINE int -TAO_Notify_Event_Map_Entry_T<PROXY>::count (void) +TAO_Notify_Event_Map_Entry_T<PROXY>::count () { return this->count_; } template <class PROXY> ACE_INLINE CORBA::ULong -TAO_Notify_Event_Map_Entry_T<PROXY>::_incr_refcnt (void) +TAO_Notify_Event_Map_Entry_T<PROXY>::_incr_refcnt () { return ++this->usage_count_; } template <class PROXY> ACE_INLINE CORBA::ULong -TAO_Notify_Event_Map_Entry_T<PROXY>::_decr_refcnt (void) +TAO_Notify_Event_Map_Entry_T<PROXY>::_decr_refcnt () { return --this->usage_count_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl index 9332d886ace..94554016bff 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl @@ -48,25 +48,25 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::release (ENTRY* entry) } template <class PROXY, class ACE_LOCK> ACE_INLINE typename TAO_Notify_Event_Map_Entry_T<PROXY>::COLLECTION* -TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::broadcast_collection (void) +TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::broadcast_collection () { return this->broadcast_entry_.collection (); } template <class PROXY, class ACE_LOCK> ACE_INLINE typename TAO_Notify_Event_Map_Entry_T<PROXY>::COLLECTION* -TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::updates_collection (void) +TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::updates_collection () { return this->updates_entry_.collection (); } template <class PROXY, class ACE_LOCK> ACE_INLINE int -TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::proxy_count (void) +TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::proxy_count () { return this->proxy_count_; } template <class PROXY, class ACE_LOCK> ACE_INLINE const TAO_Notify_EventTypeSeq& -TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::event_types (void) +TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::event_types () { return this->event_types_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h index 1050a38de69..62d581e63ba 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h +++ b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h @@ -36,7 +36,7 @@ public: /// The Factory is activated in the default POA. The filters created are activated in the <filter_poa>. virtual CosNotifyFilter::FilterFactory_ptr create ( PortableServer::POA_ptr filter_poa) = 0; - virtual void destroy (void) = 0; + virtual void destroy () = 0; virtual TAO_Notify_Object::ID get_filter_id (CosNotifyFilter::Filter_ptr filter) = 0; virtual CosNotifyFilter::Filter_ptr get_filter (const TAO_Notify_Object::ID& id) = 0; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl index 331851c2d48..66e46ddd2e7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Notify_Object::ID -TAO_Notify_ID_Factory::id (void) +TAO_Notify_ID_Factory::id () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mtx_, 0); return ++seed_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h index 4cf31b14cdc..8698a7124fa 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h @@ -39,8 +39,8 @@ public: virtual ~TAO_Notify_Method_Request (); /// Execute the Request - virtual int execute (void) = 0; - virtual TAO_Notify_Method_Request_Queueable* copy (void) = 0; + virtual int execute () = 0; + virtual TAO_Notify_Method_Request_Queueable* copy () = 0; }; /***********************************************************************/ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl index 7c185eca11d..c4cfefc11f1 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class SEQ, class PROXY, class SEQ_PARAM, class PROXY_PARAM> ACE_INLINE int -TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute_i (void) +TAO_Notify_Method_Request_Updates_T<SEQ, PROXY, SEQ_PARAM, PROXY_PARAM>::execute_i () { if (this->proxy_->has_shutdown ()) return 0; // If we were shutdown while waiting in the queue, return with no action. diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h index 86f21431161..7998cd8974d 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Dynamic_Statistic.h @@ -33,7 +33,7 @@ public: /// method is expected to call the receive base class method. This /// method isn't pure virtual in Monitor_Base, but we reintroduce /// it here to force all subclasses to implement it. - virtual void update (void) = 0; + virtual void update () = 0; protected: TYPE* interf_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h index 46597279d12..da16b21f071 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControlExt/MonitorConsumerAdmin.h @@ -63,7 +63,7 @@ public: TAO_MonitorEventChannel* get_ec () const; - const ACE_CString & stat_name (void)const; + const ACE_CString & stat_name () const; /// Receive the queue count and store the approximated queue size in diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Object.inl index 0e1b720c43c..951731f3c98 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Object.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Object.inl @@ -47,25 +47,25 @@ TAO_Notify_Object::set_primary_as_proxy_poa() } ACE_INLINE TAO_Notify_POA_Helper* -TAO_Notify_Object::poa (void) +TAO_Notify_Object::poa () { return this->poa_; } ACE_INLINE TAO_Notify_POA_Helper* -TAO_Notify_Object::object_poa (void) +TAO_Notify_Object::object_poa () { return this->object_poa_; } ACE_INLINE TAO_Notify_POA_Helper* -TAO_Notify_Object::proxy_poa (void) +TAO_Notify_Object::proxy_poa () { return this->proxy_poa_; } ACE_INLINE bool -TAO_Notify_Object::has_shutdown (void) +TAO_Notify_Object::has_shutdown () { return this->shutdown_; } @@ -78,14 +78,14 @@ TAO_Notify_Object::set_admin_properties( TAO_Notify_AdminProperties* admin_prope } ACE_INLINE TAO_Notify_Event_Manager& -TAO_Notify_Object::event_manager (void) +TAO_Notify_Object::event_manager () { ACE_ASSERT( this->event_manager_.get() != 0 ); return *this->event_manager_; } ACE_INLINE TAO_Notify_AdminProperties& -TAO_Notify_Object::admin_properties (void) +TAO_Notify_Object::admin_properties () { ACE_ASSERT( this->admin_properties_.get() != 0 ); return *this->admin_properties_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl index 8679b91e6e2..24301c3cc8c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE PortableServer::POA_ptr -TAO_Notify_POA_Helper::poa (void) +TAO_Notify_POA_Helper::poa () { return this->poa_.in (); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Peer.h b/TAO/orbsvcs/orbsvcs/Notify/Peer.h index fd955db9b96..32e1996dc14 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h @@ -50,7 +50,7 @@ public: virtual void shutdown (); /// Access Proxy. - virtual TAO_Notify_Proxy* proxy (void) = 0; + virtual TAO_Notify_Proxy* proxy () = 0; // Dispatch updates virtual void dispatch_updates (const TAO_Notify_EventTypeSeq & added, @@ -72,7 +72,7 @@ protected: private: /// Release - virtual void release (void) = 0; + virtual void release () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl index 75072336efc..c0ce10c65f7 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Notify_Factory* -TAO_Notify_Properties::factory (void) +TAO_Notify_Properties::factory () { return this->factory_; } @@ -14,7 +14,7 @@ TAO_Notify_Properties::factory (TAO_Notify_Factory* factory) } ACE_INLINE TAO_Notify_Builder* -TAO_Notify_Properties::builder (void) +TAO_Notify_Properties::builder () { return this->builder_; } @@ -26,13 +26,13 @@ TAO_Notify_Properties::builder (TAO_Notify_Builder* builder) } ACE_INLINE CORBA::ORB_ptr -TAO_Notify_Properties::orb (void) +TAO_Notify_Properties::orb () { return CORBA::ORB::_duplicate (orb_.in ()); } ACE_INLINE CORBA::ORB_ptr -TAO_Notify_Properties::dispatching_orb (void) +TAO_Notify_Properties::dispatching_orb () { return CORBA::ORB::_duplicate (dispatching_orb_.in ()); } @@ -50,7 +50,7 @@ TAO_Notify_Properties::dispatching_orb (CORBA::ORB_ptr dispatching_orb) } ACE_INLINE PortableServer::POA_ptr -TAO_Notify_Properties::default_poa (void) +TAO_Notify_Properties::default_poa () { return PortableServer::POA::_duplicate (this->default_poa_.in ()); } @@ -62,7 +62,7 @@ TAO_Notify_Properties::default_poa (PortableServer::POA_ptr default_poa) } ACE_INLINE CORBA::Boolean -TAO_Notify_Properties::asynch_updates (void) +TAO_Notify_Properties::asynch_updates () { return this->asynch_updates_; } @@ -74,7 +74,7 @@ TAO_Notify_Properties::asynch_updates (CORBA::Boolean asynch_updates) } ACE_INLINE bool -TAO_Notify_Properties::allow_reconnect (void) +TAO_Notify_Properties::allow_reconnect () { return this->allow_reconnect_; } @@ -86,7 +86,7 @@ TAO_Notify_Properties::allow_reconnect (bool b) } ACE_INLINE bool -TAO_Notify_Properties::validate_client (void) +TAO_Notify_Properties::validate_client () { return this->validate_client_; } @@ -98,7 +98,7 @@ TAO_Notify_Properties::validate_client (bool b) } ACE_INLINE ACE_Time_Value -TAO_Notify_Properties::validate_client_delay (void) +TAO_Notify_Properties::validate_client_delay () { return this->validate_client_delay_; } @@ -110,7 +110,7 @@ TAO_Notify_Properties::validate_client_delay (ACE_Time_Value b) } ACE_INLINE ACE_Time_Value -TAO_Notify_Properties::validate_client_interval (void) +TAO_Notify_Properties::validate_client_interval () { return this->validate_client_interval_; } @@ -123,7 +123,7 @@ TAO_Notify_Properties::validate_client_interval (ACE_Time_Value b) ACE_INLINE bool -TAO_Notify_Properties::separate_dispatching_orb (void) +TAO_Notify_Properties::separate_dispatching_orb () { return this->separate_dispatching_orb_; } @@ -135,7 +135,7 @@ TAO_Notify_Properties::separate_dispatching_orb (bool b) } ACE_INLINE CORBA::Boolean -TAO_Notify_Properties::updates (void) +TAO_Notify_Properties::updates () { return this->updates_; } @@ -147,7 +147,7 @@ TAO_Notify_Properties::updates (CORBA::Boolean updates) } ACE_INLINE const CosNotification::QoSProperties& -TAO_Notify_Properties::default_event_channel_qos_properties (void) +TAO_Notify_Properties::default_event_channel_qos_properties () { return this->ec_qos_; } @@ -159,7 +159,7 @@ TAO_Notify_Properties::default_event_channel_qos_properties (const CosNotificati } ACE_INLINE const CosNotification::QoSProperties& -TAO_Notify_Properties::default_supplier_admin_qos_properties (void) +TAO_Notify_Properties::default_supplier_admin_qos_properties () { return this->sa_qos_; } @@ -171,7 +171,7 @@ TAO_Notify_Properties::default_supplier_admin_qos_properties (const CosNotificat } ACE_INLINE const CosNotification::QoSProperties& -TAO_Notify_Properties::default_consumer_admin_qos_properties (void) +TAO_Notify_Properties::default_consumer_admin_qos_properties () { return this->ca_qos_; } @@ -183,7 +183,7 @@ TAO_Notify_Properties::default_consumer_admin_qos_properties (const CosNotificat } ACE_INLINE const CosNotification::QoSProperties& -TAO_Notify_Properties::default_proxy_supplier_qos_properties (void) +TAO_Notify_Properties::default_proxy_supplier_qos_properties () { return this->ps_qos_; } @@ -195,7 +195,7 @@ TAO_Notify_Properties::default_proxy_supplier_qos_properties (const CosNotificat } ACE_INLINE const CosNotification::QoSProperties& -TAO_Notify_Properties::default_proxy_consumer_qos_properties (void) +TAO_Notify_Properties::default_proxy_consumer_qos_properties () { return this->pc_qos_; } @@ -207,7 +207,7 @@ TAO_Notify_Properties::default_proxy_consumer_qos_properties (const CosNotificat } ACE_INLINE CosNotifyChannelAdmin::InterFilterGroupOperator -TAO_Notify_Properties::defaultConsumerAdminFilterOp (void) +TAO_Notify_Properties::defaultConsumerAdminFilterOp () { return this->defaultConsumerAdminFilterOp_; } @@ -220,7 +220,7 @@ TAO_Notify_Properties::defaultConsumerAdminFilterOp (CosNotifyChannelAdmin::Inte ACE_INLINE CosNotifyChannelAdmin::InterFilterGroupOperator -TAO_Notify_Properties::defaultSupplierAdminFilterOp (void) +TAO_Notify_Properties::defaultSupplierAdminFilterOp () { return this->defaultSupplierAdminFilterOp_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl index 17130a3a969..88c3d9c181b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl @@ -33,7 +33,7 @@ TAO_Notify_PropertyBase_T<TYPE>::operator!= (const TYPE &rhs) const } template <class TYPE> ACE_INLINE void -TAO_Notify_PropertyBase_T<TYPE>:: invalidate (void) +TAO_Notify_PropertyBase_T<TYPE>:: invalidate () { this->valid_ = 0; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h index 48e2b67e728..bc803700021 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h @@ -76,10 +76,10 @@ public: CORBA::Boolean updates_off (); /// Destroy this object. - virtual void destroy (void) = 0; + virtual void destroy () = 0; /// Access our Peer. - virtual TAO_Notify_Peer* peer (void) = 0; + virtual TAO_Notify_Peer* peer () = 0; /// Implement the Obtain Types. virtual CosNotification::EventTypeSeq* obtain_types ( diff --git a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl index f8f1b5da453..c83aa741299 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Boolean -TAO_Notify_Proxy::updates_off (void) +TAO_Notify_Proxy::updates_off () { return this->updates_off_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl index 5f9deb58c82..6172c6e0928 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl @@ -8,13 +8,13 @@ TAO_Notify_ProxyConsumer::is_connected () const } ACE_INLINE TAO_Notify_Supplier* -TAO_Notify_ProxyConsumer::supplier (void) +TAO_Notify_ProxyConsumer::supplier () { return this->supplier_.get(); } ACE_INLINE TAO_Notify_SupplierAdmin& -TAO_Notify_ProxyConsumer::supplier_admin (void) +TAO_Notify_ProxyConsumer::supplier_admin () { ACE_ASSERT( this->supplier_admin_.get() != 0 ); return *this->supplier_admin_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl index 7f7d079890a..df3d2ba141c 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl @@ -8,13 +8,13 @@ TAO_Notify_ProxySupplier::is_connected () const } ACE_INLINE TAO_Notify_Consumer* -TAO_Notify_ProxySupplier::consumer (void) +TAO_Notify_ProxySupplier::consumer () { return this->consumer_.get(); } ACE_INLINE TAO_Notify_ConsumerAdmin& -TAO_Notify_ProxySupplier::consumer_admin (void) +TAO_Notify_ProxySupplier::consumer_admin () { ACE_ASSERT( this->consumer_admin_.get() != 0 ); return *this->consumer_admin_; diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl index db79570bce6..510e5b7d8af 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl @@ -92,67 +92,67 @@ TAO_Notify_QoSProperties::blocking_policy() const ACE_INLINE TAO_Notify_Property_Short& -TAO_Notify_QoSProperties::event_reliability(void) +TAO_Notify_QoSProperties::event_reliability() { return this->event_reliability_; } ACE_INLINE TAO_Notify_Property_Short& -TAO_Notify_QoSProperties::connection_reliability(void) +TAO_Notify_QoSProperties::connection_reliability() { return this->connection_reliability_; } ACE_INLINE TAO_Notify_Property_Short& -TAO_Notify_QoSProperties::priority(void) +TAO_Notify_QoSProperties::priority() { return this->priority_; } ACE_INLINE TAO_Notify_Property_Time& -TAO_Notify_QoSProperties::timeout(void) +TAO_Notify_QoSProperties::timeout() { return this->timeout_; } ACE_INLINE TAO_Notify_Property_Boolean& -TAO_Notify_QoSProperties::stop_time_supported(void) +TAO_Notify_QoSProperties::stop_time_supported() { return this->stop_time_supported_; } ACE_INLINE TAO_Notify_Property_Long& -TAO_Notify_QoSProperties::maximum_batch_size (void) +TAO_Notify_QoSProperties::maximum_batch_size () { return this->maximum_batch_size_; } ACE_INLINE TAO_Notify_Property_Time& -TAO_Notify_QoSProperties::pacing_interval (void) +TAO_Notify_QoSProperties::pacing_interval () { return this->pacing_interval_; } ACE_INLINE TAO_Notify_Property_Long& -TAO_Notify_QoSProperties::max_events_per_consumer (void) +TAO_Notify_QoSProperties::max_events_per_consumer () { return this->max_events_per_consumer_; } ACE_INLINE TAO_Notify_Property_Short& -TAO_Notify_QoSProperties::discard_policy(void) +TAO_Notify_QoSProperties::discard_policy() { return this->discard_policy_; } ACE_INLINE TAO_Notify_Property_Short& -TAO_Notify_QoSProperties::order_policy(void) +TAO_Notify_QoSProperties::order_policy() { return this->order_policy_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl index 3316151861f..30fa294de82 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE RTCORBA::RTORB_ptr -TAO_Notify_RT_Properties::rt_orb (void) +TAO_Notify_RT_Properties::rt_orb () { return RTCORBA::RTORB::_duplicate (rt_orb_.in ()); } @@ -14,7 +14,7 @@ TAO_Notify_RT_Properties::rt_orb (RTCORBA::RTORB_ptr rt_orb) } ACE_INLINE RTCORBA::Current_ptr -TAO_Notify_RT_Properties::current (void) +TAO_Notify_RT_Properties::current () { return RTCORBA::Current::_duplicate (current_.in()); } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl index cc4ef7e45c5..892a8011b22 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Notify_Buffering_Strategy* -TAO_Notify_Reactive_Task::buffering_strategy (void) +TAO_Notify_Reactive_Task::buffering_strategy () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h index 10c53019a7c..379dd715558 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h @@ -78,7 +78,7 @@ public: private: /// The release method is called when the refcount reaches 0. - virtual void release (void) = 0; + virtual void release () = 0; /// Use a signed counter so that we can more easily detect /// boundary conditions such as too many _decr_refcnt() calls. diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h index 4b775ecab63..e3f8c4bb819 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h @@ -44,7 +44,7 @@ public: /// Access Base Proxy. virtual TAO_Notify_Proxy* proxy (); - virtual CORBA::Object_ptr get_supplier (void) = 0; + virtual CORBA::Object_ptr get_supplier () = 0; bool is_alive (bool allow_nil_supplier); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl b/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl index e1b2c45f8c3..8fcf8928148 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Notify_ProxyConsumer* -TAO_Notify_Supplier::proxy_consumer (void) +TAO_Notify_Supplier::proxy_consumer () { return this->proxy_; } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl index 024c8483f0e..1c496a22c44 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl @@ -12,7 +12,7 @@ namespace TAO_Notify ACE_INLINE bool - Topology_Parent::child_change (void) + Topology_Parent::child_change () { this->children_changed_ = true; return send_change (); diff --git a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h index 61ded68ec13..38f349a5618 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h @@ -51,10 +51,10 @@ public: virtual void execute (TAO_Notify_Method_Request& method_request) = 0; /// Shutdown task - virtual void shutdown (void) = 0; + virtual void shutdown () = 0; /// The object used by clients to register timers. - virtual TAO_Notify_Timer* timer (void) = 0; + virtual TAO_Notify_Timer* timer () = 0; protected: diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl index 9ecf57d37c7..bc609a30646 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.inl @@ -16,7 +16,7 @@ TAO_UIPMC_Acceptor::address () const } ACE_INLINE const ACE_INET_Addr * -TAO_UIPMC_Acceptor::endpoints (void) +TAO_UIPMC_Acceptor::endpoints () { ACE_ASSERT (this->addrs_ != 0); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl index d44dee9b2fc..d773b8acef0 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.inl @@ -40,7 +40,7 @@ TAO_UIPMC_Endpoint::uint_ip_addr (ACE_UINT32 ip_addr) } ACE_INLINE void -TAO_UIPMC_Endpoint::update_object_addr (void) +TAO_UIPMC_Endpoint::update_object_addr () { this->object_addr_.set (this->port_, this->uint_ip_addr ()); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl index 667237bbdac..c51daa4f597 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl @@ -20,7 +20,7 @@ TAO::Null_SSL_State_Guard::Null_SSL_State_Guard ( } ACE_INLINE -TAO::Null_SSL_State_Guard::~Null_SSL_State_Guard (void) +TAO::Null_SSL_State_Guard::~Null_SSL_State_Guard () { // Restore the previous TSS SSL state. this->current_->teardown (this->previous_current_impl_, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl index 55ac19b0d06..4957a8cf31b 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.inl @@ -17,7 +17,7 @@ TAO::SSLIOP::State_Guard::State_Guard ( } ACE_INLINE -TAO::SSLIOP::State_Guard::~State_Guard (void) +TAO::SSLIOP::State_Guard::~State_Guard () { this->handler_->teardown_ssl_state (this->previous_current_impl_, this->setup_done_); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h index f0fccca7a66..be0e0e189a7 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h @@ -74,7 +74,7 @@ namespace TAO //@{ virtual char * creds_id (); - virtual SecurityLevel3::CredentialsType creds_type (void) = 0; + virtual SecurityLevel3::CredentialsType creds_type () = 0; virtual SecurityLevel3::CredentialsUsage creds_usage (); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl index df5f0ced92c..46b74d1b0d5 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl @@ -2,14 +2,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ::X509 * -TAO::SSLIOP_Credentials::x509 (void) +TAO::SSLIOP_Credentials::x509 () { return TAO::SSLIOP::OpenSSL_traits< ::X509 >::_duplicate (this->x509_.in ()); } ACE_INLINE ::EVP_PKEY * -TAO::SSLIOP_Credentials::evp (void) +TAO::SSLIOP_Credentials::evp () { return TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::_duplicate (this->evp_.in ()); diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl index 870554d3e0d..b721a43215d 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl @@ -17,7 +17,7 @@ TAO::SSLIOP::Current::implementation (TAO::SSLIOP::Current_Impl *impl) } ACE_INLINE TAO::SSLIOP::Current_Impl * -TAO::SSLIOP::Current::implementation (void) +TAO::SSLIOP::Current::implementation () { if (this->orb_core_ == 0) return 0; diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl index bdcb30639af..7dcc6aee327 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.inl @@ -35,7 +35,7 @@ TAO_SSLIOP_Endpoint::iiop_endpoint (TAO_IIOP_Endpoint *iiop_endpoint, } ACE_INLINE const ::SSLIOP::SSL & -TAO_SSLIOP_Endpoint::ssl_component (void)const +TAO_SSLIOP_Endpoint::ssl_component () const { return this->ssl_component_; } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl index 06691af5980..c1507de8ef3 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl @@ -38,7 +38,7 @@ TAO::SSLIOP::release (T * st) // ------------------------------------------------------------------- template <typename T> ACE_INLINE -TAO::SSLIOP::OpenSSL_st_var<T>::OpenSSL_st_var (void) +TAO::SSLIOP::OpenSSL_st_var<T>::OpenSSL_st_var () : st_ (0) { } @@ -63,7 +63,7 @@ TAO::SSLIOP::OpenSSL_st_var<T>::OpenSSL_st_var (T const & st) } template <typename T> ACE_INLINE -TAO::SSLIOP::OpenSSL_st_var<T>::~OpenSSL_st_var (void) +TAO::SSLIOP::OpenSSL_st_var<T>::~OpenSSL_st_var () { TAO::SSLIOP::OpenSSL_traits<T>::release (this->st_); // TAO::SSLIOP::release (this->st_); @@ -109,7 +109,7 @@ TAO::SSLIOP::OpenSSL_st_var<T>::operator-> () const } template <typename T> ACE_INLINE T * -TAO::SSLIOP::OpenSSL_st_var<T>::operator-> (void) +TAO::SSLIOP::OpenSSL_st_var<T>::operator-> () { return this->st_; } @@ -133,13 +133,13 @@ TAO::SSLIOP::OpenSSL_st_var<T>::in () const } template <typename T> ACE_INLINE T *& -TAO::SSLIOP::OpenSSL_st_var<T>::inout (void) +TAO::SSLIOP::OpenSSL_st_var<T>::inout () { return this->st_; } template <typename T> ACE_INLINE T *& -TAO::SSLIOP::OpenSSL_st_var<T>::out (void) +TAO::SSLIOP::OpenSSL_st_var<T>::out () { TAO::SSLIOP::OpenSSL_traits<T>::release (this->st_); this->st_ = 0; @@ -147,7 +147,7 @@ TAO::SSLIOP::OpenSSL_st_var<T>::out (void) } template <typename T> ACE_INLINE T * -TAO::SSLIOP::OpenSSL_st_var<T>::_retn (void) +TAO::SSLIOP::OpenSSL_st_var<T>::_retn () { // Yield ownership of the OpenSSL structure. T * st = this->st_; diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl index 374ebb64e8f..505e010e20e 100644 --- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl +++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.inl @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // operation. ACE_INLINE ACE_Scheduler_Factory::Factory_Status -ACE_Scheduler_Factory::status (void) +ACE_Scheduler_Factory::status () { return status_; } diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl index a0f7eac384d..be13aa17e98 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl @@ -11,7 +11,7 @@ TAO::SL3::SecurityCurrent::tss_slot () const } ACE_INLINE TAO::SL3::SecurityCurrent_Impl * -TAO::SL3::SecurityCurrent::implementation (void) +TAO::SL3::SecurityCurrent::implementation () { TAO::SL3::SecurityCurrent_Impl *impl = static_cast<TAO::SL3::SecurityCurrent_Impl *> ( diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl b/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl index a799af3e796..d21fe9a72c1 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl @@ -8,7 +8,7 @@ TAO_Security_Current::tss_slot () const } ACE_INLINE TAO::Security::Current_Impl * -TAO_Security_Current::implementation (void) +TAO_Security_Current::implementation () { if (this->orb_core_ == 0 && this->init () != 0) return 0; diff --git a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h index 6f8d682a822..3293c437178 100644 --- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h +++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h @@ -30,8 +30,8 @@ public: virtual void operator() (int which_signal) = 0; protected: - Shutdown_Functor (void) {} - virtual ~Shutdown_Functor (void) {} + Shutdown_Functor () {} + virtual ~Shutdown_Functor () {} }; /** diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp index 0fc16992296..9299ac0f34e 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp @@ -678,9 +678,9 @@ void yyset_lineno ( int _line_number ); #ifndef YY_SKIP_YYWRAP #ifdef __cplusplus -extern "C" int yywrap ( void ); +extern "C" int yywrap (); #else -extern int yywrap ( void ); +extern int yywrap (); #endif #endif @@ -701,9 +701,9 @@ static int yy_flex_strlen ( const char * ); #ifndef YY_NO_INPUT #ifdef __cplusplus -static int yyinput ( void ); +static int yyinput (); #else -static int input ( void ); +static int input (); #endif #endif diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h index e2a6d8b9306..75abe170d9c 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h @@ -62,7 +62,7 @@ public: virtual void add_offer (CosTrading::OfferId offer_id, const CosTrading::Offer* offer) = 0; - virtual CORBA::ULong max_left (void) = 0; + virtual CORBA::ULong max_left () = 0; // BEGIN SPEC // The max_left operation returns the number of service offers diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h index 099fadafa46..f346d3dcad1 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h @@ -174,7 +174,7 @@ class TAO_Trading_Serv_Export TAO_Dynamic_Property : public virtual POA_CosTradingDynamic::DynamicPropEval { public: - TAO_Dynamic_Property (void) {} + TAO_Dynamic_Property () {} virtual ~TAO_Dynamic_Property (); void destroy (); @@ -681,7 +681,7 @@ public: typedef CosTrading::Lookup::SpecifiedProps SPECIFIED_PROPS; /// An accomplice to g++'s insane lust for copy constructors. - TAO_Property_Filter (void) : policy_ (CosTrading::Lookup::all) {} + TAO_Property_Filter () : policy_ (CosTrading::Lookup::all) {} /// Verify that the specified properties are correct. TAO_Property_Filter (const SPECIFIED_PROPS& desired_props); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp index da1bbbdc517..1644dbca3b5 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp @@ -28,7 +28,7 @@ public: { } - virtual void run_test (void) = 0; + virtual void run_test () = 0; virtual int svc () { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp index 22fb16de51d..c493bbfe72f 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp @@ -34,7 +34,7 @@ public: { } - virtual void run_test (void) = 0; + virtual void run_test () = 0; virtual int svc () { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.inl index 6f858db202d..fd557a776c3 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.inl @@ -5,7 +5,7 @@ */ ACE_INLINE -Client_Group::Client_Group (void) +Client_Group::Client_Group () { } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.inl index 68caec3c217..b6918b8b631 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.inl @@ -5,7 +5,7 @@ */ ACE_INLINE -Client_Pair::Client_Pair (void) +Client_Pair::Client_Pair () { } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.inl index b0807f25919..eaea98cfb36 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.inl @@ -5,7 +5,7 @@ */ ACE_INLINE void -Implicit_Deactivator::release (void) +Implicit_Deactivator::release () { this->id_ = 0; } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.inl index a338fed194f..15ae716ce5a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.inl @@ -5,7 +5,7 @@ */ ACE_INLINE -Loopback_Pair::Loopback_Pair (void) +Loopback_Pair::Loopback_Pair () { } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.inl index 7d7371f190a..1add77034d2 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.inl @@ -5,7 +5,7 @@ */ ACE_INLINE CORBA::ORB_ptr -ORB_Holder::orb (void) +ORB_Holder::orb () { return CORBA::ORB::_duplicate (this->orb_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.inl index 42071dbb049..f866c65c836 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.inl @@ -11,7 +11,7 @@ RTClient_Setup::use_rt_corba () const } ACE_INLINE RTCORBA_Setup * -RTClient_Setup::rtcorba_setup (void) +RTClient_Setup::rtcorba_setup () { return this->rtcorba_setup_.get (); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.inl index 5efd85a0570..8411921e9e4 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.inl @@ -5,7 +5,7 @@ */ ACE_INLINE PortableServer::POA_ptr -RTPOA_Setup::poa (void) +RTPOA_Setup::poa () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.inl index 102c3f7651b..458071902f0 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.inl @@ -5,7 +5,7 @@ */ ACE_INLINE PortableServer::POA_ptr -RTServer_Setup::poa (void) +RTServer_Setup::poa () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl index cde3e4b96ea..e27a75f3a6e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.inl @@ -1,5 +1,5 @@ ACE_INLINE -Receiver_Stats::Receiver_Stats (void) +Receiver_Stats::Receiver_Stats () : samples_count_ (0) , min_ (0) , min_at_ (0) diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp index 1303aa8587a..22d2ae7e2a2 100644 --- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp +++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp @@ -45,7 +45,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // Add an operation to the interface. // First get some useful things. // - ACE_DEBUG((LM_DEBUG, ". Get primitive (void)\n")); + ACE_DEBUG((LM_DEBUG, ". Get primitive ()\n")); CORBA::PrimitiveDef_var voidPrimitive = ifr->get_primitive( CORBA::pk_void) ; ACE_DEBUG((LM_DEBUG, ". Get primitive (char)\n")); diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp index 28b22d7c5d4..1ccbf5f46c1 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp @@ -165,7 +165,7 @@ int CC_CreateLockSet_Cmd::execute() } catch (const CORBA::Exception& ex) { - ex._tao_print_exception ("CC_CreateLockSet_Cmd::execute(void)"); + ex._tao_print_exception ("CC_CreateLockSet_Cmd::execute()"); } return 1; // CC_SUCCESS @@ -206,7 +206,7 @@ int CC_Lock_Cmd::execute() } catch (const CORBA::Exception& ex) { - ex._tao_print_exception ("CC_Lock_Cmd::execute(void)"); + ex._tao_print_exception ("CC_Lock_Cmd::execute()"); return 0; } return 1; // CC_SUCCESS @@ -247,7 +247,7 @@ int CC_UnLock_Cmd::execute() } catch (const CORBA::Exception& ex) { - ex._tao_print_exception ("CC_UnLock_Cmd::execute(void)"); + ex._tao_print_exception ("CC_UnLock_Cmd::execute()"); return 0; } return 1; // CC_SUCCESS @@ -301,7 +301,7 @@ int CC_TryLock_Cmd::execute() } catch (const CORBA::Exception& ex) { - ex._tao_print_exception ("CC_TryLock_Cmd::execute(void)"); + ex._tao_print_exception ("CC_TryLock_Cmd::execute()"); return 0; } @@ -349,7 +349,7 @@ int CC_ChangeMode_Cmd::execute() } catch (const CORBA::Exception& ex) { - ex._tao_print_exception ("CC_ChangeMode_Cmd::execute(void)"); + ex._tao_print_exception ("CC_ChangeMode_Cmd::execute()"); } return 1; // CC_SUCCESS } @@ -541,7 +541,7 @@ CC_Lookup_Cmd::execute() } catch (const CORBA::Exception& ex) { - ex._tao_print_exception ("CC_UnLock_Cmd::execute(void)"); + ex._tao_print_exception ("CC_UnLock_Cmd::execute()"); } } return 1; // CC_SUCCESS diff --git a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp index a4b68b98b73..40321000308 100644 --- a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp @@ -1308,7 +1308,7 @@ ACE_CC_YY_BUFFER_STATE new_buffer; #ifdef ACE_CC_YY_USE_PROTOS -void ace_cc_yy_load_buffer_state( void ) +void ace_cc_yy_load_buffer_state() #else void ace_cc_yy_load_buffer_state() #endif diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp index 35c4f4213e6..022fdae0c7d 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp @@ -91,7 +91,7 @@ public: class Handler : public POA_A::AMI_AMI_TestHandler { public: - Handler (void) {}; + Handler () {}; void foo (CORBA::Long result, CORBA::Long out_l) @@ -145,7 +145,7 @@ public: ACE_DEBUG ((LM_DEBUG, "Callback method <set_yadda_excep> called:\n")); }; - ~Handler (void) {}; + ~Handler () {}; }; // ReplyHandler. diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp index 99fb12bc762..834bce82088 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp @@ -66,10 +66,10 @@ class Handler : public POA_A::AMI_AMI_TestHandler { public: /// Constructor. - Handler (void) {}; + Handler () {}; /// Destructor. - ~Handler (void) {}; + ~Handler () {}; void foo (CORBA::Long ami_return_val, CORBA::Long out_l) diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.h b/TAO/orbsvcs/tests/Notify/lib/Command.h index a338e2a9587..49bee3e6d5a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command.h @@ -45,10 +45,10 @@ public: virtual void init (ACE_Arg_Shifter& arg_shifter); /// Implement command execution. - virtual void execute_i (void) = 0; + virtual void execute_i () = 0; /// Return the name of this command. - virtual const char* get_name (void)= 0; + virtual const char* get_name () = 0; ///= Each derived type must also implement the following signature: // static const char* name (); diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h index 9e3af149a3a..2465bc2c227 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h @@ -32,7 +32,7 @@ public: virtual ~TAO_Notify_Tests_Command_Factory (); /// Create the command. - virtual TAO_Notify_Tests_Command* create (void) = 0; + virtual TAO_Notify_Tests_Command* create () = 0; }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp index faf2586eb94..94502a02c92 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp @@ -60,7 +60,7 @@ check_supported_priorities (CORBA::ORB_ptr orb) } /*****************************************************************/ -TAO_Notify_Tests_Worker::TAO_Notify_Tests_Worker (void) : +TAO_Notify_Tests_Worker::TAO_Notify_Tests_Worker () : cmd_builder_ (0) { } diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver_Base.h b/TAO/orbsvcs/tests/Notify/lib/Driver_Base.h index 4a0c994ac33..fc2e00cc992 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver_Base.h +++ b/TAO/orbsvcs/tests/Notify/lib/Driver_Base.h @@ -26,7 +26,7 @@ public: virtual ~TAO_Notify_Tests_Driver_Base () {}; /// Shutdown - virtual void shutdown (void) = 0; + virtual void shutdown () = 0; }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h index 36e0412a554..263b2df4803 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h @@ -92,7 +92,7 @@ protected: , CosNotification::QoSProperties& qos) = 0; /// Disconnect from proxy. - virtual void disconnect_from_proxy (void) = 0; + virtual void disconnect_from_proxy () = 0; // = Data Members diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h index 427cf0b3473..be037c1a1c5 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h @@ -33,7 +33,7 @@ class Naming_Test public: /// Execute the test code. <root_context> is the context to assume /// as the root for all tests operations. - virtual ~Naming_Test (void) {} + virtual ~Naming_Test () {} virtual int execute (TAO_Naming_Client &root_context) = 0; }; diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h index 0116a2c0e17..bdad759fcd0 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.h +++ b/TAO/orbsvcs/tests/Trading/TT_Info.h @@ -31,7 +31,7 @@ public: public POA_TAO_Trader_Test::Remote_Output { public: - Remote_Output (void) {} + Remote_Output () {} virtual void confirm () {} @@ -43,7 +43,7 @@ public: public POA_TAO_Trader_Test::Printer { public: - Printer (void) {} + Printer () {} virtual void confirm () {} @@ -55,7 +55,7 @@ public: public POA_TAO_Trader_Test::Plotter { public: - Plotter (void) {} + Plotter () {} virtual void confirm () {} @@ -67,7 +67,7 @@ public: public POA_TAO_Trader_Test::File_System { public: - File_System (void) {} + File_System () {} virtual void confirm () {} @@ -79,7 +79,7 @@ public: public POA_TAO_Trader_Test::PostScript_Printer { public: - PostScript_Printer (void) {} + PostScript_Printer () {} virtual void confirm () {} diff --git a/TAO/performance-tests/Callback/Callback_i.inl b/TAO/performance-tests/Callback/Callback_i.inl index 18c2c0cad06..2b5f88582dd 100644 --- a/TAO/performance-tests/Callback/Callback_i.inl +++ b/TAO/performance-tests/Callback/Callback_i.inl @@ -6,7 +6,7 @@ Callback_i::Callback_i (int expected_samples) } ACE_INLINE ACE_Sample_History& -Callback_i::sample_history (void) +Callback_i::sample_history () { return this->history_; } diff --git a/TAO/performance-tests/Callback/Server_i.inl b/TAO/performance-tests/Callback/Server_i.inl index e162f536d0a..d772f2523d3 100644 --- a/TAO/performance-tests/Callback/Server_i.inl +++ b/TAO/performance-tests/Callback/Server_i.inl @@ -1,11 +1,11 @@ ACE_INLINE -Server_i::Server_i (void) +Server_i::Server_i () : done_ (0) { } ACE_INLINE int -Server_i::done (void) +Server_i::done () { return this->done_; } diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.inl b/TAO/performance-tests/POA/Demux/demux_test_client.inl index 9b2d1111852..184cba77413 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_client.inl +++ b/TAO/performance-tests/POA/Demux/demux_test_client.inl @@ -10,7 +10,7 @@ static void shutdown (Demux_Test_ptr objref) } //FUZZ: enable check_for_lack_ACE_OS -int Demux_Test_Client::init_operation_db (void) +int Demux_Test_Client::init_operation_db () { this->op_db_[0].op_ = M302; this->op_db_[1].op_ = shutdown; diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl index 60fa6e3774b..730a0be162e 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.inl @@ -1,4 +1,4 @@ ACE_INLINE -Test_i::Test_i (void) +Test_i::Test_i () { } diff --git a/TAO/tao/Abstract_Servant_Base.inl b/TAO/tao/Abstract_Servant_Base.inl index 022fac0a234..2d6b259a3b8 100644 --- a/TAO/tao/Abstract_Servant_Base.inl +++ b/TAO/tao/Abstract_Servant_Base.inl @@ -1,7 +1,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Abstract_ServantBase::TAO_Abstract_ServantBase (void) +TAO_Abstract_ServantBase::TAO_Abstract_ServantBase () { // No-Op. } diff --git a/TAO/tao/Acceptor_Registry.inl b/TAO/tao/Acceptor_Registry.inl index 00ea19bb559..ce6ebba429a 100644 --- a/TAO/tao/Acceptor_Registry.inl +++ b/TAO/tao/Acceptor_Registry.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_AcceptorSetIterator -TAO_Acceptor_Registry::begin (void) +TAO_Acceptor_Registry::begin () { return this->acceptors_; } ACE_INLINE TAO_AcceptorSetIterator -TAO_Acceptor_Registry::end (void) +TAO_Acceptor_Registry::end () { return this->acceptors_ + this->size_; } diff --git a/TAO/tao/AnyTypeCode/Any.inl b/TAO/tao/AnyTypeCode/Any.inl index 526ef5ae6d4..a7a0d0001b5 100644 --- a/TAO/tao/AnyTypeCode/Any.inl +++ b/TAO/tao/AnyTypeCode/Any.inl @@ -360,13 +360,13 @@ CORBA::Any_out::operator CORBA::Any *&() } ACE_INLINE CORBA::Any *& -CORBA::Any_out::ptr (void) +CORBA::Any_out::ptr () { return this->ptr_; } ACE_INLINE CORBA::Any * -CORBA::Any_out::operator-> (void) +CORBA::Any_out::operator-> () { return this->ptr_; } diff --git a/TAO/tao/AnyTypeCode/NVList.inl b/TAO/tao/AnyTypeCode/NVList.inl index 0ecd203dcc1..05749bc6fba 100644 --- a/TAO/tao/AnyTypeCode/NVList.inl +++ b/TAO/tao/AnyTypeCode/NVList.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -CORBA::NamedValue::NamedValue (void) +CORBA::NamedValue::NamedValue () : refcount_ (1), flags_ (0), name_ (0) @@ -52,7 +52,7 @@ CORBA::NamedValue::_nil () // ************************************************************* ACE_INLINE -CORBA::NVList::NVList (void) +CORBA::NVList::NVList () : max_ (0), refcount_ (1), incoming_ (0), diff --git a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h index 6955c7cd1db..0effbfd29c1 100644 --- a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h @@ -42,8 +42,8 @@ namespace TAO * class MyHostClass : private RefCountPolicy * { * public: - * void my_add_ref (void) { this->RefCountPolicy::add_ref (); } - * void my_remove_ref (void) { this->RefCountPolicy::remove_ref (); } + * void my_add_ref () { this->RefCountPolicy::add_ref (); } + * void my_remove_ref () { this->RefCountPolicy::remove_ref (); } * }; * @endcode * diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h index 45b27e67042..1fe416b2c16 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h @@ -46,8 +46,8 @@ namespace TAO * class MyHostClass : private RefCountPolicy * { * public: - * void my_add_ref (void) { this->RefCountPolicy::add_ref (); } - * void my_remove_ref (void) { this->RefCountPolicy::remove_ref (); } + * void my_add_ref () { this->RefCountPolicy::add_ref (); } + * void my_remove_ref () { this->RefCountPolicy::remove_ref (); } * }; * @endcode * diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl index 0370bd091a4..c9cc3862c88 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl @@ -17,7 +17,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::Case ( template <typename StringType, typename TypeCodeType> ACE_INLINE -TAO::TypeCode::Case<StringType, TypeCodeType>::Case (void) +TAO::TypeCode::Case<StringType, TypeCodeType>::Case () : name_ () , type_ () { diff --git a/TAO/tao/BD_String_Argument_T.inl b/TAO/tao/BD_String_Argument_T.inl index cc4e6c2b853..ad9da0d3585 100644 --- a/TAO/tao/BD_String_Argument_T.inl +++ b/TAO/tao/BD_String_Argument_T.inl @@ -48,7 +48,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& -TAO::Inout_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg (void) +TAO::Inout_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg () { return this->x_; } @@ -69,7 +69,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& -TAO::Out_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg (void) +TAO::Out_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg () { return this->x_; } @@ -81,7 +81,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>:: -Ret_BD_String_Argument_T (void) +Ret_BD_String_Argument_T () { } @@ -90,7 +90,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type * -TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::excp (void) +TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::excp () { return this->x_.ptr (); } @@ -100,7 +100,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type * -TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::retn (void) +TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::retn () { return this->x_._retn (); } @@ -110,7 +110,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& -TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg (void) +TAO::Ret_BD_String_Argument_T<S_var,BOUND,Insert_Policy>::arg () { return this->x_.out (); } diff --git a/TAO/tao/Base_Transport_Property.inl b/TAO/tao/Base_Transport_Property.inl index a99880c12f8..4f7ce5ebd51 100644 --- a/TAO/tao/Base_Transport_Property.inl +++ b/TAO/tao/Base_Transport_Property.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Base_Transport_Property::TAO_Base_Transport_Property (void) +TAO_Base_Transport_Property::TAO_Base_Transport_Property () { } diff --git a/TAO/tao/Basic_Argument_T.inl b/TAO/tao/Basic_Argument_T.inl index c0cd04fa721..f3fb2f2bd83 100644 --- a/TAO/tao/Basic_Argument_T.inl +++ b/TAO/tao/Basic_Argument_T.inl @@ -38,7 +38,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Inout_Basic_Argument_T<S, Insert_Policy>::arg (void) +TAO::Inout_Basic_Argument_T<S, Insert_Policy>::arg () { return this->x_; } @@ -56,7 +56,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Out_Basic_Argument_T<S, Insert_Policy>::arg (void) +TAO::Out_Basic_Argument_T<S, Insert_Policy>::arg () { return this->x_; } @@ -66,7 +66,7 @@ TAO::Out_Basic_Argument_T<S, Insert_Policy>::arg (void) template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Ret_Basic_Argument_T<S, Insert_Policy>::Ret_Basic_Argument_T (void) +TAO::Ret_Basic_Argument_T<S, Insert_Policy>::Ret_Basic_Argument_T () { } @@ -74,7 +74,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Ret_Basic_Argument_T<S, Insert_Policy>::arg (void) +TAO::Ret_Basic_Argument_T<S, Insert_Policy>::arg () { return this->x_; } @@ -83,7 +83,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::Ret_Basic_Argument_T<S, Insert_Policy>::excp (void) +TAO::Ret_Basic_Argument_T<S, Insert_Policy>::excp () { return this->x_; } @@ -92,7 +92,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::Ret_Basic_Argument_T<S, Insert_Policy>::retn (void) +TAO::Ret_Basic_Argument_T<S, Insert_Policy>::retn () { return this->x_; } diff --git a/TAO/tao/CDR.inl b/TAO/tao/CDR.inl index 89958d671dd..2180ec07e88 100644 --- a/TAO/tao/CDR.inl +++ b/TAO/tao/CDR.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_OutputCDR::~TAO_OutputCDR (void) +TAO_OutputCDR::~TAO_OutputCDR () { } @@ -262,7 +262,7 @@ TAO_InputCDR::TAO_InputCDR (ACE_InputCDR::Transfer_Contents rhs, ACE_INLINE -TAO_InputCDR::~TAO_InputCDR (void) +TAO_InputCDR::~TAO_InputCDR () { } diff --git a/TAO/tao/CORBALOC_Parser.inl b/TAO/tao/CORBALOC_Parser.inl index 399a02a53bb..7545b3b3e2b 100644 --- a/TAO/tao/CORBALOC_Parser.inl +++ b/TAO/tao/CORBALOC_Parser.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_CORBALOC_Parser::parsed_endpoint::~parsed_endpoint (void) +TAO_CORBALOC_Parser::parsed_endpoint::~parsed_endpoint () { if (this->profile_ != 0) this->profile_->_decr_refcnt(); diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl index 0dc311aa3c6..89f5e6db715 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl @@ -24,7 +24,7 @@ TAO::CSD::TP_Collocated_Synch_Request::TP_Collocated_Synch_Request ACE_INLINE bool -TAO::CSD::TP_Collocated_Synch_Request::wait(void) +TAO::CSD::TP_Collocated_Synch_Request::wait() { bool dispatched = this->synch_helper_.wait_while_pending(); diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl index 51599163276..3cbc3791ae0 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl @@ -21,7 +21,7 @@ TAO::CSD::TP_Collocated_Synch_With_Server_Request::TP_Collocated_Synch_With_Serv ACE_INLINE bool -TAO::CSD::TP_Collocated_Synch_With_Server_Request::wait(void) +TAO::CSD::TP_Collocated_Synch_With_Server_Request::wait() { return this->synch_helper_.wait_while_pending(); } diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl index b6ed1be9bcd..c89c9dc6128 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl @@ -26,7 +26,7 @@ TAO::CSD::TP_Corba_Request::do_clone() ACE_INLINE void -TAO::CSD::TP_Corba_Request::do_dispatch(void) +TAO::CSD::TP_Corba_Request::do_dispatch() { // Pass 0 for the upcall wrapper. If we have it here, we can change the // upcall wrapper to a reference in the full TAO Core diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl index 385ea47cd30..45af5315cbe 100644 --- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl +++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl @@ -12,7 +12,7 @@ TAO::CSD::TP_Custom_Request_Operation::TP_Custom_Request_Operation ACE_INLINE void -TAO::CSD::TP_Custom_Request_Operation::execute (void) +TAO::CSD::TP_Custom_Request_Operation::execute () { this->execute_i(); } diff --git a/TAO/tao/Codeset_Manager.h b/TAO/tao/Codeset_Manager.h index a5cfb657886..cf7e09a8d87 100644 --- a/TAO/tao/Codeset_Manager.h +++ b/TAO/tao/Codeset_Manager.h @@ -84,8 +84,8 @@ public: virtual void open (TAO_ORB_Core& core) = 0; - virtual TAO_Codeset_Descriptor_Base *char_codeset_descriptor (void) = 0; - virtual TAO_Codeset_Descriptor_Base *wchar_codeset_descriptor (void) = 0; + virtual TAO_Codeset_Descriptor_Base *char_codeset_descriptor () = 0; + virtual TAO_Codeset_Descriptor_Base *wchar_codeset_descriptor () = 0; virtual void get_ncs (CONV_FRAME::CodeSetId &ncsc, CONV_FRAME::CodeSetId &ncsw) = 0; diff --git a/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp b/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp index 241de9ed7c2..7f5cc30d6b1 100644 --- a/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp +++ b/TAO/tao/Compression/bzip2/Bzip2Compressor_Factory.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { -Bzip2_CompressorFactory::Bzip2_CompressorFactory (void) : +Bzip2_CompressorFactory::Bzip2_CompressorFactory () : ::TAO::CompressorFactory (::Compression::COMPRESSORID_BZIP2), compressor_ (::Compression::Compressor::_nil ()) { diff --git a/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp b/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp index 2f03fb2554c..5acf3010b2d 100644 --- a/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp +++ b/TAO/tao/Compression/lzo/LzoCompressor_Factory.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { -Lzo_CompressorFactory::Lzo_CompressorFactory (void) : +Lzo_CompressorFactory::Lzo_CompressorFactory () : ::TAO::CompressorFactory (::Compression::COMPRESSORID_LZO), compressor_ (::Compression::Compressor::_nil ()) { diff --git a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp index 95bd5e40504..41857b7799c 100644 --- a/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp +++ b/TAO/tao/Compression/zlib/ZlibCompressor_Factory.cpp @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { -Zlib_CompressorFactory::Zlib_CompressorFactory (void) : +Zlib_CompressorFactory::Zlib_CompressorFactory () : ::TAO::CompressorFactory (::Compression::COMPRESSORID_ZLIB) { } diff --git a/TAO/tao/Condition.inl b/TAO/tao/Condition.inl index c51494ec098..dc169d494f8 100644 --- a/TAO/tao/Condition.inl +++ b/TAO/tao/Condition.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class MUTEX> ACE_INLINE int -TAO_Condition<MUTEX>::wait (void) +TAO_Condition<MUTEX>::wait () { return this->cond_->wait (); } @@ -27,25 +27,25 @@ TAO_Condition<MUTEX>::wait (const ACE_Time_Value *abstime) } template<class MUTEX> ACE_INLINE int -TAO_Condition<MUTEX>::remove (void) +TAO_Condition<MUTEX>::remove () { return this->cond_->remove (); } template<class MUTEX> ACE_INLINE MUTEX * -TAO_Condition<MUTEX>::mutex (void) +TAO_Condition<MUTEX>::mutex () { return this->mutex_; } template <class MUTEX> ACE_INLINE int -TAO_Condition<MUTEX>::signal (void) +TAO_Condition<MUTEX>::signal () { return this->cond_->signal (); } template <class MUTEX> ACE_INLINE int -TAO_Condition<MUTEX>::broadcast (void) +TAO_Condition<MUTEX>::broadcast () { return this->cond_->broadcast (); } diff --git a/TAO/tao/Connection_Handler.h b/TAO/tao/Connection_Handler.h index bf79e292ab4..ecc2a877c11 100644 --- a/TAO/tao/Connection_Handler.h +++ b/TAO/tao/Connection_Handler.h @@ -80,7 +80,7 @@ public: * @return Return 0 if the connection was already closed, non-zero * otherwise. */ - virtual int close_connection (void) = 0; + virtual int close_connection () = 0; /// The event handler calls, here so that other objects who hold a /// reference to this object can call the event handler methods. diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl index dcdf2eb1e5d..a001bdf90f0 100644 --- a/TAO/tao/Connection_Handler.inl +++ b/TAO/tao/Connection_Handler.inl @@ -5,13 +5,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_ORB_Core * -TAO_Connection_Handler::orb_core (void) +TAO_Connection_Handler::orb_core () { return this->orb_core_; } ACE_INLINE TAO_Transport * -TAO_Connection_Handler::transport (void) +TAO_Connection_Handler::transport () { return this->transport_; } @@ -42,7 +42,7 @@ TAO_Connection_Handler::is_connecting () const } ACE_INLINE void -TAO_Connection_Handler::connection_pending (void) +TAO_Connection_Handler::connection_pending () { if (!this->connection_pending_) { @@ -52,7 +52,7 @@ TAO_Connection_Handler::connection_pending (void) } ACE_INLINE void -TAO_Connection_Handler::cancel_pending_connection (void) +TAO_Connection_Handler::cancel_pending_connection () { if (this->connection_pending_) { diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp index ce049017227..d192e327e5d 100644 --- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp +++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.cpp @@ -229,7 +229,7 @@ TAO_AMH_DSI_Exception_Holder_out::operator TAO_AMH_DSI_Exception_Holder*& () } TAO_AMH_DSI_Exception_Holder *& -TAO_AMH_DSI_Exception_Holder_out::ptr (void) // ptr +TAO_AMH_DSI_Exception_Holder_out::ptr () // ptr { return this->ptr_; } diff --git a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl index 3562b7c9a19..5e900a10bd7 100644 --- a/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl +++ b/TAO/tao/DynamicInterface/AMH_DSI_Response_Handler.inl @@ -27,7 +27,7 @@ TAO_AMH_DSI_Response_Handler::_duplicate (TAO_AMH_DSI_Response_Handler_ptr x) // Inline operations for class TAO_AMH_DSI_Response_Handler_var ACE_INLINE -TAO_AMH_DSI_Response_Handler_var::TAO_AMH_DSI_Response_Handler_var (void) +TAO_AMH_DSI_Response_Handler_var::TAO_AMH_DSI_Response_Handler_var () : ptr_ (TAO_AMH_DSI_Response_Handler::_nil ()) { } @@ -38,7 +38,7 @@ TAO_AMH_DSI_Response_Handler_var::TAO_AMH_DSI_Response_Handler_var (TAO_AMH_DSI_ {} ACE_INLINE -TAO_AMH_DSI_Response_Handler_var::~TAO_AMH_DSI_Response_Handler_var (void) +TAO_AMH_DSI_Response_Handler_var::~TAO_AMH_DSI_Response_Handler_var () { CORBA::release(ptr_); } @@ -98,13 +98,13 @@ TAO_AMH_DSI_Response_Handler_var::in () const } ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr & -TAO_AMH_DSI_Response_Handler_var::inout (void) +TAO_AMH_DSI_Response_Handler_var::inout () { return this->ptr_; } ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr & -TAO_AMH_DSI_Response_Handler_var::out (void) +TAO_AMH_DSI_Response_Handler_var::out () { CORBA::release (this->ptr_); this->ptr_ = TAO_AMH_DSI_Response_Handler::_nil (); @@ -112,7 +112,7 @@ TAO_AMH_DSI_Response_Handler_var::out (void) } ACE_INLINE TAO_AMH_DSI_Response_Handler_ptr -TAO_AMH_DSI_Response_Handler_var::_retn (void) +TAO_AMH_DSI_Response_Handler_var::_retn () { // yield ownership TAO_AMH_DSI_Response_Handler_ptr val = this->ptr_; diff --git a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h index 8d17f479750..d516a6c03a4 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h +++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.h @@ -50,7 +50,7 @@ public: virtual void connection_closed (); /// The following methods are not needed for this class.. - virtual void reply_timed_out (void) {} + virtual void reply_timed_out () {} virtual long schedule_timer (CORBA::ULong , const ACE_Time_Value &) { return 0; diff --git a/TAO/tao/DynamicInterface/DII_Reply_Handler.inl b/TAO/tao/DynamicInterface/DII_Reply_Handler.inl index 736cd4372d5..5fb4984b60e 100644 --- a/TAO/tao/DynamicInterface/DII_Reply_Handler.inl +++ b/TAO/tao/DynamicInterface/DII_Reply_Handler.inl @@ -14,7 +14,7 @@ TAO_DII_Reply_Handler::_duplicate (TAO_DII_Reply_Handler_ptr x) // Inline operations for class TAO_DII_Reply_Handler_var ACE_INLINE -TAO_DII_Reply_Handler_var::TAO_DII_Reply_Handler_var (void) +TAO_DII_Reply_Handler_var::TAO_DII_Reply_Handler_var () : ptr_ (TAO_DII_Reply_Handler::_nil ()) { } @@ -26,7 +26,7 @@ TAO_DII_Reply_Handler_var::TAO_DII_Reply_Handler_var ( {} ACE_INLINE -TAO_DII_Reply_Handler_var::~TAO_DII_Reply_Handler_var (void) +TAO_DII_Reply_Handler_var::~TAO_DII_Reply_Handler_var () { CORBA::release (this->ptr_); } @@ -87,13 +87,13 @@ TAO_DII_Reply_Handler_var::in () const } ACE_INLINE TAO_DII_Reply_Handler_ptr & -TAO_DII_Reply_Handler_var::inout (void) +TAO_DII_Reply_Handler_var::inout () { return this->ptr_; } ACE_INLINE TAO_DII_Reply_Handler_ptr & -TAO_DII_Reply_Handler_var::out (void) +TAO_DII_Reply_Handler_var::out () { CORBA::release (this->ptr_); this->ptr_ = TAO_DII_Reply_Handler::_nil (); @@ -101,7 +101,7 @@ TAO_DII_Reply_Handler_var::out (void) } ACE_INLINE TAO_DII_Reply_Handler_ptr -TAO_DII_Reply_Handler_var::_retn (void) +TAO_DII_Reply_Handler_var::_retn () { // yield ownership TAO_DII_Reply_Handler_ptr val = this->ptr_; diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl index 2a1c368d58b..5d9e7136aea 100644 --- a/TAO/tao/DynamicInterface/Request.inl +++ b/TAO/tao/DynamicInterface/Request.inl @@ -33,35 +33,35 @@ CORBA::Request::operation () const // Return the arguments for the request. ACE_INLINE CORBA::NVList_ptr -CORBA::Request::arguments (void) +CORBA::Request::arguments () { return this->args_; } // Return the result for the request. ACE_INLINE CORBA::NamedValue_ptr -CORBA::Request::result (void) +CORBA::Request::result () { return this->result_; } // Return the exceptions resulting from this request. ACE_INLINE CORBA::ExceptionList_ptr -CORBA::Request::exceptions (void) +CORBA::Request::exceptions () { return this->exceptions_.in (); } // Return the request's contexts ACE_INLINE CORBA::ContextList_ptr -CORBA::Request::contexts (void) +CORBA::Request::contexts () { return this->contexts_; } // The argument manipulation helper functions ACE_INLINE CORBA::Any & -CORBA::Request::add_in_arg (void) +CORBA::Request::add_in_arg () { return this->args_->add_element (CORBA::ARG_IN)->any_; } @@ -73,7 +73,7 @@ CORBA::Request::add_in_arg (const CORBA::Char *name) } ACE_INLINE CORBA::Any & -CORBA::Request::add_inout_arg (void) +CORBA::Request::add_inout_arg () { return this->args_->add_element (CORBA::ARG_INOUT)->any_; } @@ -85,7 +85,7 @@ CORBA::Request::add_inout_arg (const CORBA::Char *name) } ACE_INLINE CORBA::Any & -CORBA::Request::add_out_arg (void) +CORBA::Request::add_out_arg () { return this->args_->add_element (CORBA::ARG_OUT)->any_; } @@ -147,13 +147,13 @@ CORBA::Request::raw_user_exception (TAO_InputCDR &cdr) } ACE_INLINE ACE_CString & -CORBA::Request::raw_user_exception (void) +CORBA::Request::raw_user_exception () { return this->raw_user_exception_; } ACE_INLINE CORBA::Boolean -CORBA::Request::response_received (void) +CORBA::Request::response_received () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, diff --git a/TAO/tao/DynamicInterface/Server_Request.inl b/TAO/tao/DynamicInterface/Server_Request.inl index 13efdb7d4fb..25bd3df8d45 100644 --- a/TAO/tao/DynamicInterface/Server_Request.inl +++ b/TAO/tao/DynamicInterface/Server_Request.inl @@ -55,7 +55,7 @@ CORBA::ServerRequest::_tao_reply_byte_order (int byte_order) } ACE_INLINE TAO_ServerRequest & -CORBA::ServerRequest::_tao_server_request (void) +CORBA::ServerRequest::_tao_server_request () { return this->orb_server_request_; } diff --git a/TAO/tao/ETCL/TAO_ETCL_Constraint.inl b/TAO/tao/ETCL/TAO_ETCL_Constraint.inl index f12a2537209..54b0390fb81 100644 --- a/TAO/tao/ETCL/TAO_ETCL_Constraint.inl +++ b/TAO/tao/ETCL/TAO_ETCL_Constraint.inl @@ -2,7 +2,7 @@ // **************************************************************** ACE_INLINE -TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint (void) +TAO_ETCL_Literal_Constraint::TAO_ETCL_Literal_Constraint () : any_ (0) { } diff --git a/TAO/tao/Endpoint.h b/TAO/tao/Endpoint.h index 8119ff6643b..cd93ab8f352 100644 --- a/TAO/tao/Endpoint.h +++ b/TAO/tao/Endpoint.h @@ -76,7 +76,7 @@ public: /** * @return The next endpoint in the list, if any. */ - virtual TAO_Endpoint *next (void) = 0; + virtual TAO_Endpoint *next () = 0; /** * Return the next endpoint in the list, but use protocol-specific diff --git a/TAO/tao/Fault_Tolerance_Service.inl b/TAO/tao/Fault_Tolerance_Service.inl index ef19160391b..832bf39de0d 100644 --- a/TAO/tao/Fault_Tolerance_Service.inl +++ b/TAO/tao/Fault_Tolerance_Service.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Service_Callbacks * -TAO_Fault_Tolerance_Service::service_callback (void) +TAO_Fault_Tolerance_Service::service_callback () { return this->ft_service_callback_; } diff --git a/TAO/tao/Fixed_Array_Argument_T.inl b/TAO/tao/Fixed_Array_Argument_T.inl index 9f7ac53d101..c6afd417205 100644 --- a/TAO/tao/Fixed_Array_Argument_T.inl +++ b/TAO/tao/Fixed_Array_Argument_T.inl @@ -44,7 +44,7 @@ template<typename S_forany, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type * -TAO::Inout_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg (void) +TAO::Inout_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg () { return this->x_.inout (); } @@ -65,7 +65,7 @@ template<typename S_forany, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type *& -TAO::Out_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg (void) +TAO::Out_Fixed_Array_Argument_T<S_forany,Insert_Policy>::arg () { return this->x_.out (); } @@ -77,7 +77,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>:: -Ret_Fixed_Array_Argument_T (void) +Ret_Fixed_Array_Argument_T () {} template<typename S_var, @@ -85,7 +85,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type *& -TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::arg (void) +TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::arg () { return this->x_._retn_arg (); } @@ -95,7 +95,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type * -TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::excp (void) +TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::excp () { return this->x_.ptr (); } @@ -105,7 +105,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type * -TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::retn (void) +TAO::Ret_Fixed_Array_Argument_T<S_var,S_forany,Insert_Policy>::retn () { return this->x_._retn (); } diff --git a/TAO/tao/Fixed_Size_Argument_T.inl b/TAO/tao/Fixed_Size_Argument_T.inl index 09a8bd2d4c6..e1d79d3bbce 100644 --- a/TAO/tao/Fixed_Size_Argument_T.inl +++ b/TAO/tao/Fixed_Size_Argument_T.inl @@ -42,7 +42,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void) +TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::arg () { return *this->x_; } @@ -62,7 +62,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void) +TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -73,7 +73,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>:: -Ret_Fixed_Size_Argument_T (void) +Ret_Fixed_Size_Argument_T () { } @@ -81,7 +81,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void) +TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -90,7 +90,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::excp (void) +TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::excp () { return this->x_; } @@ -99,7 +99,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::retn (void) +TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::retn () { return this->x_; } diff --git a/TAO/tao/GIOP_Message_Locate_Header.inl b/TAO/tao/GIOP_Message_Locate_Header.inl index 4d38b855e10..b32a26cda9b 100644 --- a/TAO/tao/GIOP_Message_Locate_Header.inl +++ b/TAO/tao/GIOP_Message_Locate_Header.inl @@ -31,19 +31,19 @@ TAO_GIOP_Locate_Request_Header::object_key () const } ACE_INLINE TAO::ObjectKey & -TAO_GIOP_Locate_Request_Header::object_key (void) +TAO_GIOP_Locate_Request_Header::object_key () { return this->profile_.object_key (); } ACE_INLINE TAO_Tagged_Profile & -TAO_GIOP_Locate_Request_Header::profile (void) +TAO_GIOP_Locate_Request_Header::profile () { return this->profile_; } ACE_INLINE TAO_InputCDR & -TAO_GIOP_Locate_Request_Header::incoming_stream (void) +TAO_GIOP_Locate_Request_Header::incoming_stream () { return *this->incoming_; } diff --git a/TAO/tao/GUIResource_Factory.h b/TAO/tao/GUIResource_Factory.h index efdba8c1a79..2add83bc660 100644 --- a/TAO/tao/GUIResource_Factory.h +++ b/TAO/tao/GUIResource_Factory.h @@ -54,7 +54,7 @@ namespace TAO * Please note that this call is NOT synchronized. Left to the * higher level versions to synchronize access. */ - virtual ACE_Reactor *get_reactor (void) ; + virtual ACE_Reactor *get_reactor () ; /** * Reclaim the reactor if allocated by this factory. @@ -69,7 +69,7 @@ namespace TAO * Please note that this call is NOT synchronized. Left to the * get_reactor() to synchronize access. */ - virtual ACE_Reactor_Impl *reactor_impl (void) = 0; + virtual ACE_Reactor_Impl *reactor_impl () = 0; private: /** diff --git a/TAO/tao/IIOP_Acceptor.inl b/TAO/tao/IIOP_Acceptor.inl index b5ca077b2aa..2b9ce3418e7 100644 --- a/TAO/tao/IIOP_Acceptor.inl +++ b/TAO/tao/IIOP_Acceptor.inl @@ -17,7 +17,7 @@ TAO_IIOP_Acceptor::address () const } ACE_INLINE const ACE_INET_Addr * -TAO_IIOP_Acceptor::endpoints (void) +TAO_IIOP_Acceptor::endpoints () { ACE_ASSERT (this->addrs_ != 0); diff --git a/TAO/tao/IORInterceptor/IORInfo.inl b/TAO/tao/IORInterceptor/IORInfo.inl index 645750acf18..2a8ad1ac007 100644 --- a/TAO/tao/IORInterceptor/IORInfo.inl +++ b/TAO/tao/IORInterceptor/IORInfo.inl @@ -3,13 +3,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void -TAO_IORInfo::invalidate (void) +TAO_IORInfo::invalidate () { this->poa_ = 0; } ACE_INLINE void -TAO_IORInfo::components_established (void) +TAO_IORInfo::components_established () { this->components_established_ = true; } diff --git a/TAO/tao/IORInterceptor_Adapter_Factory.h b/TAO/tao/IORInterceptor_Adapter_Factory.h index 2ad58f50390..c963caeda4e 100644 --- a/TAO/tao/IORInterceptor_Adapter_Factory.h +++ b/TAO/tao/IORInterceptor_Adapter_Factory.h @@ -41,7 +41,7 @@ class TAO_Export TAO_IORInterceptor_Adapter_Factory public: virtual ~TAO_IORInterceptor_Adapter_Factory (); - virtual TAO_IORInterceptor_Adapter * create (void) = 0; + virtual TAO_IORInterceptor_Adapter * create () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/IORTable/Async_IOR_Table_Impl.h b/TAO/tao/IORTable/Async_IOR_Table_Impl.h index 4f57a752bdd..e5ce2e137a6 100644 --- a/TAO/tao/IORTable/Async_IOR_Table_Impl.h +++ b/TAO/tao/IORTable/Async_IOR_Table_Impl.h @@ -41,7 +41,7 @@ public: TAO_Async_IOR_Table_Impl (); virtual ~TAO_Async_IOR_Table_Impl (); - virtual bool async_available (void) { return true; } + virtual bool async_available () { return true; } virtual void async_find (::IORTable::Locate_ResponseHandler rh, const char *object_key); diff --git a/TAO/tao/IORTable/Locate_ResponseHandler.inl b/TAO/tao/IORTable/Locate_ResponseHandler.inl index 0049174c13a..129c89310ba 100644 --- a/TAO/tao/IORTable/Locate_ResponseHandler.inl +++ b/TAO/tao/IORTable/Locate_ResponseHandler.inl @@ -15,7 +15,7 @@ TAO_AMH_Locate_ResponseHandler::_duplicate (TAO_AMH_Locate_ResponseHandler_ptr x // Inline operations for class TAO_AMH_Locate_ResponseHandler_var ACE_INLINE -TAO_AMH_Locate_ResponseHandler_var::TAO_AMH_Locate_ResponseHandler_var (void) +TAO_AMH_Locate_ResponseHandler_var::TAO_AMH_Locate_ResponseHandler_var () : ptr_ (TAO_AMH_Locate_ResponseHandler::_nil ()) { } @@ -26,7 +26,7 @@ TAO_AMH_Locate_ResponseHandler_var::TAO_AMH_Locate_ResponseHandler_var (TAO_AMH_ {} ACE_INLINE -TAO_AMH_Locate_ResponseHandler_var::~TAO_AMH_Locate_ResponseHandler_var (void) +TAO_AMH_Locate_ResponseHandler_var::~TAO_AMH_Locate_ResponseHandler_var () { CORBA::release(ptr_); } @@ -86,13 +86,13 @@ TAO_AMH_Locate_ResponseHandler_var::in () const } ACE_INLINE TAO_AMH_Locate_ResponseHandler_ptr & -TAO_AMH_Locate_ResponseHandler_var::inout (void) +TAO_AMH_Locate_ResponseHandler_var::inout () { return this->ptr_; } ACE_INLINE TAO_AMH_Locate_ResponseHandler_ptr & -TAO_AMH_Locate_ResponseHandler_var::out (void) +TAO_AMH_Locate_ResponseHandler_var::out () { CORBA::release (this->ptr_); this->ptr_ = TAO_AMH_Locate_ResponseHandler::_nil (); @@ -100,7 +100,7 @@ TAO_AMH_Locate_ResponseHandler_var::out (void) } ACE_INLINE TAO_AMH_Locate_ResponseHandler_ptr -TAO_AMH_Locate_ResponseHandler_var::_retn (void) +TAO_AMH_Locate_ResponseHandler_var::_retn () { // yield ownership TAO_AMH_Locate_ResponseHandler_ptr val = this->ptr_; diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.inl b/TAO/tao/Intrusive_Ref_Count_Base_T.inl index 336e713d1d7..bf378bd9a0e 100644 --- a/TAO/tao/Intrusive_Ref_Count_Base_T.inl +++ b/TAO/tao/Intrusive_Ref_Count_Base_T.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename T> ACE_INLINE -TAO_Intrusive_Ref_Count_Base<T>::TAO_Intrusive_Ref_Count_Base (void) +TAO_Intrusive_Ref_Count_Base<T>::TAO_Intrusive_Ref_Count_Base () : refcount_(1) {} @@ -11,7 +11,7 @@ TAO_Intrusive_Ref_Count_Base<T>::TAO_Intrusive_Ref_Count_Base (void) template <typename T> ACE_INLINE void -TAO_Intrusive_Ref_Count_Base<T>::_add_ref (void) +TAO_Intrusive_Ref_Count_Base<T>::_add_ref () { ++this->refcount_; } @@ -20,7 +20,7 @@ TAO_Intrusive_Ref_Count_Base<T>::_add_ref (void) template <typename T> ACE_INLINE void -TAO_Intrusive_Ref_Count_Base<T>::_remove_ref (void) +TAO_Intrusive_Ref_Count_Base<T>::_remove_ref () { CORBA::ULong const new_count = --this->refcount_; diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.inl b/TAO/tao/Intrusive_Ref_Count_Handle_T.inl index c06193db780..ef37073a8b2 100644 --- a/TAO/tao/Intrusive_Ref_Count_Handle_T.inl +++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename T> ACE_INLINE -TAO_Intrusive_Ref_Count_Handle<T>::TAO_Intrusive_Ref_Count_Handle (void) +TAO_Intrusive_Ref_Count_Handle<T>::TAO_Intrusive_Ref_Count_Handle () : ptr_(0) { } diff --git a/TAO/tao/Intrusive_Ref_Count_Object_T.inl b/TAO/tao/Intrusive_Ref_Count_Object_T.inl index 818e51e2faa..6f5705d854f 100644 --- a/TAO/tao/Intrusive_Ref_Count_Object_T.inl +++ b/TAO/tao/Intrusive_Ref_Count_Object_T.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename OBJ, typename ACE_LOCK> ACE_INLINE -TAO_Intrusive_Ref_Count_Object<OBJ,ACE_LOCK>::TAO_Intrusive_Ref_Count_Object (void) +TAO_Intrusive_Ref_Count_Object<OBJ,ACE_LOCK>::TAO_Intrusive_Ref_Count_Object () {} template <typename OBJ, typename ACE_LOCK> diff --git a/TAO/tao/Invocation_Base.inl b/TAO/tao/Invocation_Base.inl index 17e2988230e..b60e6fc44d1 100644 --- a/TAO/tao/Invocation_Base.inl +++ b/TAO/tao/Invocation_Base.inl @@ -17,13 +17,13 @@ namespace TAO } ACE_INLINE CORBA::Object_ptr - Invocation_Base::forwarded_reference (void) + Invocation_Base::forwarded_reference () { return CORBA::Object::_duplicate (this->forwarded_to_.in ()); } ACE_INLINE CORBA::Object_ptr - Invocation_Base::steal_forwarded_reference (void) + Invocation_Base::steal_forwarded_reference () { this->reply_status_ = GIOP::NO_EXCEPTION; return this->forwarded_to_._retn (); @@ -60,20 +60,20 @@ namespace TAO } ACE_INLINE TAO_Operation_Details & - Invocation_Base::operation_details (void) + Invocation_Base::operation_details () { return this->details_; } #if TAO_HAS_INTERCEPTORS == 1 ACE_INLINE size_t & - Invocation_Base::stack_size (void) + Invocation_Base::stack_size () { return this->stack_size_; } ACE_INLINE CORBA::Exception * - Invocation_Base::caught_exception (void) + Invocation_Base::caught_exception () { return this->caught_exception_; } diff --git a/TAO/tao/LF_Event_Loop_Thread_Helper.inl b/TAO/tao/LF_Event_Loop_Thread_Helper.inl index 57ca9424aca..877dd2526cf 100644 --- a/TAO/tao/LF_Event_Loop_Thread_Helper.inl +++ b/TAO/tao/LF_Event_Loop_Thread_Helper.inl @@ -14,7 +14,7 @@ TAO_LF_Event_Loop_Thread_Helper::TAO_LF_Event_Loop_Thread_Helper ( } ACE_INLINE -TAO_LF_Event_Loop_Thread_Helper::~TAO_LF_Event_Loop_Thread_Helper (void) +TAO_LF_Event_Loop_Thread_Helper::~TAO_LF_Event_Loop_Thread_Helper () { int const call_reset = (this->event_loop_return_ == 0); this->lf_strategy_.reset_event_loop_thread (call_reset, diff --git a/TAO/tao/LF_Follower.inl b/TAO/tao/LF_Follower.inl index 907a90ebea0..d96c60fe1a3 100644 --- a/TAO/tao/LF_Follower.inl +++ b/TAO/tao/LF_Follower.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Leader_Follower & -TAO_LF_Follower::leader_follower (void) +TAO_LF_Follower::leader_follower () { return this->leader_follower_; } diff --git a/TAO/tao/LF_Follower_Auto_Ptr.inl b/TAO/tao/LF_Follower_Auto_Ptr.inl index 06586ae2fa0..bd91b66420f 100644 --- a/TAO/tao/LF_Follower_Auto_Ptr.inl +++ b/TAO/tao/LF_Follower_Auto_Ptr.inl @@ -9,19 +9,19 @@ TAO_LF_Follower_Auto_Ptr::TAO_LF_Follower_Auto_Ptr (TAO_Leader_Follower &lf) } ACE_INLINE TAO_LF_Follower * -TAO_LF_Follower_Auto_Ptr::get (void) +TAO_LF_Follower_Auto_Ptr::get () { return this->follower_; } ACE_INLINE TAO_LF_Follower * -TAO_LF_Follower_Auto_Ptr::operator-> (void) +TAO_LF_Follower_Auto_Ptr::operator-> () { return this->follower_; } ACE_INLINE -TAO_LF_Follower_Auto_Ptr::operator TAO_LF_Follower * (void) +TAO_LF_Follower_Auto_Ptr::operator TAO_LF_Follower * () { return this->follower_; } diff --git a/TAO/tao/Leader_Follower.h b/TAO/tao/Leader_Follower.h index 02586bbac00..e7555173d32 100644 --- a/TAO/tao/Leader_Follower.h +++ b/TAO/tao/Leader_Follower.h @@ -96,11 +96,11 @@ public: /// The current thread has become the leader thread in the /// client side leader-follower set. - void set_client_leader_thread (void) ; + void set_client_leader_thread (); /// The current thread is no longer the leader thread in the client /// side leader-follower set. - void reset_client_leader_thread (void) ; + void reset_client_leader_thread (); /// Sets the thread ID of the leader thread in the leader-follower /// model diff --git a/TAO/tao/Leader_Follower.inl b/TAO/tao/Leader_Follower.inl index c49cb5d2bb4..104bd0a5fa0 100644 --- a/TAO/tao/Leader_Follower.inl +++ b/TAO/tao/Leader_Follower.inl @@ -29,7 +29,7 @@ TAO_Leader_Follower::get_tss_resources () const } ACE_INLINE void -TAO_Leader_Follower::set_avoid_client_leader (void) +TAO_Leader_Follower::set_avoid_client_leader () { this->avoid_client_leader_ = true; } @@ -41,7 +41,7 @@ TAO_Leader_Follower::follower_available () const } ACE_INLINE bool -TAO_Leader_Follower::no_leaders_available (void) +TAO_Leader_Follower::no_leaders_available () { if (this->new_leader_generator_) return this->new_leader_generator_->no_leaders_available (); @@ -49,7 +49,7 @@ TAO_Leader_Follower::no_leaders_available (void) } ACE_INLINE int -TAO_Leader_Follower::elect_new_leader (void) +TAO_Leader_Follower::elect_new_leader () { if (this->leaders_ == 0) { @@ -119,7 +119,7 @@ TAO_Leader_Follower::reset_event_loop_thread_i (TAO_ORB_Core_TSS_Resources *tss) } ACE_INLINE void -TAO_Leader_Follower::reset_event_loop_thread (void) +TAO_Leader_Follower::reset_event_loop_thread () { TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources (); if (tss->event_loop_thread_ > 0) @@ -127,13 +127,13 @@ TAO_Leader_Follower::reset_event_loop_thread (void) } ACE_INLINE TAO_SYNCH_MUTEX & -TAO_Leader_Follower::lock (void) +TAO_Leader_Follower::lock () { return this->lock_; } ACE_INLINE void -TAO_Leader_Follower::set_upcall_thread (void) +TAO_Leader_Follower::set_upcall_thread () { TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources (); @@ -164,7 +164,7 @@ TAO_Leader_Follower::leader_available () const } ACE_INLINE void -TAO_Leader_Follower::set_client_leader_thread (void) +TAO_Leader_Follower::set_client_leader_thread () { TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources (); ++this->leaders_; @@ -173,7 +173,7 @@ TAO_Leader_Follower::set_client_leader_thread (void) } ACE_INLINE void -TAO_Leader_Follower::reset_client_leader_thread (void) +TAO_Leader_Follower::reset_client_leader_thread () { TAO_ORB_Core_TSS_Resources *tss = this->get_tss_resources (); // We may be called twice when we gave up leadership from @@ -207,7 +207,7 @@ TAO_Leader_Follower::remove_follower (TAO_LF_Follower *follower) } ACE_INLINE ACE_Reverse_Lock<TAO_SYNCH_MUTEX> & -TAO_Leader_Follower::reverse_lock (void) +TAO_Leader_Follower::reverse_lock () { return this->reverse_lock_; } @@ -234,7 +234,7 @@ TAO_LF_Client_Thread_Helper::TAO_LF_Client_Thread_Helper (TAO_Leader_Follower &l } ACE_INLINE -TAO_LF_Client_Thread_Helper::~TAO_LF_Client_Thread_Helper (void) +TAO_LF_Client_Thread_Helper::~TAO_LF_Client_Thread_Helper () { this->leader_follower_.reset_client_thread (); } @@ -247,7 +247,7 @@ TAO_LF_Client_Leader_Thread_Helper::TAO_LF_Client_Leader_Thread_Helper (TAO_Lead } ACE_INLINE -TAO_LF_Client_Leader_Thread_Helper::~TAO_LF_Client_Leader_Thread_Helper (void) +TAO_LF_Client_Leader_Thread_Helper::~TAO_LF_Client_Leader_Thread_Helper () { this->leader_follower_.reset_client_leader_thread (); } diff --git a/TAO/tao/LocalObject.inl b/TAO/tao/LocalObject.inl index 7d2715b166e..63da214f852 100644 --- a/TAO/tao/LocalObject.inl +++ b/TAO/tao/LocalObject.inl @@ -34,7 +34,7 @@ CORBA::LocalObject::_narrow (CORBA::Object_ptr obj) } ACE_INLINE -CORBA::LocalObject::LocalObject (void) +CORBA::LocalObject::LocalObject () : Object (0) { } diff --git a/TAO/tao/MCAST_Parser.inl b/TAO/tao/MCAST_Parser.inl index db49f4704a8..deb0827869c 100644 --- a/TAO/tao/MCAST_Parser.inl +++ b/TAO/tao/MCAST_Parser.inl @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_MCAST_Parser::TAO_MCAST_Parser (void) +TAO_MCAST_Parser::TAO_MCAST_Parser () : mcast_address_ () , mcast_port_ (TAO_DEFAULT_NAME_SERVER_REQUEST_PORT) , mcast_nic_ () diff --git a/TAO/tao/MProfile.inl b/TAO/tao/MProfile.inl index 83707de5eef..985b10ab1b3 100644 --- a/TAO/tao/MProfile.inl +++ b/TAO/tao/MProfile.inl @@ -39,7 +39,7 @@ TAO_MProfile::operator= (const TAO_MProfile& rhs) /// Cyclic get next. It will simply cycle through the complete list. ACE_INLINE TAO_Profile * -TAO_MProfile::get_cnext (void) +TAO_MProfile::get_cnext () { if (last_ == 0) return 0; @@ -53,7 +53,7 @@ TAO_MProfile::get_cnext (void) /// This will return the next element until either null is found or the /// end of list. It then continues to return NULL until rewind. ACE_INLINE TAO_Profile * -TAO_MProfile::get_next (void) +TAO_MProfile::get_next () { // Nolist or EndOfList if (last_ == 0 || current_ == last_) @@ -63,7 +63,7 @@ TAO_MProfile::get_next (void) } ACE_INLINE TAO_Profile * -TAO_MProfile::get_cprev (void) +TAO_MProfile::get_cprev () { if (last_ == 0) return 0; @@ -78,7 +78,7 @@ TAO_MProfile::get_cprev (void) } ACE_INLINE TAO_Profile * -TAO_MProfile::get_prev (void) +TAO_MProfile::get_prev () { if (last_ == 0 || current_ <= 1) // No List of BeginningOfList @@ -100,7 +100,7 @@ TAO_MProfile::get_profile (TAO_PHandle handle) } ACE_INLINE TAO_Profile * -TAO_MProfile::get_current_profile (void) +TAO_MProfile::get_current_profile () { if (last_ == 0) return 0; @@ -112,7 +112,7 @@ TAO_MProfile::get_current_profile (void) } ACE_INLINE TAO_PHandle -TAO_MProfile::get_current_handle (void) +TAO_MProfile::get_current_handle () { if (current_ > 0) return current_ - 1; @@ -130,7 +130,7 @@ TAO_MProfile::get_current_handle () const } ACE_INLINE void -TAO_MProfile::rewind (void) +TAO_MProfile::rewind () { current_ = 0; } @@ -158,7 +158,7 @@ TAO_MProfile::forward_from (TAO_MProfile *from) ACE_INLINE TAO_MProfile * -TAO_MProfile::forward_from (void) +TAO_MProfile::forward_from () { return this->forward_from_; } diff --git a/TAO/tao/New_Leader_Generator.h b/TAO/tao/New_Leader_Generator.h index 13e11e15785..e77d57587aa 100644 --- a/TAO/tao/New_Leader_Generator.h +++ b/TAO/tao/New_Leader_Generator.h @@ -38,7 +38,7 @@ public: /// Leader/Follower class uses this method to notify the system that /// we are out of leaders. - virtual bool no_leaders_available (void) = 0; + virtual bool no_leaders_available () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Null_Fragmentation_Strategy.h b/TAO/tao/Null_Fragmentation_Strategy.h index fa8fb0c5beb..820187de548 100644 --- a/TAO/tao/Null_Fragmentation_Strategy.h +++ b/TAO/tao/Null_Fragmentation_Strategy.h @@ -40,7 +40,7 @@ class TAO_Null_Fragmentation_Strategy : public TAO_GIOP_Fragmentation_Strategy { public: - TAO_Null_Fragmentation_Strategy (void) {} + TAO_Null_Fragmentation_Strategy () {} virtual ~TAO_Null_Fragmentation_Strategy (); virtual int fragment (TAO_OutputCDR &, ACE_CDR::ULong, ACE_CDR::ULong); diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 81e5633180d..07bc49d43dd 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -95,7 +95,7 @@ namespace CORBA typedef CORBA::ULong PolicyType; - // TODO - implement OMG's 'ORBid CORBA::ORB::id (void)'. + // TODO - implement OMG's 'ORBid CORBA::ORB::id ()'. typedef TAO_VarSeq_Var_T< diff --git a/TAO/tao/ORB.inl b/TAO/tao/ORB.inl index e66f3a52033..3d52dce87ab 100644 --- a/TAO/tao/ORB.inl +++ b/TAO/tao/ORB.inl @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // --------------------------------------------------------------------------- ACE_INLINE ACE_Time_Value * -CORBA::ORB::get_timeout (void) +CORBA::ORB::get_timeout () { return this->timeout_; } @@ -68,7 +68,7 @@ CORBA::ORB::_use_omg_ior_format (CORBA::Boolean ior) } ACE_INLINE CORBA::Boolean -CORBA::ORB::_use_omg_ior_format (void) +CORBA::ORB::_use_omg_ior_format () { return this->use_omg_ior_format_; } diff --git a/TAO/tao/ORB_Core.inl b/TAO/tao/ORB_Core.inl index 2b2091241ac..acf22b2eb44 100644 --- a/TAO/tao/ORB_Core.inl +++ b/TAO/tao/ORB_Core.inl @@ -11,7 +11,7 @@ TAO_ORB_Core::configuration () const } ACE_INLINE unsigned long -TAO_ORB_Core::_incr_refcnt (void) +TAO_ORB_Core::_incr_refcnt () { return this->refcount_++; } @@ -23,7 +23,7 @@ TAO_ORB_Core::_refcnt () const } ACE_INLINE unsigned long -TAO_ORB_Core::_decr_refcnt (void) +TAO_ORB_Core::_decr_refcnt () { unsigned long const count = --this->refcount_; if (count != 0) @@ -34,7 +34,7 @@ TAO_ORB_Core::_decr_refcnt (void) } ACE_INLINE ACE_Lock * -TAO_ORB_Core::locking_strategy (void) +TAO_ORB_Core::locking_strategy () { if (this->resource_factory ()->use_locked_data_blocks ()) return &this->data_block_lock_; @@ -43,7 +43,7 @@ TAO_ORB_Core::locking_strategy (void) } ACE_INLINE CORBA::Boolean -TAO_ORB_Core::bidir_giop_policy (void) +TAO_ORB_Core::bidir_giop_policy () { return this->bidir_giop_policy_; } @@ -55,31 +55,31 @@ TAO_ORB_Core::bidir_giop_policy (CORBA::Boolean val) } ACE_INLINE TAO_Object_Ref_Table & -TAO_ORB_Core::object_ref_table (void) +TAO_ORB_Core::object_ref_table () { return this->object_ref_table_; } ACE_INLINE TAO::ObjectKey_Table & -TAO_ORB_Core::object_key_table (void) +TAO_ORB_Core::object_key_table () { return this->object_key_table_; } ACE_INLINE TAO_Flushing_Strategy * -TAO_ORB_Core::flushing_strategy (void) +TAO_ORB_Core::flushing_strategy () { return this->flushing_strategy_; } ACE_INLINE TAO_Protocols_Hooks * -TAO_ORB_Core::get_protocols_hooks (void) +TAO_ORB_Core::get_protocols_hooks () { return this->protocols_hooks_; } ACE_INLINE TAO_Network_Priority_Protocols_Hooks * -TAO_ORB_Core::get_network_priority_protocols_hooks (void) +TAO_ORB_Core::get_network_priority_protocols_hooks () { return this->network_priority_protocols_hooks_; } @@ -142,43 +142,43 @@ TAO_ORB_Core::hash_service (TAO_Profile *p, CORBA::ULong m) } ACE_INLINE TAO_Fault_Tolerance_Service & -TAO_ORB_Core::fault_tolerance_service (void) +TAO_ORB_Core::fault_tolerance_service () { return this->ft_service_; } ACE_INLINE CORBA::Boolean -TAO_ORB_Core::ft_send_extended_sc (void) +TAO_ORB_Core::ft_send_extended_sc () { return this->ft_send_extended_sc_; } ACE_INLINE ACE_Thread_Manager * -TAO_ORB_Core::thr_mgr (void) +TAO_ORB_Core::thr_mgr () { return &this->tm_; } ACE_INLINE CORBA::ORB_ptr -TAO_ORB_Core::orb (void) +TAO_ORB_Core::orb () { return this->orb_; } ACE_INLINE TAO_Adapter_Registry & -TAO_ORB_Core::adapter_registry (void) +TAO_ORB_Core::adapter_registry () { return this->adapter_registry_; } ACE_INLINE TAO_Request_Dispatcher * -TAO_ORB_Core::request_dispatcher (void) +TAO_ORB_Core::request_dispatcher () { return this->request_dispatcher_; } ACE_INLINE TAO_ORB_Core::InitRefMap * -TAO_ORB_Core::init_ref_map (void) +TAO_ORB_Core::init_ref_map () { return &this->init_ref_map_; } @@ -228,7 +228,7 @@ TAO_ORB_Core::get_collocation_strategy () const } ACE_INLINE TAO_ORB_Parameters * -TAO_ORB_Core::orb_params(void) +TAO_ORB_Core::orb_params() { return &(this->orb_params_); } @@ -239,13 +239,13 @@ TAO_ORB_Core::orb_params(void) : (this->member##_)) ACE_INLINE TAO_ProtocolFactorySet * -TAO_ORB_Core::protocol_factories (void) +TAO_ORB_Core::protocol_factories () { return TAO_OC_RETRIEVE (protocol_factories); } ACE_INLINE TAO_Parser_Registry * -TAO_ORB_Core::parser_registry (void) +TAO_ORB_Core::parser_registry () { return &this->parser_registry_; } @@ -255,7 +255,7 @@ TAO_ORB_Core::parser_registry (void) #if (TAO_HAS_CORBA_MESSAGING == 1) ACE_INLINE TAO_Policy_Manager * -TAO_ORB_Core::policy_manager (void) +TAO_ORB_Core::policy_manager () { return this->policy_manager_; } @@ -263,7 +263,7 @@ TAO_ORB_Core::policy_manager (void) #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ ACE_INLINE TAO_ORB_Core_TSS_Resources* -TAO_ORB_Core::get_tss_resources (void) +TAO_ORB_Core::get_tss_resources () { return ACE_TSS_GET (&this->tss_resources_,TAO_ORB_Core_TSS_Resources); } @@ -353,19 +353,19 @@ TAO_ORB_Core::implrepo_service (const CORBA::Object_ptr ir) } ACE_INLINE CORBA::Boolean -TAO_ORB_Core::use_implrepo (void) +TAO_ORB_Core::use_implrepo () { return use_implrepo_; } ACE_INLINE CORBA::Boolean -TAO_ORB_Core::imr_endpoints_in_ior (void) +TAO_ORB_Core::imr_endpoints_in_ior () { return imr_endpoints_in_ior_; } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_typecodefactory (void) +TAO_ORB_Core::resolve_typecodefactory () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -379,7 +379,7 @@ TAO_ORB_Core::resolve_typecodefactory (void) #if TAO_HAS_INTERCEPTORS == 1 ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_picurrent (void) +TAO_ORB_Core::resolve_picurrent () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -393,7 +393,7 @@ TAO_ORB_Core::resolve_picurrent (void) #endif /* TAO_HAS_INTERCEPTORS == 1 */ ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_codecfactory (void) +TAO_ORB_Core::resolve_codecfactory () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -405,7 +405,7 @@ TAO_ORB_Core::resolve_codecfactory (void) } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_compression_manager (void) +TAO_ORB_Core::resolve_compression_manager () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -464,7 +464,7 @@ TAO_ORB_Core::orbinitializer_registry () } ACE_INLINE TAO_Service_Context_Registry & -TAO_ORB_Core::service_context_registry (void) +TAO_ORB_Core::service_context_registry () { return this->service_context_registry_; } @@ -482,7 +482,7 @@ TAO_ORB_Core::policy_factory_registry () } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_dynanyfactory (void) +TAO_ORB_Core::resolve_dynanyfactory () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -494,7 +494,7 @@ TAO_ORB_Core::resolve_dynanyfactory (void) } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_ior_manipulation (void) +TAO_ORB_Core::resolve_ior_manipulation () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -506,7 +506,7 @@ TAO_ORB_Core::resolve_ior_manipulation (void) } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_ior_table (void) +TAO_ORB_Core::resolve_ior_table () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -518,7 +518,7 @@ TAO_ORB_Core::resolve_ior_table (void) } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_async_ior_table (void) +TAO_ORB_Core::resolve_async_ior_table () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -530,7 +530,7 @@ TAO_ORB_Core::resolve_async_ior_table (void) } ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_monitor (void) +TAO_ORB_Core::resolve_monitor () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -546,7 +546,7 @@ TAO_ORB_Core::resolve_monitor (void) #if (TAO_HAS_CORBA_MESSAGING == 1) ACE_INLINE TAO_Policy_Current & -TAO_ORB_Core::policy_current (void) +TAO_ORB_Core::policy_current () { return *this->policy_current_; } @@ -554,7 +554,7 @@ TAO_ORB_Core::policy_current (void) #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_poa_current (void) +TAO_ORB_Core::resolve_poa_current () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, this->lock_, CORBA::Object::_nil ()); @@ -568,7 +568,7 @@ TAO_ORB_Core::resolve_poa_current (void) #if (TAO_HAS_CORBA_MESSAGING == 1) ACE_INLINE TAO_Policy_Set * -TAO_ORB_Core::get_default_policies (void) +TAO_ORB_Core::get_default_policies () { return this->default_policies_; } @@ -577,7 +577,7 @@ TAO_ORB_Core::get_default_policies (void) #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::resolve_rt_orb (void) +TAO_ORB_Core::resolve_rt_orb () { if (CORBA::is_nil (this->rt_orb_.in ())) { @@ -598,7 +598,7 @@ TAO_ORB_Core::resolve_rt_orb (void) #if (TAO_HAS_INTERCEPTORS == 1) ACE_INLINE CORBA::Object_ptr -TAO_ORB_Core::pi_current (void) +TAO_ORB_Core::pi_current () { // A pointer/reference to PICurrent is cached in the ORB Core since // it is accessed in the critical path (i.e. the request invocation @@ -616,13 +616,13 @@ TAO_ORB_Core::pi_current (CORBA::Object_ptr current) } ACE_INLINE TAO::ClientRequestInterceptor_Adapter * -TAO_ORB_Core::clientrequestinterceptor_adapter (void) +TAO_ORB_Core::clientrequestinterceptor_adapter () { return this->client_request_interceptor_adapter_; } ACE_INLINE TAO::ServerRequestInterceptor_Adapter * -TAO_ORB_Core::serverrequestinterceptor_adapter (void) +TAO_ORB_Core::serverrequestinterceptor_adapter () { return this->server_request_interceptor_adapter_; } @@ -657,7 +657,7 @@ TAO_ORB_Core::set_sync_scope_hook (Sync_Scope_Hook hook) ACE_INLINE Messaging::SyncScope -TAO_ORB_Core::default_sync_scope (void) +TAO_ORB_Core::default_sync_scope () { return this->default_sync_scope_; } diff --git a/TAO/tao/ORB_Core_Auto_Ptr.inl b/TAO/tao/ORB_Core_Auto_Ptr.inl index a44313f7874..5381056e570 100644 --- a/TAO/tao/ORB_Core_Auto_Ptr.inl +++ b/TAO/tao/ORB_Core_Auto_Ptr.inl @@ -15,7 +15,7 @@ TAO_ORB_Core_Auto_Ptr::get () const } ACE_INLINE TAO_ORB_Core * -TAO_ORB_Core_Auto_Ptr::release (void) +TAO_ORB_Core_Auto_Ptr::release () { TAO_ORB_Core *old = this->p_; this->p_ = 0; diff --git a/TAO/tao/ORB_Table.inl b/TAO/tao/ORB_Table.inl index 8994755cbb4..cb896f50cf6 100644 --- a/TAO/tao/ORB_Table.inl +++ b/TAO/tao/ORB_Table.inl @@ -6,32 +6,32 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ::TAO_ORB_Core * -TAO::ORB_Table::first_orb (void) +TAO::ORB_Table::first_orb () { return this->first_orb_; } ACE_INLINE TAO::ORB_Table::iterator -TAO::ORB_Table::begin (void) +TAO::ORB_Table::begin () { return this->table_.begin (); } ACE_INLINE TAO::ORB_Table::iterator -TAO::ORB_Table::end (void) +TAO::ORB_Table::end () { return this->table_.end (); } /// Accessor to the underlying table_ ACE_INLINE TAO::ORB_Table::Table * -TAO::ORB_Table::table (void) +TAO::ORB_Table::table () { return &this->table_; } ACE_INLINE TAO_SYNCH_MUTEX & -TAO::ORB_Table::lock (void) +TAO::ORB_Table::lock () { return this->lock_; } @@ -39,7 +39,7 @@ TAO::ORB_Table::lock (void) // **************************************************************** ACE_INLINE -TAO::ORB_Core_Ref_Counter::ORB_Core_Ref_Counter (void) +TAO::ORB_Core_Ref_Counter::ORB_Core_Ref_Counter () : core_ (0) { } @@ -58,7 +58,7 @@ TAO::ORB_Core_Ref_Counter::ORB_Core_Ref_Counter (::TAO_ORB_Core * core) } ACE_INLINE -TAO::ORB_Core_Ref_Counter::~ORB_Core_Ref_Counter (void) +TAO::ORB_Core_Ref_Counter::~ORB_Core_Ref_Counter () { if (this->core_) (void) this->core_->_decr_refcnt (); // Should never throw. diff --git a/TAO/tao/Object_Argument_T.inl b/TAO/tao/Object_Argument_T.inl index 06bb71e0764..f54fa40f739 100644 --- a/TAO/tao/Object_Argument_T.inl +++ b/TAO/tao/Object_Argument_T.inl @@ -42,7 +42,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_ptr & -TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::arg (void) +TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::arg () { return this->x_; } @@ -62,7 +62,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_out -TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::arg (void) +TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::arg () { return this->x_; } @@ -73,7 +73,7 @@ template<typename S_ptr, typename S_var, template <typename> class Insert_Policy> ACE_INLINE -TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::Ret_Object_Argument_T (void) +TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::Ret_Object_Argument_T () {} template<typename S_ptr, @@ -81,7 +81,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_ptr & -TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::arg (void) +TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::arg () { return this->x_.out (); } @@ -91,7 +91,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_ptr -TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::excp (void) +TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::excp () { return this->x_.ptr (); } @@ -101,7 +101,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_ptr -TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::retn (void) +TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::retn () { return this->x_._retn (); } diff --git a/TAO/tao/Object_Ref_Table.inl b/TAO/tao/Object_Ref_Table.inl index 1f053542e9d..c69c8fbf510 100644 --- a/TAO/tao/Object_Ref_Table.inl +++ b/TAO/tao/Object_Ref_Table.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Object_Ref_Table::TAO_Object_Ref_Table (void) +TAO_Object_Ref_Table::TAO_Object_Ref_Table () : table_ (TAO_DEFAULT_OBJECT_REF_TABLE_SIZE) , lock_ () { @@ -21,7 +21,7 @@ TAO_Object_Ref_Table::find_i (const char *id) } ACE_INLINE void -TAO_Object_Ref_Table::destroy (void) +TAO_Object_Ref_Table::destroy () { Table tmp; @@ -33,13 +33,13 @@ TAO_Object_Ref_Table::destroy (void) } ACE_INLINE TAO_Object_Ref_Table::iterator -TAO_Object_Ref_Table::begin (void) +TAO_Object_Ref_Table::begin () { return this->table_.begin (); } ACE_INLINE TAO_Object_Ref_Table::iterator -TAO_Object_Ref_Table::end (void) +TAO_Object_Ref_Table::end () { return this->table_.end (); } diff --git a/TAO/tao/PI/ClientRequestDetails.inl b/TAO/tao/PI/ClientRequestDetails.inl index 04a89167a0d..2e55e442c79 100644 --- a/TAO/tao/PI/ClientRequestDetails.inl +++ b/TAO/tao/PI/ClientRequestDetails.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { ACE_INLINE - ClientRequestDetails::ClientRequestDetails (void) + ClientRequestDetails::ClientRequestDetails () : processing_mode_(PortableInterceptor::LOCAL_AND_REMOTE) { } diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl index c8e3770dccd..561aa6c284e 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { ACE_INLINE - ClientRequestInterceptor_Adapter_Impl::ClientRequestInterceptor_Adapter_Impl (void) + ClientRequestInterceptor_Adapter_Impl::ClientRequestInterceptor_Adapter_Impl () { } } diff --git a/TAO/tao/PI/ORBInitInfo.inl b/TAO/tao/PI/ORBInitInfo.inl index 6dbf4a37bdf..9a4e71b5a58 100644 --- a/TAO/tao/PI/ORBInitInfo.inl +++ b/TAO/tao/PI/ORBInitInfo.inl @@ -9,7 +9,7 @@ TAO_ORBInitInfo::orb_core () const } ACE_INLINE void -TAO_ORBInitInfo::invalidate (void) +TAO_ORBInitInfo::invalidate () { this->orb_core_ = 0; } diff --git a/TAO/tao/PI_Server/ServerRequestDetails.inl b/TAO/tao/PI_Server/ServerRequestDetails.inl index 741f4e88481..bc039b36ffe 100644 --- a/TAO/tao/PI_Server/ServerRequestDetails.inl +++ b/TAO/tao/PI_Server/ServerRequestDetails.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { ACE_INLINE - ServerRequestDetails::ServerRequestDetails (void) + ServerRequestDetails::ServerRequestDetails () : processing_mode_(PortableInterceptor::LOCAL_AND_REMOTE) { } diff --git a/TAO/tao/PI_Server/ServerRequestInfo.inl b/TAO/tao/PI_Server/ServerRequestInfo.inl index 836e40c0572..b8fcfc01812 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.inl +++ b/TAO/tao/PI_Server/ServerRequestInfo.inl @@ -44,7 +44,7 @@ TAO::ServerRequestInfo::forward_reference (CORBA::Object_ptr obj) } ACE_INLINE TAO_ServerRequest & -TAO::ServerRequestInfo::server_request (void) +TAO::ServerRequestInfo::server_request () { return this->server_request_; } diff --git a/TAO/tao/Pluggable_Messaging_Utils.inl b/TAO/tao/Pluggable_Messaging_Utils.inl index e067d668d8f..aaef69fee3a 100644 --- a/TAO/tao/Pluggable_Messaging_Utils.inl +++ b/TAO/tao/Pluggable_Messaging_Utils.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Pluggable_Reply_Params_Base::TAO_Pluggable_Reply_Params_Base (void) +TAO_Pluggable_Reply_Params_Base::TAO_Pluggable_Reply_Params_Base () : svc_ctx_ (), request_id_ (0), is_dsi_ (0), @@ -47,7 +47,7 @@ TAO_Pluggable_Reply_Params_Base::service_context_notowned ( } ACE_INLINE IOP::ServiceContextList & -TAO_Pluggable_Reply_Params_Base::service_context_notowned (void) +TAO_Pluggable_Reply_Params_Base::service_context_notowned () { return *this->service_context_; } diff --git a/TAO/tao/Policy_Current.inl b/TAO/tao/Policy_Current.inl index 7342464a589..3cb318f2544 100644 --- a/TAO/tao/Policy_Current.inl +++ b/TAO/tao/Policy_Current.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Policy_Current::TAO_Policy_Current (void) +TAO_Policy_Current::TAO_Policy_Current () { } diff --git a/TAO/tao/Policy_Current_Impl.inl b/TAO/tao/Policy_Current_Impl.inl index b946ea2f974..032654f700e 100644 --- a/TAO/tao/Policy_Current_Impl.inl +++ b/TAO/tao/Policy_Current_Impl.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Policy_Current_Impl::TAO_Policy_Current_Impl (void) +TAO_Policy_Current_Impl::TAO_Policy_Current_Impl () : manager_impl_ (TAO_POLICY_THREAD_SCOPE) { } diff --git a/TAO/tao/Policy_Manager.inl b/TAO/tao/Policy_Manager.inl index 5d1a7f602fa..6b30f704e2c 100644 --- a/TAO/tao/Policy_Manager.inl +++ b/TAO/tao/Policy_Manager.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Policy_Manager::TAO_Policy_Manager (void) +TAO_Policy_Manager::TAO_Policy_Manager () : impl_ (TAO_POLICY_ORB_SCOPE) { } diff --git a/TAO/tao/PortableServer/Active_Object_Map.inl b/TAO/tao/PortableServer/Active_Object_Map.inl index fad3a561bd3..079939283d5 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.inl +++ b/TAO/tao/PortableServer/Active_Object_Map.inl @@ -275,14 +275,14 @@ TAO_Active_Object_Map::remaining_activations (PortableServer::Servant servant) } ACE_INLINE size_t -TAO_Active_Object_Map::current_size (void) +TAO_Active_Object_Map::current_size () { return this->user_id_map_->current_size (); } /* static */ ACE_INLINE size_t -TAO_Active_Object_Map::system_id_size (void) +TAO_Active_Object_Map::system_id_size () { return TAO_Active_Object_Map::system_id_size_; } diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.inl b/TAO/tao/PortableServer/Active_Policy_Strategies.inl index 61d2bb711a6..b28b53ea4a5 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.inl +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.inl @@ -63,7 +63,7 @@ namespace TAO ACE_INLINE Active_Policy_Strategies_Cleanup_Guard - ::~Active_Policy_Strategies_Cleanup_Guard (void) + ::~Active_Policy_Strategies_Cleanup_Guard () { if (this->ptr_) { @@ -73,7 +73,7 @@ namespace TAO ACE_INLINE Active_Policy_Strategies * - Active_Policy_Strategies_Cleanup_Guard::_retn (void) + Active_Policy_Strategies_Cleanup_Guard::_retn () { Active_Policy_Strategies *temp = this->ptr_; this->ptr_ = 0; diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.inl b/TAO/tao/PortableServer/BD_String_SArgument_T.inl index 6616af35a12..def47e46280 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.inl +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.inl @@ -6,7 +6,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE TAO::In_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: -In_BD_String_SArgument_T (void) +In_BD_String_SArgument_T () {} template<typename S_var, @@ -27,7 +27,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: -Inout_BD_String_SArgument_T (void) +Inout_BD_String_SArgument_T () {} template<typename S_var, @@ -36,7 +36,7 @@ template<typename S_var, ACE_INLINE typename S_var::s_traits::char_type *& TAO::Inout_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: -arg (void) +arg () { return this->x_.inout (); } @@ -48,7 +48,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE TAO::Out_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: -Out_BD_String_SArgument_T (void) +Out_BD_String_SArgument_T () {} template<typename S_var, @@ -57,7 +57,7 @@ template<typename S_var, ACE_INLINE typename S_var::s_traits::char_type *& TAO::Out_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: -arg (void) +arg () { return this->x_.out (); } @@ -69,7 +69,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: -Ret_BD_String_SArgument_T (void) +Ret_BD_String_SArgument_T () {} template<typename S_var, @@ -78,7 +78,7 @@ template<typename S_var, ACE_INLINE typename S_var::s_traits::char_type *& TAO::Ret_BD_String_SArgument_T<S_var,BOUND,Insert_Policy>:: -arg (void) +arg () { return this->x_.out (); } diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.inl b/TAO/tao/PortableServer/Basic_SArgument_T.inl index b9d5f96a1f4..b508d924a29 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.inl +++ b/TAO/tao/PortableServer/Basic_SArgument_T.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::In_Basic_SArgument_T<S,Insert_Policy>::In_Basic_SArgument_T (void) +TAO::In_Basic_SArgument_T<S,Insert_Policy>::In_Basic_SArgument_T () {} template<typename S, @@ -21,14 +21,14 @@ TAO::In_Basic_SArgument_T<S,Insert_Policy>::arg () const template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::Inout_Basic_SArgument_T (void) +TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::Inout_Basic_SArgument_T () {} template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -38,14 +38,14 @@ TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::arg (void) template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Out_Basic_SArgument_T<S,Insert_Policy>::Out_Basic_SArgument_T (void) +TAO::Out_Basic_SArgument_T<S,Insert_Policy>::Out_Basic_SArgument_T () {} template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Out_Basic_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Out_Basic_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -55,14 +55,14 @@ TAO::Out_Basic_SArgument_T<S,Insert_Policy>::arg (void) template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::Ret_Basic_SArgument_T (void) +TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::Ret_Basic_SArgument_T () {} template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } diff --git a/TAO/tao/PortableServer/Creation_Time.inl b/TAO/tao/PortableServer/Creation_Time.inl index 7308e632c6f..5a4785c550c 100644 --- a/TAO/tao/PortableServer/Creation_Time.inl +++ b/TAO/tao/PortableServer/Creation_Time.inl @@ -9,7 +9,7 @@ namespace TAO namespace Portable_Server { ACE_INLINE CORBA::ULong - Creation_Time::creation_time_length (void) + Creation_Time::creation_time_length () { return 2 * sizeof (CORBA::ULong); } @@ -22,7 +22,7 @@ namespace TAO } ACE_INLINE - Creation_Time::Creation_Time (void) + Creation_Time::Creation_Time () { this->time_stamp_[Creation_Time::SEC_FIELD] = 0; this->time_stamp_[Creation_Time::USEC_FIELD] = 0; @@ -107,7 +107,7 @@ namespace TAO } ACE_INLINE - Temporary_Creation_Time::Temporary_Creation_Time (void) + Temporary_Creation_Time::Temporary_Creation_Time () : time_stamp_ (0) { } diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl index 11e778ca6a9..3147aefa654 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl @@ -5,7 +5,7 @@ template<typename S_forany, template <typename> class Insert_Policy> ACE_INLINE TAO::In_Fixed_Array_SArgument_T<S_forany, - Insert_Policy>::In_Fixed_Array_SArgument_T (void) + Insert_Policy>::In_Fixed_Array_SArgument_T () { } @@ -27,7 +27,7 @@ template<typename S_forany, ACE_INLINE TAO::Inout_Fixed_Array_SArgument_T<S_forany, Insert_Policy>:: -Inout_Fixed_Array_SArgument_T (void) +Inout_Fixed_Array_SArgument_T () { } @@ -36,7 +36,7 @@ template<typename S_forany, ACE_INLINE typename S_forany::_slice_type * TAO::Inout_Fixed_Array_SArgument_T<S_forany, - Insert_Policy>::arg (void) + Insert_Policy>::arg () { S_forany tmp (this->x_); return tmp.inout (); @@ -49,7 +49,7 @@ template<typename S_forany, ACE_INLINE TAO::Out_Fixed_Array_SArgument_T<S_forany, Insert_Policy>:: -Out_Fixed_Array_SArgument_T (void) +Out_Fixed_Array_SArgument_T () { } @@ -58,7 +58,7 @@ template<typename S_forany, ACE_INLINE typename S_forany::_slice_type * TAO::Out_Fixed_Array_SArgument_T<S_forany, - Insert_Policy>::arg (void) + Insert_Policy>::arg () { S_forany tmp (this->x_); return tmp.inout (); @@ -73,7 +73,7 @@ ACE_INLINE TAO::Ret_Fixed_Array_SArgument_T<S_var, S_forany, Insert_Policy>:: -Ret_Fixed_Array_SArgument_T (void) +Ret_Fixed_Array_SArgument_T () { } @@ -84,7 +84,7 @@ ACE_INLINE typename S_forany::_slice_type *& TAO::Ret_Fixed_Array_SArgument_T<S_var, S_forany, - Insert_Policy>::arg (void) + Insert_Policy>::arg () { return this->x_._retn_arg (); } diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl index c93447fbe10..59e21f17e74 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl @@ -16,7 +16,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>:: -Inout_Fixed_Size_SArgument_T (void) +Inout_Fixed_Size_SArgument_T () { } @@ -24,7 +24,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -36,14 +36,14 @@ template<typename S, ACE_INLINE TAO::Out_Fixed_Size_SArgument_T<S, Insert_Policy>:: -Out_Fixed_Size_SArgument_T (void) +Out_Fixed_Size_SArgument_T () {} template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -53,14 +53,14 @@ TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::Ret_Fixed_Size_SArgument_T (void) +TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::Ret_Fixed_Size_SArgument_T () {} template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } diff --git a/TAO/tao/PortableServer/Object_Adapter.inl b/TAO/tao/PortableServer/Object_Adapter.inl index 603fac7b612..7acba182498 100644 --- a/TAO/tao/PortableServer/Object_Adapter.inl +++ b/TAO/tao/PortableServer/Object_Adapter.inl @@ -5,31 +5,31 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_Policy_Validator & -TAO_Object_Adapter::validator (void) +TAO_Object_Adapter::validator () { return this->default_validator_; } ACE_INLINE TAO_POA_Policy_Set & -TAO_Object_Adapter::default_poa_policies (void) +TAO_Object_Adapter::default_poa_policies () { return this->default_poa_policies_; } ACE_INLINE ACE_Lock & -TAO_Object_Adapter::lock (void) +TAO_Object_Adapter::lock () { return *this->lock_; } ACE_INLINE TAO_SYNCH_MUTEX & -TAO_Object_Adapter::thread_lock (void) +TAO_Object_Adapter::thread_lock () { return this->thread_lock_; } ACE_INLINE ACE_Reverse_Lock<ACE_Lock> & -TAO_Object_Adapter::reverse_lock (void) +TAO_Object_Adapter::reverse_lock () { return this->reverse_lock_; } diff --git a/TAO/tao/PortableServer/Object_SArgument_T.inl b/TAO/tao/PortableServer/Object_SArgument_T.inl index d7e8a6fa572..86b4ff3497e 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.inl +++ b/TAO/tao/PortableServer/Object_SArgument_T.inl @@ -19,7 +19,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>:: -Inout_Object_SArgument_T (void) +Inout_Object_SArgument_T () { } @@ -28,7 +28,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_ptr& -TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void) +TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg () { return this->x_.inout (); } @@ -41,7 +41,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>:: -Out_Object_SArgument_T (void) +Out_Object_SArgument_T () { } @@ -51,7 +51,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_out -TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::arg (void) +TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::arg () { return this->x_.out (); } @@ -63,7 +63,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>:: -Ret_Object_SArgument_T (void) +Ret_Object_SArgument_T () { } @@ -72,7 +72,7 @@ template<typename S_ptr, template <typename> class Insert_Policy> ACE_INLINE S_ptr & -TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void) +TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg () { return this->x_.out (); } diff --git a/TAO/tao/PortableServer/POAManager.inl b/TAO/tao/PortableServer/POAManager.inl index 05fc7d21eb6..ed6f6683457 100644 --- a/TAO/tao/PortableServer/POAManager.inl +++ b/TAO/tao/PortableServer/POAManager.inl @@ -5,13 +5,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE ACE_Lock & -TAO_POA_Manager::lock (void) +TAO_POA_Manager::lock () { return this->lock_; } ACE_INLINE void -TAO_POA_Manager::activate (void) +TAO_POA_Manager::activate () { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD; @@ -52,13 +52,13 @@ TAO_POA_Manager::deactivate (CORBA::Boolean etherealize_objects, #endif /* TAO_HAS_MINIMUM_POA == 0 */ ACE_INLINE PortableServer::POAManager::State -TAO_POA_Manager::get_state_i (void) +TAO_POA_Manager::get_state_i () { return this->state_; } ACE_INLINE PortableServer::POAManager::State -TAO_POA_Manager::get_state (void) +TAO_POA_Manager::get_state () { // Lock access to the POAManager for the duration of this transaction TAO_OBJECT_ADAPTER_GUARD_RETURN (this->state_); @@ -113,7 +113,7 @@ TAO_POA_Manager::generate_manager_id () const #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) ACE_INLINE -CORBA::PolicyList& TAO_POA_Manager::get_policies (void) +CORBA::PolicyList& TAO_POA_Manager::get_policies () { return this->policies_; } diff --git a/TAO/tao/PortableServer/POA_Policy_Set.inl b/TAO/tao/PortableServer/POA_Policy_Set.inl index 26a39c0ec81..8b01c32593b 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.inl +++ b/TAO/tao/PortableServer/POA_Policy_Set.inl @@ -39,7 +39,7 @@ TAO_POA_Policy_Set::get_policy (CORBA::PolicyType policy) } ACE_INLINE TAO_Policy_Set & -TAO_POA_Policy_Set::policies (void) +TAO_POA_Policy_Set::policies () { return this->impl_; } diff --git a/TAO/tao/PortableServer/Regular_POA.inl b/TAO/tao/PortableServer/Regular_POA.inl index 7be5db2b0a2..73727ad3843 100644 --- a/TAO/tao/PortableServer/Regular_POA.inl +++ b/TAO/tao/PortableServer/Regular_POA.inl @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE PortableServer::POA_ptr -TAO_Regular_POA::the_parent (void) +TAO_Regular_POA::the_parent () { return PortableServer::POA::_duplicate (this->parent_); } diff --git a/TAO/tao/PortableServer/Root_POA.inl b/TAO/tao/PortableServer/Root_POA.inl index e3dabccb7ac..8e7290de43d 100644 --- a/TAO/tao/PortableServer/Root_POA.inl +++ b/TAO/tao/PortableServer/Root_POA.inl @@ -2,37 +2,37 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE CORBA::Boolean -TAO_Root_POA::cleanup_in_progress (void) +TAO_Root_POA::cleanup_in_progress () { return this->cleanup_in_progress_; } ACE_INLINE ACE_Lock & -TAO_Root_POA::lock (void) +TAO_Root_POA::lock () { return this->lock_; } ACE_INLINE TAO_POA_Policy_Set & -TAO_Root_POA::policies (void) +TAO_Root_POA::policies () { return this->policies_; } ACE_INLINE PortableServer::POA_ptr -TAO_Root_POA::the_parent (void) +TAO_Root_POA::the_parent () { return PortableServer::POA::_nil (); } ACE_INLINE PortableInterceptor::AdapterName * -TAO_Root_POA::adapter_name (void) +TAO_Root_POA::adapter_name () { return this->adapter_name_i (); } ACE_INLINE PortableInterceptor::ObjectReferenceTemplate * -TAO_Root_POA::get_adapter_template (void) +TAO_Root_POA::get_adapter_template () { TAO::ORT_Adapter *adapter = this->ORT_adapter (); @@ -56,7 +56,7 @@ TAO_Root_POA::get_adapter_template_i () } ACE_INLINE PortableInterceptor::ObjectReferenceFactory * -TAO_Root_POA::get_obj_ref_factory (void) +TAO_Root_POA::get_obj_ref_factory () { TAO::ORT_Adapter *adapter = this->ORT_adapter (); @@ -69,13 +69,13 @@ TAO_Root_POA::get_obj_ref_factory (void) } ACE_INLINE CORBA::Boolean -TAO_Root_POA::system_id (void) +TAO_Root_POA::system_id () { return (this->cached_policies_.id_assignment () == PortableServer::SYSTEM_ID); } ACE_INLINE CORBA::Boolean -TAO_Root_POA::persistent (void) +TAO_Root_POA::persistent () { return (this->cached_policies_.lifespan () == PortableServer::PERSISTENT); } @@ -87,7 +87,7 @@ TAO_Root_POA::name () const } ACE_INLINE char * -TAO_Root_POA::the_name (void) +TAO_Root_POA::the_name () { return CORBA::string_dup (this->name_.c_str ()); } @@ -105,73 +105,73 @@ TAO_Root_POA::system_name () const } ACE_INLINE char -TAO_Root_POA::name_separator (void) +TAO_Root_POA::name_separator () { return '\0'; } ACE_INLINE CORBA::ULong -TAO_Root_POA::name_separator_length (void) +TAO_Root_POA::name_separator_length () { return sizeof (char); } ACE_INLINE char -TAO_Root_POA::persistent_key_char (void) +TAO_Root_POA::persistent_key_char () { return 'P'; } ACE_INLINE char -TAO_Root_POA::transient_key_char (void) +TAO_Root_POA::transient_key_char () { return 'T'; } ACE_INLINE CORBA::ULong -TAO_Root_POA::persistent_key_type_length (void) +TAO_Root_POA::persistent_key_type_length () { return sizeof (char); } ACE_INLINE char -TAO_Root_POA::system_id_key_char (void) +TAO_Root_POA::system_id_key_char () { return 'S'; } ACE_INLINE char -TAO_Root_POA::user_id_key_char (void) +TAO_Root_POA::user_id_key_char () { return 'U'; } ACE_INLINE CORBA::ULong -TAO_Root_POA::system_id_key_type_length (void) +TAO_Root_POA::system_id_key_type_length () { return sizeof (char); } ACE_INLINE char -TAO_Root_POA::root_key_char (void) +TAO_Root_POA::root_key_char () { return 'R'; } ACE_INLINE char -TAO_Root_POA::non_root_key_char (void) +TAO_Root_POA::non_root_key_char () { return 'N'; } ACE_INLINE char -TAO_Root_POA::root_key_type (void) +TAO_Root_POA::root_key_type () { return TAO_Root_POA::root_key_char (); } ACE_INLINE CORBA::ULong -TAO_Root_POA::root_key_type_length (void) +TAO_Root_POA::root_key_type_length () { return sizeof (char); } @@ -183,13 +183,13 @@ TAO_Root_POA::outstanding_requests () const } ACE_INLINE CORBA::ULong -TAO_Root_POA::increment_outstanding_requests (void) +TAO_Root_POA::increment_outstanding_requests () { return ++this->outstanding_requests_; } ACE_INLINE CORBA::ULong -TAO_Root_POA::decrement_outstanding_requests (void) +TAO_Root_POA::decrement_outstanding_requests () { return --this->outstanding_requests_; } @@ -207,7 +207,7 @@ TAO_Root_POA::orb_core () const } ACE_INLINE PortableInterceptor::AdapterState -TAO_Root_POA::get_adapter_state (void) +TAO_Root_POA::get_adapter_state () { return this->adapter_state_; } @@ -219,7 +219,7 @@ TAO_Root_POA::thread_pool () const } ACE_INLINE TAO_SYNCH_CONDITION & -TAO_Root_POA::servant_deactivation_condition (void) +TAO_Root_POA::servant_deactivation_condition () { return servant_deactivation_condition_; } diff --git a/TAO/tao/PortableServer/Servant_var.cpp b/TAO/tao/PortableServer/Servant_var.cpp index 7786d181e32..3b1a63f7512 100644 --- a/TAO/tao/PortableServer/Servant_var.cpp +++ b/TAO/tao/PortableServer/Servant_var.cpp @@ -31,7 +31,7 @@ PortableServer::Servant_var<T>::_duplicate (T * p) } template <class T> -PortableServer::Servant_var<T>::~Servant_var (void) /* throw () */ +PortableServer::Servant_var<T>::~Servant_var () /* throw () */ { // Unfortunately, there is no throw spec on _remove_ref, so we // can't assume that it will not throw. If it does, then we are in diff --git a/TAO/tao/PortableServer/Servant_var.inl b/TAO/tao/PortableServer/Servant_var.inl index 8b27ee076d7..c3a78412637 100644 --- a/TAO/tao/PortableServer/Servant_var.inl +++ b/TAO/tao/PortableServer/Servant_var.inl @@ -88,14 +88,14 @@ PortableServer::Servant_var<T>::in () const template <class T> ACE_INLINE T *& -PortableServer::Servant_var<T>::inout (void) +PortableServer::Servant_var<T>::inout () { return this->ptr_; } template <class T> ACE_INLINE T *& -PortableServer::Servant_var<T>::out (void) +PortableServer::Servant_var<T>::out () { PortableServer::Servant_var<T> tmp; this->swap (tmp); @@ -104,7 +104,7 @@ PortableServer::Servant_var<T>::out (void) template <class T> ACE_INLINE T * -PortableServer::Servant_var<T>::_retn (void) +PortableServer::Servant_var<T>::_retn () { T * const rval = ptr_; this->ptr_ = 0; diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl index e08e74db721..96bbee514b6 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl @@ -7,7 +7,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: -In_Special_Basic_SArgument_T (void) +In_Special_Basic_SArgument_T () { } @@ -30,7 +30,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: -Inout_Special_Basic_SArgument_T (void) +Inout_Special_Basic_SArgument_T () { } @@ -40,7 +40,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) +TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg () { return this->x_; } @@ -53,7 +53,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: -Out_Special_Basic_SArgument_T (void) +Out_Special_Basic_SArgument_T () { } @@ -62,7 +62,7 @@ template<typename S, typename from_S, template <typename> class Insert_Policy> S & -TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) +TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg () { return this->x_; } @@ -75,7 +75,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>:: -Ret_Special_Basic_SArgument_T (void) +Ret_Special_Basic_SArgument_T () { } @@ -85,7 +85,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) +TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg () { return this->x_; } diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.inl b/TAO/tao/PortableServer/UB_String_SArgument_T.inl index 1dca942a25d..20ad47f1a84 100644 --- a/TAO/tao/PortableServer/UB_String_SArgument_T.inl +++ b/TAO/tao/PortableServer/UB_String_SArgument_T.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, typename S_var> ACE_INLINE -TAO::In_UB_String_SArgument_T<S,S_var>::In_UB_String_SArgument_T (void) +TAO::In_UB_String_SArgument_T<S,S_var>::In_UB_String_SArgument_T () {} template<typename S, typename S_var> @@ -17,13 +17,13 @@ TAO::In_UB_String_SArgument_T<S,S_var>::arg () const template<typename S, typename S_var> ACE_INLINE -TAO::Inout_UB_String_SArgument_T<S,S_var>::Inout_UB_String_SArgument_T (void) +TAO::Inout_UB_String_SArgument_T<S,S_var>::Inout_UB_String_SArgument_T () {} template<typename S, typename S_var> ACE_INLINE S *& -TAO::Inout_UB_String_SArgument_T<S,S_var>::arg (void) +TAO::Inout_UB_String_SArgument_T<S,S_var>::arg () { return this->x_.inout (); } @@ -40,7 +40,7 @@ TAO::Out_UB_String_SArgument_T<S,S_var>::Out_UB_String_SArgument_T ( template<typename S, typename S_var> ACE_INLINE S *& -TAO::Out_UB_String_SArgument_T<S,S_var>::arg (void) +TAO::Out_UB_String_SArgument_T<S,S_var>::arg () { return this->x_.out (); } @@ -49,12 +49,12 @@ TAO::Out_UB_String_SArgument_T<S,S_var>::arg (void) template<typename S, typename S_var> ACE_INLINE -TAO::Ret_UB_String_SArgument_T<S,S_var>::Ret_UB_String_SArgument_T (void) +TAO::Ret_UB_String_SArgument_T<S,S_var>::Ret_UB_String_SArgument_T () {} template<typename S, typename S_var> S *& -TAO::Ret_UB_String_SArgument_T<S,S_var>::arg (void) +TAO::Ret_UB_String_SArgument_T<S,S_var>::arg () { return this->x_.out (); } diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl index c4655848d33..fa47a64f158 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl @@ -5,7 +5,7 @@ template<typename S_forany, template <typename> class Insert_Policy> ACE_INLINE TAO::In_Var_Array_SArgument_T<S_forany, - Insert_Policy>::In_Var_Array_SArgument_T (void) + Insert_Policy>::In_Var_Array_SArgument_T () {} template<typename S_forany, @@ -26,7 +26,7 @@ template<typename S_forany, ACE_INLINE TAO::Inout_Var_Array_SArgument_T<S_forany, Insert_Policy>:: -Inout_Var_Array_SArgument_T (void) +Inout_Var_Array_SArgument_T () { } @@ -34,7 +34,7 @@ template<typename S_forany, template <typename> class Insert_Policy> typename S_forany::_slice_type * TAO::Inout_Var_Array_SArgument_T<S_forany, - Insert_Policy>::arg (void) + Insert_Policy>::arg () { S_forany tmp (this->x_); return tmp.inout (); @@ -49,7 +49,7 @@ ACE_INLINE TAO::Out_Var_Array_SArgument_T<S_var, S_forany, Insert_Policy>:: -Out_Var_Array_SArgument_T (void) +Out_Var_Array_SArgument_T () { } @@ -59,7 +59,7 @@ template<typename S_var, typename S_forany::_slice_type *& TAO::Out_Var_Array_SArgument_T<S_var, S_forany, - Insert_Policy>::arg (void) + Insert_Policy>::arg () { return this->x_.out (); } @@ -73,7 +73,7 @@ ACE_INLINE TAO::Ret_Var_Array_SArgument_T<S_var, S_forany, Insert_Policy>:: -Ret_Var_Array_SArgument_T (void) +Ret_Var_Array_SArgument_T () { } @@ -84,7 +84,7 @@ ACE_INLINE typename S_forany::_slice_type *& TAO::Ret_Var_Array_SArgument_T<S_var, S_forany, - Insert_Policy>::arg (void) + Insert_Policy>::arg () { return this->x_.out (); } diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl index 015c9c1c053..fb2426aeb5b 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl @@ -14,14 +14,14 @@ TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::arg () const template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::Inout_Var_Size_SArgument_T (void) +TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::Inout_Var_Size_SArgument_T () { } template<typename S, template <typename> class Insert_Policy> S & -TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -31,14 +31,14 @@ TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::Out_Var_Size_SArgument_T (void) +TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::Out_Var_Size_SArgument_T () { } template<typename S, template <typename> class Insert_Policy> S *& -TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::arg () { return this->x_.out (); } @@ -48,7 +48,7 @@ TAO::Out_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Ret_Var_Size_SArgument_T<S,Insert_Policy>::Ret_Var_Size_SArgument_T (void) +TAO::Ret_Var_Size_SArgument_T<S,Insert_Policy>::Ret_Var_Size_SArgument_T () { } @@ -56,7 +56,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S *& -TAO::Ret_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Ret_Var_Size_SArgument_T<S,Insert_Policy>::arg () { return this->x_.out (); } diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.inl b/TAO/tao/PortableServer/Vector_SArgument_T.inl index 1ade6aa3b16..5b77b5f3272 100644 --- a/TAO/tao/PortableServer/Vector_SArgument_T.inl +++ b/TAO/tao/PortableServer/Vector_SArgument_T.inl @@ -14,14 +14,14 @@ TAO::In_Vector_SArgument_T<S,Insert_Policy>::arg () const template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Inout_Vector_SArgument_T<S,Insert_Policy>::Inout_Vector_SArgument_T (void) +TAO::Inout_Vector_SArgument_T<S,Insert_Policy>::Inout_Vector_SArgument_T () { } template<typename S, template <typename> class Insert_Policy> S & -TAO::Inout_Vector_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Inout_Vector_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -31,14 +31,14 @@ TAO::Inout_Vector_SArgument_T<S,Insert_Policy>::arg (void) template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Out_Vector_SArgument_T<S,Insert_Policy>::Out_Vector_SArgument_T (void) +TAO::Out_Vector_SArgument_T<S,Insert_Policy>::Out_Vector_SArgument_T () { } template<typename S, template <typename> class Insert_Policy> S & -TAO::Out_Vector_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Out_Vector_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -48,7 +48,7 @@ TAO::Out_Vector_SArgument_T<S,Insert_Policy>::arg (void) template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Ret_Vector_SArgument_T<S,Insert_Policy>::Ret_Vector_SArgument_T (void) +TAO::Ret_Vector_SArgument_T<S,Insert_Policy>::Ret_Vector_SArgument_T () { } @@ -56,7 +56,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Ret_Vector_SArgument_T<S,Insert_Policy>::arg (void) +TAO::Ret_Vector_SArgument_T<S,Insert_Policy>::arg () { return this->x_; } diff --git a/TAO/tao/Profile.inl b/TAO/tao/Profile.inl index 733cb9d93c8..b2ba7477f99 100644 --- a/TAO/tao/Profile.inl +++ b/TAO/tao/Profile.inl @@ -26,13 +26,13 @@ TAO_Profile::forward_to (TAO_MProfile *mprofiles) } ACE_INLINE TAO_MProfile * -TAO_Profile::forward_to (void) +TAO_Profile::forward_to () { return this->forward_to_; } ACE_INLINE TAO_MProfile * -TAO_Profile::forward_to_i (void) +TAO_Profile::forward_to_i () { return this->forward_to_; } @@ -44,7 +44,7 @@ TAO_Profile::tagged_components () const } ACE_INLINE TAO_Tagged_Components& -TAO_Profile::tagged_components (void) +TAO_Profile::tagged_components () { return this->tagged_components_; } @@ -62,13 +62,13 @@ TAO_Profile::object_key () const } ACE_INLINE unsigned long -TAO_Profile::_incr_refcnt (void) +TAO_Profile::_incr_refcnt () { return ++this->refcount_; } ACE_INLINE unsigned long -TAO_Profile::_decr_refcnt (void) +TAO_Profile::_decr_refcnt () { unsigned long count = --this->refcount_; if (count == 0) diff --git a/TAO/tao/Profile_Transport_Resolver.inl b/TAO/tao/Profile_Transport_Resolver.inl index 4b066ac14f1..285a59014d0 100644 --- a/TAO/tao/Profile_Transport_Resolver.inl +++ b/TAO/tao/Profile_Transport_Resolver.inl @@ -62,7 +62,7 @@ namespace TAO } ACE_INLINE CORBA::PolicyList * - Profile_Transport_Resolver::steal_inconsistent_policies (void) + Profile_Transport_Resolver::steal_inconsistent_policies () { CORBA::PolicyList *tmp = this->inconsistent_policies_; this->inconsistent_policies_ = 0; diff --git a/TAO/tao/Protocol_Factory.h b/TAO/tao/Protocol_Factory.h index 56cd91973f1..2a74074622a 100644 --- a/TAO/tao/Protocol_Factory.h +++ b/TAO/tao/Protocol_Factory.h @@ -54,10 +54,10 @@ public: // Factory methods /// Create an acceptor - virtual TAO_Acceptor *make_acceptor (void) = 0; + virtual TAO_Acceptor *make_acceptor () = 0; /// Create a connector - virtual TAO_Connector *make_connector (void) = 0; + virtual TAO_Connector *make_connector () = 0; /** * Some protocols should not create a default endpoint unless the diff --git a/TAO/tao/Pseudo_VarOut_T.inl b/TAO/tao/Pseudo_VarOut_T.inl index b311939f02a..3590f7f53ae 100644 --- a/TAO/tao/Pseudo_VarOut_T.inl +++ b/TAO/tao/Pseudo_VarOut_T.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename T> ACE_INLINE -TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T (void) +TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T () : ptr_ (T::_nil ()) {} @@ -24,7 +24,7 @@ TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T (const TAO_Pseudo_Var_T<T> & p) template <typename T> ACE_INLINE -TAO_Pseudo_Var_T<T>::~TAO_Pseudo_Var_T (void) +TAO_Pseudo_Var_T<T>::~TAO_Pseudo_Var_T () { CORBA::release (this->ptr_); } @@ -72,7 +72,7 @@ TAO_Pseudo_Var_T<T>::in () const template <typename T> ACE_INLINE typename T::_ptr_type & -TAO_Pseudo_Var_T<T>::inout (void) +TAO_Pseudo_Var_T<T>::inout () { return this->ptr_; } @@ -80,7 +80,7 @@ TAO_Pseudo_Var_T<T>::inout (void) template <typename T> ACE_INLINE typename T::_ptr_type & -TAO_Pseudo_Var_T<T>::out (void) +TAO_Pseudo_Var_T<T>::out () { CORBA::release (this->ptr_); this->ptr_ = T::_nil (); @@ -90,7 +90,7 @@ TAO_Pseudo_Var_T<T>::out (void) template <typename T> ACE_INLINE typename T::_ptr_type -TAO_Pseudo_Var_T<T>::_retn (void) +TAO_Pseudo_Var_T<T>::_retn () { typename T::_ptr_type val = this->ptr_; this->ptr_ = T::_nil (); @@ -152,7 +152,7 @@ TAO_Pseudo_Out_T<T>::operator= (typename T::_ptr_type p) template <typename T> ACE_INLINE typename T::_ptr_type & -TAO_Pseudo_Out_T<T>::ptr (void) +TAO_Pseudo_Out_T<T>::ptr () { return this->ptr_; } @@ -167,7 +167,7 @@ TAO_Pseudo_Out_T<T>::operator typename T::_ptr_type & () template <typename T> ACE_INLINE typename T::_ptr_type -TAO_Pseudo_Out_T<T>::operator-> (void) +TAO_Pseudo_Out_T<T>::operator-> () { return this->ptr_; } diff --git a/TAO/tao/Queued_Message.h b/TAO/tao/Queued_Message.h index 093c3e4ab62..037c3a1ca0e 100644 --- a/TAO/tao/Queued_Message.h +++ b/TAO/tao/Queued_Message.h @@ -190,7 +190,7 @@ public: * Asynchronous (SYNC_NONE) messages are allocated from the heap (or * a pool), they need to be reclaimed explicitly. */ - virtual void destroy (void) = 0; + virtual void destroy () = 0; /// Check for timeout /** diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h index 419f43b2f3b..f0a06efa705 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.h @@ -89,10 +89,10 @@ class TAO_RTCORBA_Export TAO_Network_Priority_Mapping_Manager_var : private TAO_Base_var { public: - TAO_Network_Priority_Mapping_Manager_var (void); // default constructor + TAO_Network_Priority_Mapping_Manager_var (); // default constructor TAO_Network_Priority_Mapping_Manager_var (TAO_Network_Priority_Mapping_Manager_ptr); TAO_Network_Priority_Mapping_Manager_var (const TAO_Network_Priority_Mapping_Manager_var &); // copy constructor - ~TAO_Network_Priority_Mapping_Manager_var (void); // destructor + ~TAO_Network_Priority_Mapping_Manager_var (); // destructor TAO_Network_Priority_Mapping_Manager_var &operator= (TAO_Network_Priority_Mapping_Manager_ptr); TAO_Network_Priority_Mapping_Manager_var &operator= (const TAO_Network_Priority_Mapping_Manager_var &); diff --git a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl index fc1de165745..4480f599715 100644 --- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl +++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.inl @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // ************************************************************* ACE_INLINE -TAO_Network_Priority_Mapping_Manager_var::TAO_Network_Priority_Mapping_Manager_var (void) // default constructor +TAO_Network_Priority_Mapping_Manager_var::TAO_Network_Priority_Mapping_Manager_var () // default constructor : ptr_ (TAO_Network_Priority_Mapping_Manager::_nil ()) {} @@ -28,7 +28,7 @@ TAO_Network_Priority_Mapping_Manager_var::TAO_Network_Priority_Mapping_Manager_v {} ACE_INLINE -TAO_Network_Priority_Mapping_Manager_var::~TAO_Network_Priority_Mapping_Manager_var (void) // destructor +TAO_Network_Priority_Mapping_Manager_var::~TAO_Network_Priority_Mapping_Manager_var () // destructor { CORBA::release (this->ptr_); } @@ -77,13 +77,13 @@ TAO_Network_Priority_Mapping_Manager_var::in () const } ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr & -TAO_Network_Priority_Mapping_Manager_var::inout (void) +TAO_Network_Priority_Mapping_Manager_var::inout () { return this->ptr_; } ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr & -TAO_Network_Priority_Mapping_Manager_var::out (void) +TAO_Network_Priority_Mapping_Manager_var::out () { CORBA::release (this->ptr_); this->ptr_ = ::TAO_Network_Priority_Mapping_Manager::_nil (); @@ -91,7 +91,7 @@ TAO_Network_Priority_Mapping_Manager_var::out (void) } ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr -TAO_Network_Priority_Mapping_Manager_var::_retn (void) +TAO_Network_Priority_Mapping_Manager_var::_retn () { // yield ownership of managed obj reference ::TAO_Network_Priority_Mapping_Manager_ptr val = this->ptr_; @@ -112,7 +112,7 @@ TAO_Network_Priority_Mapping_Manager_var::release (TAO_Network_Priority_Mapping_ } ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr -TAO_Network_Priority_Mapping_Manager_var::nil (void) +TAO_Network_Priority_Mapping_Manager_var::nil () { return ::TAO_Network_Priority_Mapping_Manager::_nil (); } @@ -187,13 +187,13 @@ TAO_Network_Priority_Mapping_Manager_out::operator ::TAO_Network_Priority_Mappin } ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr & -TAO_Network_Priority_Mapping_Manager_out::ptr (void) // ptr +TAO_Network_Priority_Mapping_Manager_out::ptr () // ptr { return this->ptr_; } ACE_INLINE ::TAO_Network_Priority_Mapping_Manager_ptr -TAO_Network_Priority_Mapping_Manager_out::operator-> (void) +TAO_Network_Priority_Mapping_Manager_out::operator-> () { return this->ptr_; } @@ -206,7 +206,7 @@ TAO_Network_Priority_Mapping_Manager::TAO_Network_Priority_Mapping_Manager (RTCO } ACE_INLINE RTCORBA::NetworkPriorityMapping * -TAO_Network_Priority_Mapping_Manager::mapping (void) +TAO_Network_Priority_Mapping_Manager::mapping () { return this->mapping_; } diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h index 23d56faba1e..a0652c6cbf4 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h @@ -84,10 +84,10 @@ class TAO_RTCORBA_Export TAO_Priority_Mapping_Manager_var : private TAO_Base_var { public: - TAO_Priority_Mapping_Manager_var (void); // default constructor + TAO_Priority_Mapping_Manager_var (); // default constructor TAO_Priority_Mapping_Manager_var (TAO_Priority_Mapping_Manager_ptr); TAO_Priority_Mapping_Manager_var (const TAO_Priority_Mapping_Manager_var &); // copy constructor - ~TAO_Priority_Mapping_Manager_var (void); // destructor + ~TAO_Priority_Mapping_Manager_var (); // destructor TAO_Priority_Mapping_Manager_var &operator= (TAO_Priority_Mapping_Manager_ptr); TAO_Priority_Mapping_Manager_var &operator= (const TAO_Priority_Mapping_Manager_var &); diff --git a/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl b/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl index dffaea89b8e..00c8e79465d 100644 --- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl +++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.inl @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // ************************************************************* ACE_INLINE -TAO_Priority_Mapping_Manager_var::TAO_Priority_Mapping_Manager_var (void) // default constructor +TAO_Priority_Mapping_Manager_var::TAO_Priority_Mapping_Manager_var () // default constructor : ptr_ (TAO_Priority_Mapping_Manager::_nil ()) {} @@ -28,7 +28,7 @@ TAO_Priority_Mapping_Manager_var::TAO_Priority_Mapping_Manager_var (const ::TAO_ {} ACE_INLINE -TAO_Priority_Mapping_Manager_var::~TAO_Priority_Mapping_Manager_var (void) // destructor +TAO_Priority_Mapping_Manager_var::~TAO_Priority_Mapping_Manager_var () // destructor { CORBA::release (this->ptr_); } @@ -77,13 +77,13 @@ TAO_Priority_Mapping_Manager_var::in () const } ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr & -TAO_Priority_Mapping_Manager_var::inout (void) +TAO_Priority_Mapping_Manager_var::inout () { return this->ptr_; } ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr & -TAO_Priority_Mapping_Manager_var::out (void) +TAO_Priority_Mapping_Manager_var::out () { CORBA::release (this->ptr_); this->ptr_ = ::TAO_Priority_Mapping_Manager::_nil (); @@ -91,7 +91,7 @@ TAO_Priority_Mapping_Manager_var::out (void) } ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr -TAO_Priority_Mapping_Manager_var::_retn (void) +TAO_Priority_Mapping_Manager_var::_retn () { // yield ownership of managed obj reference ::TAO_Priority_Mapping_Manager_ptr val = this->ptr_; @@ -112,7 +112,7 @@ TAO_Priority_Mapping_Manager_var::release (TAO_Priority_Mapping_Manager_ptr p) } ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr -TAO_Priority_Mapping_Manager_var::nil (void) +TAO_Priority_Mapping_Manager_var::nil () { return ::TAO_Priority_Mapping_Manager::_nil (); } @@ -187,13 +187,13 @@ TAO_Priority_Mapping_Manager_out::operator ::TAO_Priority_Mapping_Manager_ptr &( } ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr & -TAO_Priority_Mapping_Manager_out::ptr (void) // ptr +TAO_Priority_Mapping_Manager_out::ptr () // ptr { return this->ptr_; } ACE_INLINE ::TAO_Priority_Mapping_Manager_ptr -TAO_Priority_Mapping_Manager_out::operator-> (void) +TAO_Priority_Mapping_Manager_out::operator-> () { return this->ptr_; } @@ -206,7 +206,7 @@ TAO_Priority_Mapping_Manager::TAO_Priority_Mapping_Manager (RTCORBA::PriorityMap } ACE_INLINE RTCORBA::PriorityMapping * -TAO_Priority_Mapping_Manager::mapping (void) +TAO_Priority_Mapping_Manager::mapping () { return this->mapping_; } diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h index cc67413602e..57fabb889fe 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h @@ -39,7 +39,7 @@ public: /// Destructor virtual ~TAO_RT_Transport_Descriptor_Property (); - virtual TAO_RT_Transport_Descriptor_Property *duplicate (void) = 0; + virtual TAO_RT_Transport_Descriptor_Property *duplicate () = 0; virtual CORBA::Boolean is_equivalent (const TAO_RT_Transport_Descriptor_Property *other_prop) = 0; diff --git a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl index e2bc9763f4e..f1c575573cf 100644 --- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl +++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl @@ -2,14 +2,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_RT_Transport_Descriptor_Property::TAO_RT_Transport_Descriptor_Property (void) +TAO_RT_Transport_Descriptor_Property::TAO_RT_Transport_Descriptor_Property () : next_ (0) { } /*************************************************************************************************/ ACE_INLINE -TAO_RT_Transport_Descriptor_Private_Connection_Property::TAO_RT_Transport_Descriptor_Private_Connection_Property (void) +TAO_RT_Transport_Descriptor_Private_Connection_Property::TAO_RT_Transport_Descriptor_Private_Connection_Property () : object_id_ (-1) { } @@ -29,7 +29,7 @@ TAO_RT_Transport_Descriptor_Private_Connection_Property::init (long object_id) /*************************************************************************************************/ ACE_INLINE -TAO_RT_Transport_Descriptor_Banded_Connection_Property::TAO_RT_Transport_Descriptor_Banded_Connection_Property (void) +TAO_RT_Transport_Descriptor_Banded_Connection_Property::TAO_RT_Transport_Descriptor_Banded_Connection_Property () : low_priority_ (-1) , high_priority_ (-1) { diff --git a/TAO/tao/RTCORBA/Thread_Pool.inl b/TAO/tao/RTCORBA/Thread_Pool.inl index a08e0dffc39..8b37bbb0a0b 100644 --- a/TAO/tao/RTCORBA/Thread_Pool.inl +++ b/TAO/tao/RTCORBA/Thread_Pool.inl @@ -52,7 +52,7 @@ TAO_Thread_Lane::dynamic_threads () const ACE_INLINE TAO_Thread_Lane_Resources & -TAO_Thread_Lane::resources (void) +TAO_Thread_Lane::resources () { return this->resources_; } @@ -129,7 +129,7 @@ TAO_Thread_Pool::max_request_buffer_size () const ACE_INLINE TAO_Thread_Lane ** -TAO_Thread_Pool::lanes (void) +TAO_Thread_Pool::lanes () { return this->lanes_; } diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.h b/TAO/tao/RTScheduling/RTScheduler_Manager.h index 05aeab03674..9810a123198 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.h +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h @@ -72,10 +72,10 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Manager_var : private TAO_Base_var { public: - TAO_RTScheduler_Manager_var (void); // default constructor + TAO_RTScheduler_Manager_var (); // default constructor TAO_RTScheduler_Manager_var (TAO_RTScheduler_Manager_ptr); TAO_RTScheduler_Manager_var (const TAO_RTScheduler_Manager_var &); // copy constructor - ~TAO_RTScheduler_Manager_var (void); // destructor + ~TAO_RTScheduler_Manager_var (); // destructor TAO_RTScheduler_Manager_var &operator= (TAO_RTScheduler_Manager_ptr); TAO_RTScheduler_Manager_var &operator= (const TAO_RTScheduler_Manager_var &); diff --git a/TAO/tao/RTScheduling/RTScheduler_Manager.inl b/TAO/tao/RTScheduling/RTScheduler_Manager.inl index 7c8698b9c60..cefa3b75997 100644 --- a/TAO/tao/RTScheduling/RTScheduler_Manager.inl +++ b/TAO/tao/RTScheduling/RTScheduler_Manager.inl @@ -9,7 +9,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // ************************************************************* ACE_INLINE -TAO_RTScheduler_Manager_var::TAO_RTScheduler_Manager_var (void) +TAO_RTScheduler_Manager_var::TAO_RTScheduler_Manager_var () : ptr_ (TAO_RTScheduler_Manager::_nil ()) {} @@ -33,7 +33,7 @@ TAO_RTScheduler_Manager_var::TAO_RTScheduler_Manager_var ( {} ACE_INLINE -TAO_RTScheduler_Manager_var::~TAO_RTScheduler_Manager_var (void) +TAO_RTScheduler_Manager_var::~TAO_RTScheduler_Manager_var () { CORBA::release (this->ptr_); } @@ -83,13 +83,13 @@ TAO_RTScheduler_Manager_var::in () const } ACE_INLINE ::TAO_RTScheduler_Manager_ptr & -TAO_RTScheduler_Manager_var::inout (void) +TAO_RTScheduler_Manager_var::inout () { return this->ptr_; } ACE_INLINE ::TAO_RTScheduler_Manager_ptr & -TAO_RTScheduler_Manager_var::out (void) +TAO_RTScheduler_Manager_var::out () { CORBA::release (this->ptr_); this->ptr_ = ::TAO_RTScheduler_Manager::_nil (); @@ -97,7 +97,7 @@ TAO_RTScheduler_Manager_var::out (void) } ACE_INLINE ::TAO_RTScheduler_Manager_ptr -TAO_RTScheduler_Manager_var::_retn (void) +TAO_RTScheduler_Manager_var::_retn () { // yield ownership of managed obj reference ::TAO_RTScheduler_Manager_ptr val = this->ptr_; @@ -118,7 +118,7 @@ TAO_RTScheduler_Manager_var::release (TAO_RTScheduler_Manager_ptr p) } ACE_INLINE ::TAO_RTScheduler_Manager_ptr -TAO_RTScheduler_Manager_var::nil (void) +TAO_RTScheduler_Manager_var::nil () { return ::TAO_RTScheduler_Manager::_nil (); } @@ -192,13 +192,13 @@ TAO_RTScheduler_Manager_out::operator ::TAO_RTScheduler_Manager_ptr &() // cast } ACE_INLINE ::TAO_RTScheduler_Manager_ptr & -TAO_RTScheduler_Manager_out::ptr (void) // ptr +TAO_RTScheduler_Manager_out::ptr () // ptr { return this->ptr_; } ACE_INLINE ::TAO_RTScheduler_Manager_ptr -TAO_RTScheduler_Manager_out::operator-> (void) +TAO_RTScheduler_Manager_out::operator-> () { return this->ptr_; } @@ -211,7 +211,7 @@ TAO_RTScheduler_Manager::TAO_RTScheduler_Manager (TAO_ORB_Core* orb) } ACE_INLINE RTScheduling::Scheduler_ptr -TAO_RTScheduler_Manager::rtscheduler (void) +TAO_RTScheduler_Manager::rtscheduler () { return RTScheduling::Scheduler::_duplicate (this->rtscheduler_.in()); } diff --git a/TAO/tao/Refcounted_ObjectKey.inl b/TAO/tao/Refcounted_ObjectKey.inl index aef3dc53236..2b8449f3ec0 100644 --- a/TAO/tao/Refcounted_ObjectKey.inl +++ b/TAO/tao/Refcounted_ObjectKey.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void -TAO::Refcounted_ObjectKey::incr_refcount (void) +TAO::Refcounted_ObjectKey::incr_refcount () { ++this->refcount_; } @@ -14,7 +14,7 @@ TAO::Refcounted_ObjectKey::object_key () const } ACE_INLINE CORBA::ULong -TAO::Refcounted_ObjectKey::decr_refcount (void) +TAO::Refcounted_ObjectKey::decr_refcount () { if (--this->refcount_ > 0) { diff --git a/TAO/tao/Resume_Handle.inl b/TAO/tao/Resume_Handle.inl index bf3c8e973a2..af1a5ebb158 100644 --- a/TAO/tao/Resume_Handle.inl +++ b/TAO/tao/Resume_Handle.inl @@ -12,7 +12,7 @@ TAO_Resume_Handle::TAO_Resume_Handle (TAO_ORB_Core *orb_core, } ACE_INLINE -TAO_Resume_Handle::~TAO_Resume_Handle (void) +TAO_Resume_Handle::~TAO_Resume_Handle () { if (this->flag_ == TAO_HANDLE_RESUMABLE) this->resume_handle (); diff --git a/TAO/tao/Service_Context.inl b/TAO/tao/Service_Context.inl index f2cb3f6e078..12508008d02 100644 --- a/TAO/tao/Service_Context.inl +++ b/TAO/tao/Service_Context.inl @@ -2,13 +2,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Service_Context::TAO_Service_Context (void) +TAO_Service_Context::TAO_Service_Context () : service_context_ () { } ACE_INLINE IOP::ServiceContextList & -TAO_Service_Context::service_info (void) +TAO_Service_Context::service_info () { return this->service_context_; } diff --git a/TAO/tao/SmartProxies/Smart_Proxies.inl b/TAO/tao/SmartProxies/Smart_Proxies.inl index 3b181689cb5..23323281dd5 100644 --- a/TAO/tao/SmartProxies/Smart_Proxies.inl +++ b/TAO/tao/SmartProxies/Smart_Proxies.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Smart_Proxy_Base::TAO_Smart_Proxy_Base (void) +TAO_Smart_Proxy_Base::TAO_Smart_Proxy_Base () { } diff --git a/TAO/tao/Special_Basic_Argument_T.inl b/TAO/tao/Special_Basic_Argument_T.inl index 0fe4c12ecc3..2b64a08c261 100644 --- a/TAO/tao/Special_Basic_Argument_T.inl +++ b/TAO/tao/Special_Basic_Argument_T.inl @@ -53,7 +53,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void) +TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg () { return this->x_; } @@ -76,7 +76,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void) +TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg () { return this->x_; } @@ -89,7 +89,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>:: -Ret_Special_Basic_Argument_T (void) +Ret_Special_Basic_Argument_T () { } @@ -99,7 +99,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void) +TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg () { return this->x_; } @@ -110,7 +110,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::excp (void) +TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::excp () { return this->x_; } @@ -121,7 +121,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::retn (void) +TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::retn () { return this->x_; } diff --git a/TAO/tao/Storable_Base.h b/TAO/tao/Storable_Base.h index dc5a6422002..bc1e1d351c8 100644 --- a/TAO/tao/Storable_Base.h +++ b/TAO/tao/Storable_Base.h @@ -65,7 +65,7 @@ namespace TAO virtual int funlock (int whence, int start, int len) = 0; - virtual time_t last_changed(void) = 0; + virtual time_t last_changed() = 0; // Mimic a portion of the std::ios interface. We need to be able // to indicate error states from the extraction operators below. @@ -91,13 +91,13 @@ namespace TAO static ACE_CString state_as_string (Storable_State state); - virtual void rewind (void) = 0; + virtual void rewind () = 0; - virtual bool flush (void) = 0; + virtual bool flush () = 0; /// Force write of storable data to storage. /// Returns 0 on success, otherwise EOF - virtual int sync (void) = 0; + virtual int sync () = 0; virtual Storable_Base& operator << (const ACE_CString&) = 0; virtual Storable_Base& operator >> (ACE_CString&) = 0; diff --git a/TAO/tao/Strategies/DIOP_Acceptor.inl b/TAO/tao/Strategies/DIOP_Acceptor.inl index 88346814360..b7ea67f1218 100644 --- a/TAO/tao/Strategies/DIOP_Acceptor.inl +++ b/TAO/tao/Strategies/DIOP_Acceptor.inl @@ -15,7 +15,7 @@ TAO_DIOP_Acceptor::address () const } ACE_INLINE const ACE_INET_Addr * -TAO_DIOP_Acceptor::endpoints (void) +TAO_DIOP_Acceptor::endpoints () { ACE_ASSERT (this->addrs_ != 0); diff --git a/TAO/tao/Strategies/DIOP_Endpoint.h b/TAO/tao/Strategies/DIOP_Endpoint.h index ead5690cc3d..cc3a2e8af6a 100644 --- a/TAO/tao/Strategies/DIOP_Endpoint.h +++ b/TAO/tao/Strategies/DIOP_Endpoint.h @@ -65,7 +65,7 @@ public: CORBA::Short priority); /// Destructor. - ~TAO_DIOP_Endpoint (void) = default; + ~TAO_DIOP_Endpoint () = default; /** * @name TAO_Endpoint Methods diff --git a/TAO/tao/Strategies/DIOP_Factory.h b/TAO/tao/Strategies/DIOP_Factory.h index 1dbab86231a..b30659f7d8d 100644 --- a/TAO/tao/Strategies/DIOP_Factory.h +++ b/TAO/tao/Strategies/DIOP_Factory.h @@ -39,7 +39,7 @@ public: TAO_DIOP_Protocol_Factory (); /// Destructor. - virtual ~TAO_DIOP_Protocol_Factory (void) = default; + virtual ~TAO_DIOP_Protocol_Factory () = default; // = Service Configurator hooks. /// Dynamic linking hook diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.inl b/TAO/tao/Strategies/SCIOP_Acceptor.inl index 840862e2710..86cc2f06e57 100644 --- a/TAO/tao/Strategies/SCIOP_Acceptor.inl +++ b/TAO/tao/Strategies/SCIOP_Acceptor.inl @@ -15,7 +15,7 @@ TAO_SCIOP_Acceptor::address () const } ACE_INLINE const ACE_INET_Addr * -TAO_SCIOP_Acceptor::endpoints (void) +TAO_SCIOP_Acceptor::endpoints () { ACE_ASSERT (this->addrs_ != 0); diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.h b/TAO/tao/Strategies/SCIOP_Endpoint.h index e62e0601f05..0ea264db14b 100644 --- a/TAO/tao/Strategies/SCIOP_Endpoint.h +++ b/TAO/tao/Strategies/SCIOP_Endpoint.h @@ -68,7 +68,7 @@ public: CORBA::Short priority); /// Destructor. - ~TAO_SCIOP_Endpoint (void) = default; + ~TAO_SCIOP_Endpoint () = default; // = Implementation of abstract TAO_Endpoint methods. See // Endpoint.h for their documentation. diff --git a/TAO/tao/Stub.inl b/TAO/tao/Stub.inl index b02fff98755..30c4653160b 100644 --- a/TAO/tao/Stub.inl +++ b/TAO/tao/Stub.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE void -TAO_Stub::reset_base (void) +TAO_Stub::reset_base () { this->base_profiles_.rewind (); this->profile_success_ = false; @@ -21,7 +21,7 @@ TAO_Stub::profile_lock () const } ACE_INLINE void -TAO_Stub::reset_forward (void) +TAO_Stub::reset_forward () { while (this->forward_profiles_ != 0 && this->forward_profiles_ != this->forward_profiles_perm_) // Disturbingly the permanent @@ -31,7 +31,7 @@ TAO_Stub::reset_forward (void) } ACE_INLINE void -TAO_Stub::reset_profiles_i (void) +TAO_Stub::reset_profiles_i () { this->reset_forward (); this->reset_base (); @@ -49,7 +49,7 @@ TAO_Stub::reset_profiles_i (void) } ACE_INLINE void -TAO_Stub::reset_profiles (void) +TAO_Stub::reset_profiles () { ACE_MT (ACE_GUARD (TAO_SYNCH_MUTEX, guard, @@ -66,13 +66,13 @@ TAO_Stub::reset_profiles (void) } ACE_INLINE TAO_Profile * -TAO_Stub::profile_in_use (void) +TAO_Stub::profile_in_use () { return this->profile_in_use_; } ACE_INLINE TAO_MProfile * -TAO_Stub::make_profiles (void) +TAO_Stub::make_profiles () { TAO_MProfile *mp = 0; @@ -84,7 +84,7 @@ TAO_Stub::make_profiles (void) } ACE_INLINE TAO_Profile * -TAO_Stub::next_forward_profile (void) +TAO_Stub::next_forward_profile () { TAO_Profile *pfile_next = 0; @@ -99,7 +99,7 @@ TAO_Stub::next_forward_profile (void) } ACE_INLINE TAO_Profile * -TAO_Stub::next_profile_i (void) +TAO_Stub::next_profile_i () { TAO_Profile *pfile_next = 0; @@ -181,7 +181,7 @@ TAO_Stub::next_profile_i (void) } ACE_INLINE TAO_Profile * -TAO_Stub::next_profile (void) +TAO_Stub::next_profile () { ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -196,13 +196,13 @@ TAO_Stub::next_profile (void) } ACE_INLINE CORBA::Boolean -TAO_Stub::valid_forward_profile (void) +TAO_Stub::valid_forward_profile () { return (this->profile_success_ && this->forward_profiles_); } ACE_INLINE void -TAO_Stub::set_valid_profile (void) +TAO_Stub::set_valid_profile () { this->profile_success_ = true; } @@ -240,7 +240,7 @@ TAO_Stub::base_profiles (const TAO_MProfile &mprofiles) } ACE_INLINE CORBA::Boolean -TAO_Stub::next_profile_retry (void) +TAO_Stub::next_profile_retry () { ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -280,7 +280,7 @@ TAO_Stub::base_profiles () const } ACE_INLINE TAO_MProfile& -TAO_Stub::base_profiles (void) +TAO_Stub::base_profiles () { return this->base_profiles_; } @@ -292,7 +292,7 @@ TAO_Stub::forward_profiles () const } ACE_INLINE TAO_MProfile * -TAO_Stub::forward_profiles (void) +TAO_Stub::forward_profiles () { return this->forward_profiles_; } @@ -310,14 +310,14 @@ TAO_Stub::orb_core () const } ACE_INLINE CORBA::ORB_var & -TAO_Stub::servant_orb_var (void) +TAO_Stub::servant_orb_var () { // Simply pass back the ORB pointer for temporary use. return this->servant_orb_; } ACE_INLINE CORBA::ORB_ptr -TAO_Stub::servant_orb_ptr (void) +TAO_Stub::servant_orb_ptr () { // Simply pass back the ORB pointer for temporary use. return CORBA::ORB::_duplicate (this->servant_orb_.in ()); @@ -354,7 +354,7 @@ TAO_Stub::object_proxy_broker (TAO::Object_Proxy_Broker * object_proxy_broker) } ACE_INLINE void -TAO_Stub::destroy (void) +TAO_Stub::destroy () { // The reference count better be zero at this point! delete this; @@ -367,7 +367,7 @@ TAO_Stub::optimize_collocation_objects () const } ACE_INLINE TAO::Transport_Queueing_Strategy * -TAO_Stub::transport_queueing_strategy (void) +TAO_Stub::transport_queueing_strategy () { #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1) @@ -398,14 +398,14 @@ bool TAO_Stub::forwarded_on_exception () const ACE_INLINE void -TAO_Stub::_incr_refcnt (void) +TAO_Stub::_incr_refcnt () { ++this->refcount_; } ACE_INLINE void -TAO_Stub::_decr_refcnt (void) +TAO_Stub::_decr_refcnt () { if (--this->refcount_ == 0) delete this; @@ -436,7 +436,7 @@ TAO_Stub_Auto_Ptr::get () const } ACE_INLINE TAO_Stub * -TAO_Stub_Auto_Ptr::release (void) +TAO_Stub_Auto_Ptr::release () { ACE_TRACE ("TAO_Stub_Auto_Ptr::release"); TAO_Stub *old = this->p_; @@ -479,7 +479,7 @@ TAO_Stub_Auto_Ptr::operator= (TAO_Stub_Auto_Ptr &rhs) } ACE_INLINE -TAO_Stub_Auto_Ptr::~TAO_Stub_Auto_Ptr (void) +TAO_Stub_Auto_Ptr::~TAO_Stub_Auto_Ptr () { ACE_TRACE ("TAO_Stub_Auto_Ptr::~TAO_Stub_Auto_Ptr"); if (this->get() != nullptr) diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp index 486f1cf2eed..f8aa2c5beec 100644 --- a/TAO/tao/SystemException.cpp +++ b/TAO/tao/SystemException.cpp @@ -912,7 +912,7 @@ TAO::excp_factory excp_array [] = { // Concrete SystemException constructors #define TAO_SYSTEM_EXCEPTION(name) \ -CORBA::name ::name (void) \ +CORBA::name ::name () \ : CORBA::SystemException ("IDL:omg.org/CORBA/" #name ":1.0", \ #name, \ 0, \ @@ -989,7 +989,7 @@ STANDARD_EXCEPTION_LIST #define TAO_SYSTEM_EXCEPTION(name) \ CORBA::SystemException * \ -CORBA::name ::_tao_create (void) \ +CORBA::name ::_tao_create () \ { \ CORBA::name *result = 0; \ ACE_NEW_RETURN (result, CORBA::name (), 0); \ diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h index 21909c5383b..1aeb7636e07 100644 --- a/TAO/tao/SystemException.h +++ b/TAO/tao/SystemException.h @@ -176,7 +176,7 @@ namespace CORBA class TAO_Export name : public SystemException \ { \ public: \ - name (void); \ + name (); \ name (CORBA::ULong code, \ CORBA::CompletionStatus completed); \ static name * _downcast (CORBA::Exception* exception); \ @@ -185,7 +185,7 @@ namespace CORBA virtual CORBA::TypeCode_ptr _tao_type () const; \ static void _tao_any_destructor (void*); \ virtual CORBA::Exception *_tao_duplicate () const; \ - static CORBA::SystemException *_tao_create (void); \ + static CORBA::SystemException *_tao_create (); \ }; \ TAO_SYSTEM_EXCEPTION(UNKNOWN) // the unknown exception diff --git a/TAO/tao/TAO_Server_Request.inl b/TAO/tao/TAO_Server_Request.inl index 8b9a1519556..b7feb853996 100644 --- a/TAO/tao/TAO_Server_Request.inl +++ b/TAO/tao/TAO_Server_Request.inl @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // This constructor is used by the CSD clone. ACE_INLINE -TAO_ServerRequest::TAO_ServerRequest (void) +TAO_ServerRequest::TAO_ServerRequest () : mesg_base_ (0), operation_ (0), operation_len_ (0), @@ -98,7 +98,7 @@ TAO_ServerRequest::response_expected (CORBA::Boolean response) } ACE_INLINE void -TAO_ServerRequest::sync_before_dispatch (void) +TAO_ServerRequest::sync_before_dispatch () { if (this->sync_with_server_ && this->transport_ != 0 && @@ -109,7 +109,7 @@ TAO_ServerRequest::sync_before_dispatch (void) } ACE_INLINE void -TAO_ServerRequest::sync_after_dispatch (void) +TAO_ServerRequest::sync_after_dispatch () { if (this->sync_with_server_ && this->transport_ != 0 && @@ -144,37 +144,37 @@ TAO_ServerRequest::is_queued (CORBA::Boolean queued_flag) } ACE_INLINE TAO::ObjectKey & -TAO_ServerRequest::object_key (void) +TAO_ServerRequest::object_key () { return this->profile_.object_key (); } ACE_INLINE TAO_Service_Context & -TAO_ServerRequest::request_service_context (void) +TAO_ServerRequest::request_service_context () { return this->request_service_context_; } ACE_INLINE IOP::ServiceContextList & -TAO_ServerRequest::reply_service_info (void) +TAO_ServerRequest::reply_service_info () { return this->reply_service_context ().service_info (); } ACE_INLINE IOP::ServiceContextList & -TAO_ServerRequest::request_service_info (void) +TAO_ServerRequest::request_service_info () { return this->request_service_context ().service_info (); } ACE_INLINE TAO_Transport * -TAO_ServerRequest::transport (void) +TAO_ServerRequest::transport () { return this->transport_.get (); } ACE_INLINE CORBA::ULong -TAO_ServerRequest::request_id (void) +TAO_ServerRequest::request_id () { return this->request_id_; } @@ -192,7 +192,7 @@ TAO_ServerRequest::requesting_principal (const CORBA::OctetSeq &principal) } ACE_INLINE TAO_Tagged_Profile & -TAO_ServerRequest::profile (void) +TAO_ServerRequest::profile () { return this->profile_; } @@ -206,7 +206,7 @@ TAO_ServerRequest::forward_location (CORBA::Object_ptr forward_reference) } ACE_INLINE CORBA::Object_ptr -TAO_ServerRequest::forward_location (void) +TAO_ServerRequest::forward_location () { return CORBA::Object::_duplicate (this->forward_location_.in ()); } @@ -218,7 +218,7 @@ TAO_ServerRequest::is_forwarded () const } ACE_INLINE GIOP::ReplyStatusType -TAO_ServerRequest::reply_status (void) +TAO_ServerRequest::reply_status () { return this->reply_status_; } @@ -230,7 +230,7 @@ TAO_ServerRequest::reply_status (GIOP::ReplyStatusType reply_status) } ACE_INLINE void -TAO_ServerRequest::is_dsi (void) +TAO_ServerRequest::is_dsi () { this->is_dsi_ = true; } @@ -248,7 +248,7 @@ TAO_ServerRequest::dsi_nvlist_align (ptrdiff_t alignment) } ACE_INLINE CORBA::Boolean -TAO_ServerRequest::argument_flag (void) +TAO_ServerRequest::argument_flag () { return this->argument_flag_; } @@ -268,13 +268,13 @@ TAO_ServerRequest::collocated () const #if TAO_HAS_INTERCEPTORS == 1 ACE_INLINE size_t & -TAO_ServerRequest::interceptor_count (void) +TAO_ServerRequest::interceptor_count () { return this->interceptor_count_; } ACE_INLINE CORBA::Exception * -TAO_ServerRequest::caught_exception (void) +TAO_ServerRequest::caught_exception () { return this->caught_exception_; } @@ -286,7 +286,7 @@ TAO_ServerRequest::pi_reply_status (PortableInterceptor::ReplyStatus s) } ACE_INLINE PortableInterceptor::ReplyStatus -TAO_ServerRequest::pi_reply_status (void) +TAO_ServerRequest::pi_reply_status () { return this->pi_reply_status_; } diff --git a/TAO/tao/TAO_Singleton.inl b/TAO/tao/TAO_Singleton.inl index 530fc7ce38c..5bf773cd6ae 100644 --- a/TAO/tao/TAO_Singleton.inl +++ b/TAO/tao/TAO_Singleton.inl @@ -8,12 +8,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // have a default constructor. Let the compiler figure it out . . . template <class TYPE, class ACE_LOCK> ACE_INLINE -TAO_Singleton<TYPE, ACE_LOCK>::TAO_Singleton (void) +TAO_Singleton<TYPE, ACE_LOCK>::TAO_Singleton () { } template <class TYPE, class ACE_LOCK> ACE_INLINE -TAO_TSS_Singleton<TYPE, ACE_LOCK>::TAO_TSS_Singleton (void) +TAO_TSS_Singleton<TYPE, ACE_LOCK>::TAO_TSS_Singleton () { } diff --git a/TAO/tao/Tagged_Components.inl b/TAO/tao/Tagged_Components.inl index 00332ee2d49..36547daa148 100644 --- a/TAO/tao/Tagged_Components.inl +++ b/TAO/tao/Tagged_Components.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Tagged_Components::TAO_Tagged_Components (void) +TAO_Tagged_Components::TAO_Tagged_Components () : orb_type_ (0), orb_type_set_ (0), code_sets_set_ (0) @@ -71,7 +71,7 @@ TAO_Tagged_Components::unique_tag (IOP::ComponentId tag) const } ACE_INLINE IOP::MultipleComponentProfile& -TAO_Tagged_Components::components (void) +TAO_Tagged_Components::components () { return this->components_; } diff --git a/TAO/tao/Tagged_Profile.inl b/TAO/tao/Tagged_Profile.inl index 683ead394da..1122f0402eb 100644 --- a/TAO/tao/Tagged_Profile.inl +++ b/TAO/tao/Tagged_Profile.inl @@ -15,7 +15,7 @@ TAO_Tagged_Profile::TAO_Tagged_Profile (TAO_ORB_Core *orb_core) } ACE_INLINE TAO::ObjectKey & -TAO_Tagged_Profile::object_key (void) +TAO_Tagged_Profile::object_key () { if (!this->object_key_extracted_) this->object_key_extracted_ = this->extract_object_key (this->profile_); diff --git a/TAO/tao/Time_Policy_Strategy.h b/TAO/tao/Time_Policy_Strategy.h index e9e5aaef573..2322ffa5a2e 100644 --- a/TAO/tao/Time_Policy_Strategy.h +++ b/TAO/tao/Time_Policy_Strategy.h @@ -42,11 +42,11 @@ class TAO_Export TAO_Time_Policy_Strategy public: virtual ~TAO_Time_Policy_Strategy () {} - virtual ACE_Timer_Queue * create_timer_queue (void) = 0; + virtual ACE_Timer_Queue * create_timer_queue () = 0; virtual void destroy_timer_queue (ACE_Timer_Queue *tmq) = 0; - virtual ACE_Dynamic_Time_Policy_Base * get_time_policy (void) = 0; + virtual ACE_Dynamic_Time_Policy_Base * get_time_policy () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl index cadf737ec18..fa95a606d0a 100644 --- a/TAO/tao/Transport.inl +++ b/TAO/tao/Transport.inl @@ -57,7 +57,7 @@ TAO_Transport::opened_as (TAO::Connection_Role role) } ACE_INLINE TAO::Transport_Cache_Manager::HASH_MAP_ENTRY * -TAO_Transport::cache_map_entry (void) +TAO_Transport::cache_map_entry () { return this->cache_map_entry_; } @@ -100,7 +100,7 @@ TAO_Transport::id (size_t id) } ACE_INLINE bool -TAO_Transport::queue_is_empty (void) +TAO_Transport::queue_is_empty () { ACE_GUARD_RETURN (ACE_Lock, ace_mon, @@ -116,14 +116,14 @@ TAO_Transport::flush_timer_pending () const } ACE_INLINE void -TAO_Transport::reset_flush_timer (void) +TAO_Transport::reset_flush_timer () { this->flush_timer_id_ = -1; this->current_deadline_ = ACE_Time_Value::zero; } ACE_INLINE TAO_GIOP_Message_Base * -TAO_Transport::messaging_object (void) +TAO_Transport::messaging_object () { return this->messaging_object_; } @@ -185,7 +185,7 @@ TAO_Transport::is_connected () const } ACE_INLINE TAO_Connection_Handler * -TAO_Transport::connection_handler (void) +TAO_Transport::connection_handler () { return this->connection_handler_i(); } @@ -289,7 +289,7 @@ TAO::Transport::Stats::opened_since () const #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */ ACE_INLINE int -TAO_Transport::notify_reactor (void) +TAO_Transport::notify_reactor () { if (!this->ws_->is_registered ()) { diff --git a/TAO/tao/Transport_Connector.h b/TAO/tao/Transport_Connector.h index 4cb153f66b1..ed1b61d819c 100644 --- a/TAO/tao/Transport_Connector.h +++ b/TAO/tao/Transport_Connector.h @@ -86,7 +86,7 @@ public: virtual int open (TAO_ORB_Core *orb_core) = 0; /// Shutdown Connector bridge and concrete Connector. - virtual int close (void) = 0; + virtual int close () = 0; /** * To support pluggable we need to abstract away the details of the @@ -121,7 +121,7 @@ protected: virtual int supports_parallel_connects () const; /// Create a profile with a given endpoint. - virtual TAO_Profile *make_profile (void) = 0; + virtual TAO_Profile *make_profile () = 0; /// Set and validate endpoint. We need to do this to initialize our /// remote *_Addr's which have not been done during IOR decode. diff --git a/TAO/tao/Transport_Connector.inl b/TAO/tao/Transport_Connector.inl index 802e7bfdf1f..7cb887f5a9c 100644 --- a/TAO/tao/Transport_Connector.inl +++ b/TAO/tao/Transport_Connector.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE TAO_ORB_Core * -TAO_Connector::orb_core (void) +TAO_Connector::orb_core () { return this->orb_core_; } diff --git a/TAO/tao/Transport_Descriptor_Interface.h b/TAO/tao/Transport_Descriptor_Interface.h index 45561221ee4..e05a3f035cf 100644 --- a/TAO/tao/Transport_Descriptor_Interface.h +++ b/TAO/tao/Transport_Descriptor_Interface.h @@ -50,7 +50,7 @@ public: /// This call allocates and copies the contents of this class and /// returns the pointer - virtual TAO_Transport_Descriptor_Interface *duplicate (void) = 0; + virtual TAO_Transport_Descriptor_Interface *duplicate () = 0; /// Try to determine if this object is same as the @a other_prop. virtual CORBA::Boolean is_equivalent ( diff --git a/TAO/tao/Transport_Descriptor_Interface.inl b/TAO/tao/Transport_Descriptor_Interface.inl index 53a1cf35bf1..579af9390f5 100644 --- a/TAO/tao/Transport_Descriptor_Interface.inl +++ b/TAO/tao/Transport_Descriptor_Interface.inl @@ -13,7 +13,7 @@ TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface ( } ACE_INLINE -TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface (void) +TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface () : endpoint_ (0), bidir_flag_ (false), release_ (false) @@ -22,7 +22,7 @@ TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface (void) ACE_INLINE TAO_Endpoint * -TAO_Transport_Descriptor_Interface::endpoint (void) +TAO_Transport_Descriptor_Interface::endpoint () { return this->endpoint_; } diff --git a/TAO/tao/UB_String_Argument_T.inl b/TAO/tao/UB_String_Argument_T.inl index 957afc63702..aac13e1880b 100644 --- a/TAO/tao/UB_String_Argument_T.inl +++ b/TAO/tao/UB_String_Argument_T.inl @@ -43,7 +43,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& -TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::arg (void) +TAO::Inout_UB_String_Argument_T<S_var,Insert_Policy>::arg () { return this->x_; } @@ -62,7 +62,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& -TAO::Out_UB_String_Argument_T<S_var,Insert_Policy>::arg (void) +TAO::Out_UB_String_Argument_T<S_var,Insert_Policy>::arg () { return this->x_; } @@ -72,7 +72,7 @@ TAO::Out_UB_String_Argument_T<S_var,Insert_Policy>::arg (void) template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE -TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::Ret_UB_String_Argument_T (void) +TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::Ret_UB_String_Argument_T () { } @@ -80,7 +80,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type *& -TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::arg (void) +TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::arg () { return this->x_.out (); } @@ -89,7 +89,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type * -TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::excp (void) +TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::excp () { return this->x_.ptr (); } @@ -98,7 +98,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_var::s_traits::char_type * -TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::retn (void) +TAO::Ret_UB_String_Argument_T<S_var,Insert_Policy>::retn () { return this->x_._retn (); } diff --git a/TAO/tao/UserException.inl b/TAO/tao/UserException.inl index 3bba257dd04..0596a2fcd0e 100644 --- a/TAO/tao/UserException.inl +++ b/TAO/tao/UserException.inl @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -CORBA::UserException::UserException (void) +CORBA::UserException::UserException () { } diff --git a/TAO/tao/Var_Array_Argument_T.inl b/TAO/tao/Var_Array_Argument_T.inl index 8b2fd7d0529..29f634049a2 100644 --- a/TAO/tao/Var_Array_Argument_T.inl +++ b/TAO/tao/Var_Array_Argument_T.inl @@ -43,7 +43,7 @@ template<typename S_forany, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type * -TAO::Inout_Var_Array_Argument_T<S_forany,Insert_Policy>::arg (void) +TAO::Inout_Var_Array_Argument_T<S_forany,Insert_Policy>::arg () { return this->x_.inout (); } @@ -65,7 +65,7 @@ template<typename S_out, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type *& -TAO::Out_Var_Array_Argument_T<S_out,S_forany,Insert_Policy>::arg (void) +TAO::Out_Var_Array_Argument_T<S_out,S_forany,Insert_Policy>::arg () { return this->x_; } @@ -77,7 +77,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>:: -Ret_Var_Array_Argument_T (void) +Ret_Var_Array_Argument_T () {} template<typename S_var, @@ -85,7 +85,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type *& -TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::arg (void) +TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::arg () { return this->x_.out (); } @@ -95,7 +95,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type * -TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::excp (void) +TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::excp () { return this->x_.ptr (); } @@ -105,7 +105,7 @@ template<typename S_var, template <typename> class Insert_Policy> ACE_INLINE typename S_forany::_slice_type * -TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::retn (void) +TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::retn () { return this->x_._retn (); } diff --git a/TAO/tao/Var_Size_Argument_T.inl b/TAO/tao/Var_Size_Argument_T.inl index 82cb065b1de..d82ceea4184 100644 --- a/TAO/tao/Var_Size_Argument_T.inl +++ b/TAO/tao/Var_Size_Argument_T.inl @@ -40,7 +40,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::arg (void) +TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::arg () { return *this->x_; } @@ -60,7 +60,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S *& -TAO::Out_Var_Size_Argument_T<S,Insert_Policy>::arg (void) +TAO::Out_Var_Size_Argument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -70,7 +70,7 @@ TAO::Out_Var_Size_Argument_T<S,Insert_Policy>::arg (void) template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::Ret_Var_Size_Argument_T (void) +TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::Ret_Var_Size_Argument_T () { } @@ -78,7 +78,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S *& -TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::arg (void) +TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::arg () { return this->x_.out (); } @@ -87,7 +87,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S * -TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::excp (void) +TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::excp () { return this->x_.ptr (); } @@ -96,7 +96,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S * -TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::retn (void) +TAO::Ret_Var_Size_Argument_T<S,Insert_Policy>::retn () { return this->x_._retn (); } diff --git a/TAO/tao/Vector_Argument_T.inl b/TAO/tao/Vector_Argument_T.inl index ced1dda2f53..ad9ca1feae6 100644 --- a/TAO/tao/Vector_Argument_T.inl +++ b/TAO/tao/Vector_Argument_T.inl @@ -69,7 +69,7 @@ TAO::Out_Vector_Argument_T<S,Insert_Policy>::arg () template<typename S, template <typename> class Insert_Policy> ACE_INLINE -TAO::Ret_Vector_Argument_T<S,Insert_Policy>::Ret_Vector_Argument_T (void) +TAO::Ret_Vector_Argument_T<S,Insert_Policy>::Ret_Vector_Argument_T () { } @@ -77,7 +77,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S & -TAO::Ret_Vector_Argument_T<S,Insert_Policy>::arg (void) +TAO::Ret_Vector_Argument_T<S,Insert_Policy>::arg () { return this->x_; } @@ -86,7 +86,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::Ret_Vector_Argument_T<S,Insert_Policy>::excp (void) +TAO::Ret_Vector_Argument_T<S,Insert_Policy>::excp () { return this->x_; } @@ -95,7 +95,7 @@ template<typename S, template <typename> class Insert_Policy> ACE_INLINE S -TAO::Ret_Vector_Argument_T<S,Insert_Policy>::retn (void) +TAO::Ret_Vector_Argument_T<S,Insert_Policy>::retn () { return this->x_; } diff --git a/TAO/tao/operation_details.inl b/TAO/tao/operation_details.inl index 3db521b5de2..b1cc3fa16c9 100644 --- a/TAO/tao/operation_details.inl +++ b/TAO/tao/operation_details.inl @@ -71,7 +71,7 @@ TAO_Operation_Details::in_argument_flag () const #endif // TAO_IGNORE_IN_ARGS ACE_INLINE TAO_Service_Context & -TAO_Operation_Details::request_service_context (void) +TAO_Operation_Details::request_service_context () { return this->request_service_info_; } @@ -83,7 +83,7 @@ TAO_Operation_Details::request_service_context () const } ACE_INLINE IOP::ServiceContextList & -TAO_Operation_Details::request_service_info (void) +TAO_Operation_Details::request_service_info () { return this->request_service_context ().service_info (); } @@ -95,7 +95,7 @@ TAO_Operation_Details::request_service_info () const } ACE_INLINE TAO_Service_Context & -TAO_Operation_Details::reply_service_context (void) +TAO_Operation_Details::reply_service_context () { return this->reply_service_info_; } @@ -107,7 +107,7 @@ TAO_Operation_Details::reply_service_context () const } ACE_INLINE IOP::ServiceContextList & -TAO_Operation_Details::reply_service_info (void) +TAO_Operation_Details::reply_service_info () { return this->reply_service_context ().service_info (); } @@ -119,12 +119,12 @@ TAO_Operation_Details::reply_service_info () const } ACE_INLINE void -TAO_Operation_Details::reset_request_service_info (void) +TAO_Operation_Details::reset_request_service_info () { this->request_service_context ().service_info ().length (0); } ACE_INLINE void -TAO_Operation_Details::reset_reply_service_info (void) +TAO_Operation_Details::reset_reply_service_info () { this->reply_service_context ().service_info ().length (0); } diff --git a/TAO/tao/params.inl b/TAO/tao/params.inl index e2ede8c30bf..2d5dcd6632c 100644 --- a/TAO/tao/params.inl +++ b/TAO/tao/params.inl @@ -161,7 +161,7 @@ TAO_ORB_Parameters::nodelay (int x) } ACE_INLINE int -TAO_ORB_Parameters::sock_keepalive (void) +TAO_ORB_Parameters::sock_keepalive () { return this->sock_keepalive_; } @@ -173,7 +173,7 @@ TAO_ORB_Parameters::sock_keepalive (int x) } ACE_INLINE int -TAO_ORB_Parameters::sock_dontroute (void) +TAO_ORB_Parameters::sock_dontroute () { return this->sock_dontroute_; } @@ -185,7 +185,7 @@ TAO_ORB_Parameters::sock_dontroute (int x) } ACE_INLINE int -TAO_ORB_Parameters::ip_hoplimit (void) +TAO_ORB_Parameters::ip_hoplimit () { return this->ip_hoplimit_; } @@ -197,7 +197,7 @@ TAO_ORB_Parameters::ip_hoplimit (int x) } ACE_INLINE bool -TAO_ORB_Parameters::ip_multicastloop (void) +TAO_ORB_Parameters::ip_multicastloop () { return this->ip_multicastloop_; } @@ -209,7 +209,7 @@ TAO_ORB_Parameters::ip_multicastloop (bool x) } ACE_INLINE u_short -TAO_ORB_Parameters::iiop_client_port_base (void) +TAO_ORB_Parameters::iiop_client_port_base () { return this->iiop_client_port_base_; } @@ -221,7 +221,7 @@ TAO_ORB_Parameters::iiop_client_port_base (u_short b) } ACE_INLINE u_short -TAO_ORB_Parameters::iiop_client_port_span (void) +TAO_ORB_Parameters::iiop_client_port_span () { return this->iiop_client_port_base_ ? this->iiop_client_port_span_ : 0; diff --git a/TAO/tao/target_specification.inl b/TAO/tao/target_specification.inl index cd58417e335..0dbefafc9d4 100644 --- a/TAO/tao/target_specification.inl +++ b/TAO/tao/target_specification.inl @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Target_Specification::TAO_Target_Specification (void) +TAO_Target_Specification::TAO_Target_Specification () :specifier_ (TAO_Target_Specification::Key_Addr), profile_index_ (0) { @@ -46,7 +46,7 @@ TAO_Target_Specification::target_specifier (IOP::IOR &ior, } ACE_INLINE const TAO::ObjectKey* -TAO_Target_Specification::object_key (void) +TAO_Target_Specification::object_key () { if (this->specifier_ == TAO_Target_Specification::Key_Addr) return this->u_.object_key_; @@ -55,7 +55,7 @@ TAO_Target_Specification::object_key (void) } ACE_INLINE const IOP::TaggedProfile * -TAO_Target_Specification::profile (void) +TAO_Target_Specification::profile () { if (this->specifier_ == TAO_Target_Specification::Profile_Addr) return this->u_.profile_; @@ -77,7 +77,7 @@ TAO_Target_Specification::iop_ior (IOP::IOR *& ior) } ACE_INLINE TAO_Target_Specification::TAO_Target_Address -TAO_Target_Specification::specifier (void) +TAO_Target_Specification::specifier () { return this->specifier_; } diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp index fd015614963..c3354567841 100644 --- a/TAO/tests/AMI/simple_client.cpp +++ b/TAO/tests/AMI/simple_client.cpp @@ -61,10 +61,10 @@ class Handler : public POA_A::AMI_AMI_TestHandler { public: /// Constructor. - Handler (void) {}; + Handler () {}; /// Destructor. - ~Handler (void) {}; + ~Handler () {}; void foo (CORBA::Long ami_return_val, CORBA::Long out_l) diff --git a/TAO/tests/Big_AMI/client.cpp b/TAO/tests/Big_AMI/client.cpp index 9824af20cbb..1c9c80b7f6d 100644 --- a/TAO/tests/Big_AMI/client.cpp +++ b/TAO/tests/Big_AMI/client.cpp @@ -65,10 +65,10 @@ class Handler : public POA_A::AMI_AMI_TestHandler { public: /// Constructor. - Handler (void) : reply_count_ (0) {}; + Handler () : reply_count_ (0) {}; /// Destructor. - ~Handler (void) {}; + ~Handler () {}; /// Get the reply count long reply_count () const diff --git a/TAO/tests/Bug_1869_Regression/server.cpp b/TAO/tests/Bug_1869_Regression/server.cpp index fbb775191cc..946f04972ab 100644 --- a/TAO/tests/Bug_1869_Regression/server.cpp +++ b/TAO/tests/Bug_1869_Regression/server.cpp @@ -4,9 +4,9 @@ class AdderServant : public POA_AMI_test::adder { public: - AdderServant (void) {} + AdderServant () {} - virtual ~AdderServant (void) {} + virtual ~AdderServant () {} virtual CORBA::Long add ( diff --git a/TAO/tests/Bug_2356_Regression/client.cpp b/TAO/tests/Bug_2356_Regression/client.cpp index d7531e925e7..fe960ccee5f 100644 --- a/TAO/tests/Bug_2356_Regression/client.cpp +++ b/TAO/tests/Bug_2356_Regression/client.cpp @@ -54,10 +54,10 @@ class Handler : public POA_A::AMI_AMI_TestHandler { public: /// Constructor. - Handler (void) {}; + Handler () {}; /// Destructor. - ~Handler (void) {}; + ~Handler () {}; void foo () { diff --git a/TAO/tests/Bug_2375_Regression/test.cpp b/TAO/tests/Bug_2375_Regression/test.cpp index c7a97c174ca..f3f7da7d409 100644 --- a/TAO/tests/Bug_2375_Regression/test.cpp +++ b/TAO/tests/Bug_2375_Regression/test.cpp @@ -2,7 +2,7 @@ class MyTestValuetypeFactory : public TestValuetype_init { public: virtual TestValuetype* create (::CORBA::Boolean, ::CORBA::Short) {return 0;}; - virtual TAO_OBV_CREATE_RETURN_TYPE (TestValuetype) create_for_unmarshal (void) {return 0;}; + virtual TAO_OBV_CREATE_RETURN_TYPE (TestValuetype) create_for_unmarshal () {return 0;}; }; int ACE_TMAIN (int, ACE_TCHAR *[]) { MyTestValuetypeFactory myFactory; diff --git a/TAO/tests/Bug_2429_Regression/client.cpp b/TAO/tests/Bug_2429_Regression/client.cpp index c9c57ac2e8b..b2714df57a5 100644 --- a/TAO/tests/Bug_2429_Regression/client.cpp +++ b/TAO/tests/Bug_2429_Regression/client.cpp @@ -57,7 +57,7 @@ class Reply_Handler } } - CORBA::ULong reply_count (void) { return parentMethod_count + parentMethod_excep_count; }; + CORBA::ULong reply_count () { return parentMethod_count + parentMethod_excep_count; }; private: // Count of replies and excep diff --git a/TAO/tests/Bug_2669_Regression/client.cpp b/TAO/tests/Bug_2669_Regression/client.cpp index 009ca878c1e..be0d2e2de81 100644 --- a/TAO/tests/Bug_2669_Regression/client.cpp +++ b/TAO/tests/Bug_2669_Regression/client.cpp @@ -33,15 +33,15 @@ parse_args (int argc, ACE_TCHAR *argv[]) class ChildHandler : public POA_ChildModule::AMI_ChildInterfaceHandler { public: - ChildHandler (void) {}; - ~ChildHandler (void) {}; + ChildHandler () {}; + ~ChildHandler () {}; }; class NonRelatedChildHandler : public POA_AMI_ChildInterfaceHandler { public: - NonRelatedChildHandler (void) {}; - ~NonRelatedChildHandler (void) {}; + NonRelatedChildHandler () {}; + ~NonRelatedChildHandler () {}; }; int diff --git a/TAO/tests/Bug_2909_Regression/client.cpp b/TAO/tests/Bug_2909_Regression/client.cpp index 05f6a9188bd..2d46e423e5e 100644 --- a/TAO/tests/Bug_2909_Regression/client.cpp +++ b/TAO/tests/Bug_2909_Regression/client.cpp @@ -93,7 +93,7 @@ public: class Handler : public POA_A::AMI_AMI_TestHandler { public: - Handler (void) : request_ (0) + Handler () : request_ (0) { }; diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service.h b/TAO/tests/Bug_3499_Regression/DLL_Service.h index 29e9cb90bbf..059127e06dd 100644 --- a/TAO/tests/Bug_3499_Regression/DLL_Service.h +++ b/TAO/tests/Bug_3499_Regression/DLL_Service.h @@ -22,7 +22,7 @@ public: extern "C" export_macro ACE_DLL_Service * symbol () #define ACE_DLL_SERVICE_IMPL(classname, symbol) \ - ACE_DLL_Service * symbol (void) \ + ACE_DLL_Service * symbol () \ { \ classname * service = 0; \ ACE_NEW_RETURN (service, classname (), 0); \ diff --git a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp index 8fd0c4487bb..55fbc678b2b 100644 --- a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp +++ b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp @@ -4,12 +4,12 @@ ACE_DLL_SERVICE_IMPL (ACE_DLL_TAO_Service, _make_ACE_DLL_TAO_Service) ACE_DLL_TAO_Service::ACE_DLL_TAO_Service () { - ACE_DLL_TAO_SERVICE_TRACE (ACE_TEXT ("ACE_DLL_TAO_Service::ACE_DLL_TAO_Service (void)")); + ACE_DLL_TAO_SERVICE_TRACE (ACE_TEXT ("ACE_DLL_TAO_Service::ACE_DLL_TAO_Service ()")); } ACE_DLL_TAO_Service::~ACE_DLL_TAO_Service () { - ACE_DLL_TAO_SERVICE_TRACE (ACE_TEXT ("ACE_DLL_TAO_Service::~ACE_DLL_TAO_Service (void)")); + ACE_DLL_TAO_SERVICE_TRACE (ACE_TEXT ("ACE_DLL_TAO_Service::~ACE_DLL_TAO_Service ()")); } int ACE_DLL_TAO_Service::init (int argc, ACE_TCHAR * argv []) @@ -44,7 +44,7 @@ int ACE_DLL_TAO_Service::init (int argc, ACE_TCHAR * argv []) int ACE_DLL_TAO_Service::fini () { - ACE_DLL_TAO_SERVICE_TRACE (ACE_TEXT ("ACE_DLL_TAO_Service::fini (void)")); + ACE_DLL_TAO_SERVICE_TRACE (ACE_TEXT ("ACE_DLL_TAO_Service::fini ()")); try { diff --git a/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp b/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp index a6ad523e6fb..e62b854ae01 100644 --- a/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp +++ b/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp @@ -7,7 +7,7 @@ // This is the interface program that accesses the remote object // Constructor. -Echo_Client_i::Echo_Client_i (void) : payload_length_ (0) +Echo_Client_i::Echo_Client_i () : payload_length_ (0) { //no-op } diff --git a/TAO/tests/Bug_3801_Regression/simple_client.cpp b/TAO/tests/Bug_3801_Regression/simple_client.cpp index e40529c1a86..7643da477ce 100644 --- a/TAO/tests/Bug_3801_Regression/simple_client.cpp +++ b/TAO/tests/Bug_3801_Regression/simple_client.cpp @@ -57,10 +57,10 @@ class Handler : public POA_A::AMI_AMI_TestHandler { public: /// Constructor. - Handler (void) {}; + Handler () {}; /// Destructor. - ~Handler (void) {}; + ~Handler () {}; void get_yadda (CORBA::Long result) { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h index 8690c061ff8..d9aec412d8b 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h @@ -25,7 +25,7 @@ public: ClientEngine(); virtual ~ClientEngine(); - virtual bool execute(void) = 0; + virtual bool execute() = 0; }; #endif diff --git a/TAO/tests/Compression/RLECompressorTest.cpp b/TAO/tests/Compression/RLECompressorTest.cpp index 8de90b314a4..5cd3756b4dd 100644 --- a/TAO/tests/Compression/RLECompressorTest.cpp +++ b/TAO/tests/Compression/RLECompressorTest.cpp @@ -173,7 +173,7 @@ struct HRTimer : ACE_High_Res_Timer HRTimer(const ACE_TCHAR* msg) : msg_(msg) { this->reset(); this->start(); } - ~HRTimer(void) { + ~HRTimer() { this->stop(); this->print_ave(this->msg_, 1); } }; diff --git a/TAO/tests/DynValue_Test/Analyzer.h b/TAO/tests/DynValue_Test/Analyzer.h index 961d7821677..3bca5744426 100644 --- a/TAO/tests/DynValue_Test/Analyzer.h +++ b/TAO/tests/DynValue_Test/Analyzer.h @@ -15,7 +15,7 @@ private: public: DynAnyAnalyzer (int argc, ACE_TCHAR *argv[]); - ~DynAnyAnalyzer (void) {orb_->destroy ();} + ~DynAnyAnalyzer () {orb_->destroy ();} DynamicAny::DynAny_ptr DynAny_NoTrunc (const CORBA::Any &); DynamicAny::DynAny_ptr DynAny (const CORBA::Any &); diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp index d0580eec270..1b841896980 100644 --- a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp +++ b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.cpp @@ -7,7 +7,7 @@ Test_Idl_SharedIntf_i::Test_Idl_SharedIntf_i(CORBA::ORB_ptr orb) { } -Test_Idl_SharedIntf_i::~Test_Idl_SharedIntf_i(void) {} +Test_Idl_SharedIntf_i::~Test_Idl_SharedIntf_i() {} void Test_Idl_SharedIntf_i::ping () { diff --git a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp index c5b9fc8c714..e6803e01c06 100644 --- a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp +++ b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp @@ -12,7 +12,7 @@ Test_Idl_SharedIntf_i::Test_Idl_SharedIntf_i(CORBA::ORB_ptr orb) { } -Test_Idl_SharedIntf_i::~Test_Idl_SharedIntf_i(void) {} +Test_Idl_SharedIntf_i::~Test_Idl_SharedIntf_i() {} void Test_Idl_SharedIntf_i::set_upper (const char *ior) diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h index a3082202111..d89675926db 100644 --- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h +++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.h @@ -26,7 +26,7 @@ class DllOrb_Export DllOrb DllOrb (int nthreads = 1); /// Destructor. - ~DllOrb (void) throw (); + ~DllOrb () throw (); CORBA::ORB_ptr orb () const; diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp index 928a4bcaf22..d866b6b4bc4 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.cpp @@ -1,7 +1,7 @@ // -*- C++ -*- #include "Client_ORBInitializer.h" -Client_ORBInitializer::Client_ORBInitializer (void) : +Client_ORBInitializer::Client_ORBInitializer () : pre_init_called (false), post_init_called (false) { diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp index 151590a95a5..af2c08b472e 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp @@ -2,7 +2,7 @@ #include "Server_ORBInitializer.h" extern PortableInterceptor::SlotId slotId; -Server_ORBInitializer::Server_ORBInitializer (void) : +Server_ORBInitializer::Server_ORBInitializer () : server_interceptor_ (0) { } diff --git a/TAO/tests/Transport_Cache_Manager/mock_tdi.h b/TAO/tests/Transport_Cache_Manager/mock_tdi.h index a77c0161dcd..41cdd34829e 100644 --- a/TAO/tests/Transport_Cache_Manager/mock_tdi.h +++ b/TAO/tests/Transport_Cache_Manager/mock_tdi.h @@ -2,8 +2,8 @@ class mock_tdi { public: mock_tdi () {} - u_long hash (void) {return static_cast<u_long> (reinterpret_cast<ptrdiff_t> (this));} - mock_tdi *duplicate (void) {return 0;} + u_long hash () {return static_cast<u_long> (reinterpret_cast<ptrdiff_t> (this));} + mock_tdi *duplicate () {return 0;} CORBA::Boolean is_equivalent (const mock_tdi *) {return true;} }; diff --git a/TAO/tests/Transport_Cache_Manager/mock_transport.h b/TAO/tests/Transport_Cache_Manager/mock_transport.h index 1a383b0dd59..31e8441b819 100644 --- a/TAO/tests/Transport_Cache_Manager/mock_transport.h +++ b/TAO/tests/Transport_Cache_Manager/mock_transport.h @@ -8,13 +8,13 @@ public: void purging_order (unsigned long purging_order) { this->purging_order_ = purging_order;} bool is_connected () const {return is_connected_;} void is_connected (bool is_connected) { this->is_connected_ = is_connected;} - ACE_Event_Handler::Reference_Count add_reference (void) {return 0;} - ACE_Event_Handler::Reference_Count remove_reference (void) {return 0;} + ACE_Event_Handler::Reference_Count add_reference () {return 0;} + ACE_Event_Handler::Reference_Count remove_reference () {return 0;} void cache_map_entry (TCM::HASH_MAP_ENTRY *entry) {this->entry_ = entry;} - TCM::HASH_MAP_ENTRY *cache_map_entry (void) {return this->entry_;} - void close_connection (void) { purged_count_ = ++global_purged_count;}; - int purged_count (void) { return this->purged_count_;} - bool can_be_purged (void) { return true;} + TCM::HASH_MAP_ENTRY *cache_map_entry () {return this->entry_;} + void close_connection () { purged_count_ = ++global_purged_count;}; + int purged_count () { return this->purged_count_;} + bool can_be_purged () { return true;} private: size_t id_; bool is_connected_; diff --git a/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp b/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp index 4e774826bed..b8dfc070d21 100644 --- a/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp +++ b/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { -Test_CompressorFactory::Test_CompressorFactory (void) : +Test_CompressorFactory::Test_CompressorFactory () : ::TAO::CompressorFactory (COMPRESSORID_FOR_TESTING), compressor_ (::Compression::Compressor::_nil ()) { diff --git a/TAO/utils/NamingViewer/NamingObject.h b/TAO/utils/NamingViewer/NamingObject.h index f7fa92db98f..e0a8d55f1d2 100644 --- a/TAO/utils/NamingViewer/NamingObject.h +++ b/TAO/utils/NamingViewer/NamingObject.h @@ -29,7 +29,7 @@ public: CosNaming::Name& Name (); // returns the name of the object - bool IsContext (void) { return m_Context; } + bool IsContext () { return m_Context; } // Returns true if this is a context private: diff --git a/TAO/utils/nsgroup/nsgroup.cpp b/TAO/utils/nsgroup/nsgroup.cpp index bb973eb4a27..c50fed5c1b6 100644 --- a/TAO/utils/nsgroup/nsgroup.cpp +++ b/TAO/utils/nsgroup/nsgroup.cpp @@ -92,7 +92,7 @@ public: int run_cmd (); /// Display command line interface usage - int show_usage( void ); + int show_usage(); const ACE_TCHAR * group_arg() const { return group_arg_; } const ACE_TCHAR * policy_arg() const { return policy_arg_; } @@ -451,7 +451,7 @@ NSGROUP::parse_command_line () int -NSGROUP::show_usage ( void ) +NSGROUP::show_usage () { const int RC_SUCCESS = 0; diff --git a/TAO/utils/wxNamingViewer/wxNamingTree.cpp b/TAO/utils/wxNamingViewer/wxNamingTree.cpp index bbff234ff52..4037b8a84fa 100644 --- a/TAO/utils/wxNamingViewer/wxNamingTree.cpp +++ b/TAO/utils/wxNamingViewer/wxNamingTree.cpp @@ -79,7 +79,7 @@ WxNamingTree::~WxNamingTree() clearChildren(); } -void WxNamingTree::clearChildren( void) +void WxNamingTree::clearChildren() { wxTreeItemId item = GetRootItem(); if (item) { @@ -116,7 +116,7 @@ void WxNamingTree::copySelectedToClipboard() } -WxNamingObject* WxNamingTree::getTreeObject( void) const +WxNamingObject* WxNamingTree::getTreeObject() const { wxTreeItemId item = GetSelection(); if (item == wxTreeItemId( (wxGenericTreeItem*)0)) { |