diff options
| author | Knut Petter Svendsen <knut@altuma.no> | 2022-09-13 22:57:39 +0200 |
|---|---|---|
| committer | Knut Petter Svendsen <knut@altuma.no> | 2022-09-13 22:57:39 +0200 |
| commit | 3da59eac098c1ef9d2c98f2079185ff35c3b6105 (patch) | |
| tree | 379c29e09bf55597fe6740cd163478cd1204a181 /TAO/orbsvcs/tests | |
| parent | fe03724176dcfd20e0f9a6e493198469242be6b6 (diff) | |
| download | ATCD-3da59eac098c1ef9d2c98f2079185ff35c3b6105.tar.gz | |
Remove obsolescent (void) in functions with no parameters
Diffstat (limited to 'TAO/orbsvcs/tests')
589 files changed, 2585 insertions, 2585 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp index 15a3da0fa7a..857b9061edb 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp @@ -1,10 +1,10 @@ #include "Connection_Manager.h" -Connection_Manager::Connection_Manager (void) +Connection_Manager::Connection_Manager () { } -Connection_Manager::~Connection_Manager (void) +Connection_Manager::~Connection_Manager () { } @@ -214,7 +214,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, } void -Connection_Manager::find_receivers (void) +Connection_Manager::find_receivers () { CosNaming::BindingIterator_var iterator; CosNaming::BindingList_var binding_list; @@ -464,7 +464,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, } void -Connection_Manager::connect_to_sender (void) +Connection_Manager::connect_to_sender () { if (CORBA::is_nil (this->sender_.in ())) return; @@ -586,19 +586,19 @@ Connection_Manager::destroy (const ACE_CString &flowname) } Connection_Manager::Receivers & -Connection_Manager::receivers (void) +Connection_Manager::receivers () { return this->receivers_; } Connection_Manager::Protocol_Objects & -Connection_Manager::protocol_objects (void) +Connection_Manager::protocol_objects () { return this->protocol_objects_; } Connection_Manager::StreamCtrls & -Connection_Manager::streamctrls (void) +Connection_Manager::streamctrls () { return this->streamctrls_; } diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h index 4288e5cc846..1db47f8201c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.h @@ -37,10 +37,10 @@ class Connection_Manager { public: /// Constructor - Connection_Manager (void); + Connection_Manager (); /// Destructor - ~Connection_Manager (void); + ~Connection_Manager (); /// Initialize this class. int init (CORBA::ORB_ptr orb); @@ -59,10 +59,10 @@ public: AVStreams::MMDevice_ptr receiver); /// Connect to the sender that we found. - void connect_to_sender (void); + void connect_to_sender (); /// Destroy all streams. - void destroy (void); + void destroy (); /// Destroy streams associated with <flowname>. void destroy (const ACE_CString &flowname); @@ -97,14 +97,14 @@ public: EP_Addr; // Map accessors. - Receivers &receivers (void); - Protocol_Objects &protocol_objects (void); - StreamCtrls &streamctrls (void); + Receivers &receivers (); + Protocol_Objects &protocol_objects (); + StreamCtrls &streamctrls (); void load_ep_addr (const char* file_name); protected: - void find_receivers (void); + void find_receivers (); void add_to_receivers (CosNaming::BindingList &binding_list); diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp index 167b84ac85e..1f3f044273f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp @@ -41,7 +41,7 @@ Distributer_Receiver_StreamEndPoint::get_callback (const char *, return 0; } -Distributer_Receiver_Callback::Distributer_Receiver_Callback (void) +Distributer_Receiver_Callback::Distributer_Receiver_Callback () : frame_count_ (1) { } @@ -79,7 +79,7 @@ Distributer_Receiver_Callback::receive_frame (ACE_Message_Block *frame, } int -Distributer_Receiver_Callback::handle_destroy (void) +Distributer_Receiver_Callback::handle_destroy () { ACE_DEBUG ((LM_DEBUG, "Distributer_Callback::end_stream\n")); @@ -90,7 +90,7 @@ Distributer_Receiver_Callback::handle_destroy (void) return 0; } -Distributer::Distributer (void) +Distributer::Distributer () : sender_name_ ("sender") , distributer_name_ ("distributer") , done_ (0) @@ -98,12 +98,12 @@ Distributer::Distributer (void) { } -Distributer::~Distributer (void) +Distributer::~Distributer () { } Connection_Manager & -Distributer::connection_manager (void) +Distributer::connection_manager () { return this->connection_manager_; } diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h index 498a2d37b03..9d3ffed6471 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.h @@ -28,7 +28,7 @@ class Distributer_Receiver_Callback : public TAO_AV_Callback { public: /// Constructor. - Distributer_Receiver_Callback (void); + Distributer_Receiver_Callback (); // Method that is called when there is data to be received from a // sender. @@ -38,7 +38,7 @@ public: // Called when the sender is done sending data and wants to close // down the connection. - int handle_destroy (void); + int handle_destroy (); private: /// Count of the frames passing through us. @@ -111,10 +111,10 @@ class Distributer { public: /// Constructor - Distributer (void); + Distributer (); /// Destructor. - ~Distributer (void); + ~Distributer (); /// Initialize data components. int init (int argc, ACE_TCHAR *argv[]); @@ -127,7 +127,7 @@ public: void done (int); /// Accessor to connection manager. - Connection_Manager &connection_manager (void); + Connection_Manager &connection_manager (); protected: /// Connection manager. diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp index 8cf78960834..607a97e84d1 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp @@ -17,7 +17,7 @@ Receiver_StreamEndPoint::get_callback (const char *, return 0; } -Receiver_Callback::Receiver_Callback (void) +Receiver_Callback::Receiver_Callback () : frame_count_ (1) { } @@ -56,7 +56,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, } int -Receiver_Callback::handle_destroy (void) +Receiver_Callback::handle_destroy () { // Called when the distributer requests the stream to be shutdown. ACE_DEBUG ((LM_DEBUG, @@ -75,7 +75,7 @@ Receiver_Callback::handle_destroy (void) return 0; } -Receiver::Receiver (void) +Receiver::Receiver () : mmdevice_ (0), output_file_name_ (ACE_TEXT ("output")), addr_file_ (ACE_TEXT ("addr_file")), @@ -84,7 +84,7 @@ Receiver::Receiver (void) { } -Receiver::~Receiver (void) +Receiver::~Receiver () { } @@ -165,7 +165,7 @@ Receiver::parse_args (int argc, ACE_TCHAR *argv[]) } ACE_TString -Receiver::output_file_name (void) +Receiver::output_file_name () { return this->output_file_name_; } diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h index cdc2308ac61..863f5d6aafa 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.h @@ -28,7 +28,7 @@ class Receiver_Callback : public TAO_AV_Callback { public: /// Constructor. - Receiver_Callback (void); + Receiver_Callback (); // Method that is called when there is data to be received from a // sender. @@ -38,7 +38,7 @@ public: // Called when the sender is done sending data and wants to close // down the connection. - int handle_destroy (void); + int handle_destroy (); private: /// Keeping a count of the incoming frames. @@ -76,10 +76,10 @@ class Receiver { public: /// Constructor - Receiver (void); + Receiver (); /// Destructor. - ~Receiver (void); + ~Receiver (); /// Initialize data components. int init (int argc, ACE_TCHAR *argv[]); @@ -88,7 +88,7 @@ public: int parse_args (int argc, ACE_TCHAR *argv[]); /// Name of the output file. - ACE_TString output_file_name (void); + ACE_TString output_file_name (); protected: /// Connection manager. diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp index 03e265cdfe4..8739741efa0 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp @@ -38,7 +38,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *flowname, return 0; } -Sender::Sender (void) +Sender::Sender () : sender_mmdevice_ (0), frame_count_ (0), filename_ (ACE_TEXT("input")), @@ -148,7 +148,7 @@ Sender::init (int argc, ACE_TCHAR *argv[]) // Method to send data at the specified rate int -Sender::pace_data (void) +Sender::pace_data () { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; @@ -267,7 +267,7 @@ Sender::pace_data (void) } Connection_Manager & -Sender::connection_manager (void) +Sender::connection_manager () { return this->connection_manager_; } diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h index 9c723e92832..15dc9543efa 100644 --- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.h @@ -58,17 +58,17 @@ class Sender { public: /// Constructor - Sender (void); + Sender (); /// Method to initialize the various data components. int init (int argc, ACE_TCHAR **argv); /// Method to pace and send data from a file. - int pace_data (void); + int pace_data (); /// Accessor to the connection manager. - Connection_Manager &connection_manager (void); + Connection_Manager &connection_manager (); private: /// Method to parse the command line arguments. diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp index 531173b6d4f..c4a529fc542 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp @@ -33,7 +33,7 @@ Receiver_StreamEndPoint::set_protocol_object (const char * flowname, return 0; } -Receiver_Callback::Receiver_Callback (void) +Receiver_Callback::Receiver_Callback () : frame_count_ (1), mb_ (BUFSIZ) { @@ -103,7 +103,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, } int -Receiver_Callback::handle_destroy (void) +Receiver_Callback::handle_destroy () { // Called when the distributer requests the stream to be shutdown. ACE_DEBUG ((LM_DEBUG, @@ -130,7 +130,7 @@ Receiver_Callback::handle_destroy (void) return 0; } -Receiver::Receiver (void) +Receiver::Receiver () : mmdevice_ (0), frame_rate_ (30), input_file_ (0), @@ -140,7 +140,7 @@ Receiver::Receiver (void) { } -Receiver::~Receiver (void) +Receiver::~Receiver () { } @@ -245,13 +245,13 @@ Receiver::init (int argc, } TAO_AV_Protocol_Object* -Receiver::protocol_object (void) +Receiver::protocol_object () { return this->protocol_object_; } FILE * -Receiver::input_file (void) +Receiver::input_file () { return this->input_file_; } diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h index 257c20d783f..e84bb472b2f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h @@ -29,7 +29,7 @@ class Receiver_Callback : public TAO_AV_Callback { public: /// Constructor. - Receiver_Callback (void); + Receiver_Callback (); // Method that is called when there is data to be received from a // sender. @@ -39,7 +39,7 @@ public: // Called when the sender is done sending data and wants to close // down the connection. - int handle_destroy (void); + int handle_destroy (); private: /// Keeping a count of the incoming frames. @@ -86,10 +86,10 @@ class Receiver { public: /// Constructor - Receiver (void); + Receiver (); /// Destructor. - ~Receiver (void); + ~Receiver (); /// Initialize data components. int init (int argc, @@ -99,9 +99,9 @@ public: void protocol_object (TAO_AV_Protocol_Object *protocol_object); /// Set the protocol object corresponding to the transport protocol chosen. - TAO_AV_Protocol_Object * protocol_object (void); + TAO_AV_Protocol_Object * protocol_object (); - FILE * input_file (void); + FILE * input_file (); protected: /// The Naming Service Client. diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp index da72c56164b..0c607516030 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp @@ -33,7 +33,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *, return 0; } -Sender_Callback::Sender_Callback (void) +Sender_Callback::Sender_Callback () : frame_count_ (1) { } @@ -73,7 +73,7 @@ Sender_Callback::receive_frame (ACE_Message_Block *frame, return 0; } -Sender::Sender (void) +Sender::Sender () : sender_mmdevice_ (0), streamctrl_ (0), frame_count_ (0), @@ -95,13 +95,13 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object) } int -Sender::eof (void) +Sender::eof () { return this->eof_; } void -Sender::shutdown (void) +Sender::shutdown () { try { @@ -152,7 +152,7 @@ Sender::parse_args (int argc, // Method to get the object reference of the receiver int -Sender::bind_to_receiver (void) +Sender::bind_to_receiver () { CosNaming::Name name (1); name.length (1); @@ -282,7 +282,7 @@ Sender::init (int argc, // Method to send data at the specified rate int -Sender::pace_data (void) +Sender::pace_data () { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h index 785eb117420..5bbc4cc5e4a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h @@ -28,7 +28,7 @@ class Sender_Callback : public TAO_AV_Callback { public: /// Constructor. - Sender_Callback (void); + Sender_Callback (); // Method that is called when there is data to be received from a // sender. @@ -38,7 +38,7 @@ public: // Called when the sender is done sending data and wants to close // down the connection. - // int handle_destroy (void); + // int handle_destroy (); private: /// Keeping a count of the incoming frames. @@ -86,28 +86,28 @@ class Sender { public: /// Constructor - Sender (void); + Sender (); /// Method to initialize the various data components. int init (int argc, ACE_TCHAR *argv[]); /// Method to pace and send data from a file. - int pace_data (void); + int pace_data (); /// Set the protocol object corresponding to the transport protocol chosen. void protocol_object (TAO_AV_Protocol_Object *protocol_object); - int eof (void); + int eof (); - void shutdown (void); + void shutdown (); private: /// Method to parse the command line arguments. int parse_args (int argc, ACE_TCHAR *argv[]); /// Method that binds the sender to the receiver. - int bind_to_receiver (void); + int bind_to_receiver (); /// The endpoint strategy used by the sender. SENDER_ENDPOINT_STRATEGY endpoint_strategy_; diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp index c3639d2f62e..8ca32e2dd21 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp @@ -1,11 +1,11 @@ #include "Connection_Manager.h" #include "tao/debug.h" -Connection_Manager::Connection_Manager (void) +Connection_Manager::Connection_Manager () { } -Connection_Manager::~Connection_Manager (void) +Connection_Manager::~Connection_Manager () { } @@ -95,7 +95,7 @@ Connection_Manager::bind_to_receivers (const ACE_CString &sender_name, } void -Connection_Manager::find_receivers (void) +Connection_Manager::find_receivers () { CosNaming::BindingIterator_var iterator; CosNaming::BindingList_var binding_list; @@ -159,7 +159,7 @@ Connection_Manager::add_to_receivers (CosNaming::BindingList &binding_list) } void -Connection_Manager::connect_to_receivers (void) +Connection_Manager::connect_to_receivers () { // Connect to all receivers that we know about. for (Receivers::iterator iterator = this->receivers_.begin (); @@ -316,7 +316,7 @@ Connection_Manager::bind_to_sender (const ACE_CString &sender_name, } void -Connection_Manager::connect_to_sender (void) +Connection_Manager::connect_to_sender () { if (CORBA::is_nil (this->sender_.in ())) return; @@ -551,19 +551,19 @@ Connection_Manager::unbind_receiver (const ACE_CString &sender_name, } Connection_Manager::Receivers & -Connection_Manager::receivers (void) +Connection_Manager::receivers () { return this->receivers_; } Connection_Manager::Protocol_Objects & -Connection_Manager::protocol_objects (void) +Connection_Manager::protocol_objects () { return this->protocol_objects_; } Connection_Manager::StreamCtrls & -Connection_Manager::streamctrls (void) +Connection_Manager::streamctrls () { return this->streamctrls_; } diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h index 34d8269cb04..8668d308985 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.h @@ -33,10 +33,10 @@ class Connection_Manager { public: /// Constructor - Connection_Manager (void); + Connection_Manager (); /// Destructor - ~Connection_Manager (void); + ~Connection_Manager (); /// Initialize this class. int init (CORBA::ORB_ptr orb); @@ -47,7 +47,7 @@ public: AVStreams::MMDevice_ptr sender); /// Connect to the receivers that we found. - void connect_to_receivers (void); + void connect_to_receivers (); /// Bind receiver to the sender. void bind_to_sender (const ACE_CString &sender_name, @@ -55,7 +55,7 @@ public: AVStreams::MMDevice_ptr receiver); /// Connect to the sender that we found. - void connect_to_sender (void); + void connect_to_sender (); /// Destroy streams associated with <flowname>. void destroy (const ACE_CString &flowname); @@ -92,12 +92,12 @@ public: StreamCtrls; // Map accessors. - Receivers &receivers (void); - Protocol_Objects &protocol_objects (void); - StreamCtrls &streamctrls (void); + Receivers &receivers (); + Protocol_Objects &protocol_objects (); + StreamCtrls &streamctrls (); protected: - void find_receivers (void); + void find_receivers (); void add_to_receivers (CosNaming::BindingList &binding_list); diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp index fbe163dff5c..5a7d703a2e8 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp @@ -9,7 +9,7 @@ typedef ACE_Unmanaged_Singleton<Distributer, ACE_Null_Mutex> DISTRIBUTER; // constructor. -Signal_Handler::Signal_Handler (void) +Signal_Handler::Signal_Handler () { } @@ -127,13 +127,13 @@ Distributer_Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flo } -Distributer_Receiver_Callback::Distributer_Receiver_Callback (void) +Distributer_Receiver_Callback::Distributer_Receiver_Callback () : frame_count_ (1) { } ACE_CString & -Distributer_Receiver_Callback::flowname (void) +Distributer_Receiver_Callback::flowname () { return this->flowname_; } @@ -177,7 +177,7 @@ Distributer_Receiver_Callback::receive_frame (ACE_Message_Block *frame, } int -Distributer_Receiver_Callback::handle_destroy (void) +Distributer_Receiver_Callback::handle_destroy () { /// Called when the sender requests the stream to be shutdown. ACE_DEBUG ((LM_DEBUG, @@ -192,7 +192,7 @@ Distributer_Receiver_Callback::handle_destroy (void) } ACE_CString & -Distributer_Sender_Callback::flowname (void) +Distributer_Sender_Callback::flowname () { return this->flowname_; } @@ -204,7 +204,7 @@ Distributer_Sender_Callback::flowname (const ACE_CString &flowname) } int -Distributer_Sender_Callback::handle_destroy (void) +Distributer_Sender_Callback::handle_destroy () { /// Called when the sender requests the stream to be shutdown. @@ -220,7 +220,7 @@ Distributer_Sender_Callback::handle_destroy (void) return 0; } -Distributer::Distributer (void) +Distributer::Distributer () : distributer_receiver_mmdevice_ (0), sender_name_ ("sender"), distributer_name_ ("distributer"), @@ -229,18 +229,18 @@ Distributer::Distributer (void) { } -Distributer::~Distributer (void) +Distributer::~Distributer () { } void -Distributer::stream_created (void) +Distributer::stream_created () { ++this->stream_count_; } void -Distributer::stream_destroyed (void) +Distributer::stream_destroyed () { --this->stream_count_; @@ -250,7 +250,7 @@ Distributer::stream_destroyed (void) Connection_Manager & -Distributer::connection_manager (void) +Distributer::connection_manager () { return this->connection_manager_; } @@ -370,7 +370,7 @@ Distributer::done () const } void -Distributer::shut_down (void) +Distributer::shut_down () { try { diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h index 7e7bdc750a6..e4c61ab7f7b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.h @@ -26,7 +26,7 @@ class Signal_Handler : public ACE_Event_Handler { public: - Signal_Handler (void); + Signal_Handler (); /// Override this method to implement graceful shutdown. int handle_signal(int signum, siginfo_t*,ucontext_t*); @@ -44,7 +44,7 @@ class Distributer_Receiver_Callback : public TAO_AV_Callback { public: //// Constructor. - Distributer_Receiver_Callback (void); + Distributer_Receiver_Callback (); /// Method that is called when there is data to be received from a /// sender. @@ -54,10 +54,10 @@ public: /// Called when the sender is done sending data and wants to close /// down the connection. - int handle_destroy (void); + int handle_destroy (); /// Accessor methods for the flowname of the callback. - ACE_CString &flowname (void); + ACE_CString &flowname (); void flowname (const ACE_CString &flowname); private: @@ -82,10 +82,10 @@ class Distributer_Sender_Callback : public TAO_AV_Callback public: //// Called when the sender has finished reading the file and wants //// to close down the connection. - int handle_destroy (void); + int handle_destroy (); /// Accessor methods for the flowname of the callback. - ACE_CString &flowname (void); + ACE_CString &flowname (); void flowname (const ACE_CString &flowname); private: @@ -166,10 +166,10 @@ class Distributer { public: //// Constructor - Distributer (void); + Distributer (); //// Destructor. - ~Distributer (void); + ~Distributer (); //// Initialize data components. int init (int argc, @@ -184,16 +184,16 @@ public: void done (bool); //// Accessor to connection manager. - Connection_Manager &connection_manager (void); + Connection_Manager &connection_manager (); //// Called when stream created - void stream_created (void); + void stream_created (); //// Called when stream destroyed - void stream_destroyed (void); + void stream_destroyed (); ////Unbind the sender and receiver from the Naming Service - void shut_down (void); + void shut_down (); protected: //// Connection manager. diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp index b6a113c5e18..68262b9a5a5 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp @@ -11,7 +11,7 @@ static int done = 0; /// Flag set when a signal is raised. // constructor. -Signal_Handler::Signal_Handler (void) +Signal_Handler::Signal_Handler () { } @@ -72,13 +72,13 @@ Receiver_StreamEndPoint::handle_connection_requested (AVStreams::flowSpec &flows return 1; } -Receiver_Callback::Receiver_Callback (void) +Receiver_Callback::Receiver_Callback () : frame_count_ (1) { } ACE_CString & -Receiver_Callback::flowname (void) +Receiver_Callback::flowname () { return this->flowname_; } @@ -90,7 +90,7 @@ Receiver_Callback::flowname (const ACE_CString &flowname) } int -Receiver_Callback::handle_destroy (void) +Receiver_Callback::handle_destroy () { /// Called when the sender requests the stream to be shutdown. ACE_DEBUG ((LM_DEBUG, @@ -134,7 +134,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, return 0; } -Receiver::Receiver (void) +Receiver::Receiver () : mmdevice_ (0), output_file_name_ ("output"), sender_name_ ("distributer"), @@ -142,18 +142,18 @@ Receiver::Receiver (void) { } -Receiver::~Receiver (void) +Receiver::~Receiver () { } ACE_CString -Receiver::sender_name (void) +Receiver::sender_name () { return this->sender_name_; } ACE_CString -Receiver::receiver_name (void) +Receiver::receiver_name () { return this->receiver_name_; } @@ -244,13 +244,13 @@ Receiver::parse_args (int argc, } ACE_CString -Receiver::output_file_name (void) +Receiver::output_file_name () { return this->output_file_name_; } void -Receiver::shut_down (void) +Receiver::shut_down () { try { diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h index 87407f68ad3..812ab6f7916 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.h @@ -26,7 +26,7 @@ class Signal_Handler : public ACE_Event_Handler { public: - Signal_Handler (void); + Signal_Handler (); /// Override this method to implement graceful shutdown. int handle_signal(int signum, siginfo_t*,ucontext_t*); @@ -43,7 +43,7 @@ class Receiver_Callback : public TAO_AV_Callback { public: //// Constructor. - Receiver_Callback (void); + Receiver_Callback (); /// Method that is called when there is data to be received from a /// sender. @@ -51,10 +51,10 @@ public: TAO_AV_frame_info *frame_info, const ACE_Addr &peer_address); - int handle_destroy (void); + int handle_destroy (); /// Accessor methods for the flowname of the callback. - ACE_CString &flowname (void); + ACE_CString &flowname (); void flowname (const ACE_CString &flowname); private: @@ -99,10 +99,10 @@ class Receiver { public: //// Constructor - Receiver (void); + Receiver (); //// Destructor. - virtual ~Receiver (void); + virtual ~Receiver (); //// Initialize data components. int init (int argc, @@ -113,12 +113,12 @@ public: ACE_TCHAR **argv); //// Name of the output file. - ACE_CString output_file_name (void); + ACE_CString output_file_name (); - ACE_CString sender_name (void); - ACE_CString receiver_name (void); + ACE_CString sender_name (); + ACE_CString receiver_name (); - void shut_down (void); + void shut_down (); protected: //// Connection manager. diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp index e2958400895..d8a91aecb9b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp @@ -17,7 +17,7 @@ int g_shutdown = 0; /// Flag set when a signal is raised. // constructor. -Signal_Handler::Signal_Handler (void) +Signal_Handler::Signal_Handler () { } @@ -36,7 +36,7 @@ Signal_Handler::handle_signal (int signum, siginfo_t *, ucontext_t*) } ACE_CString & -Sender_Callback::flowname (void) +Sender_Callback::flowname () { return this->flowname_; } @@ -49,7 +49,7 @@ Sender_Callback::flowname (const ACE_CString &flowname) int -Sender_Callback::handle_destroy (void) +Sender_Callback::handle_destroy () { SENDER::instance ()->connection_manager ().protocol_objects ().unbind (this->flowname_.c_str ()); @@ -128,7 +128,7 @@ Sender_StreamEndPoint::handle_preconnect (AVStreams::flowSpec &flowspec) return 1; } -Sender::Sender (void) +Sender::Sender () : sender_mmdevice_ (0), frame_count_ (0), filename_ ("input"), @@ -139,7 +139,7 @@ Sender::Sender (void) { } -Sender::~Sender (void) +Sender::~Sender () { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -147,7 +147,7 @@ Sender::~Sender (void) } void -Sender::shut_down (void) +Sender::shut_down () { try { @@ -271,7 +271,7 @@ Sender::init (int argc, /// Method to send data at the specified rate int -Sender::pace_data (void) +Sender::pace_data () { /// The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; @@ -404,25 +404,25 @@ Sender::pace_data (void) } Connection_Manager & -Sender::connection_manager (void) +Sender::connection_manager () { return this->connection_manager_; } // void -// Sender::add_stream (void) +// Sender::add_stream () // { // this->stream_count_++; // } // void -// Sender::remove_stream (void) +// Sender::remove_stream () // { // this->stream_count_--; // } // int -// Sender::stream_alive (void) +// Sender::stream_alive () // { // return this->stream_count_; // } diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h index 624cf488220..9d40a9f9312 100644 --- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.h @@ -26,7 +26,7 @@ class Signal_Handler : public ACE_Event_Handler { public: - Signal_Handler (void); + Signal_Handler (); /// Override this method to implement graceful shutdown. int handle_signal(int signum, siginfo_t*,ucontext_t*); @@ -49,10 +49,10 @@ public: * to close down the connection. Also called when the distributer * tears down the connection when it switches to a new sender. */ - int handle_destroy (void); + int handle_destroy (); /// Accessor methods for the flowname of the callback - ACE_CString &flowname (void); + ACE_CString &flowname (); void flowname (const ACE_CString &flowname); private: @@ -105,22 +105,22 @@ class Sender { public: //// Constructor - Sender (void); + Sender (); //// Destructor - ~Sender (void); + ~Sender (); - void shut_down (void); + void shut_down (); //// Method to initialize the various data components. int init (int argc, ACE_TCHAR *argv[]); //// Method to pace and send data from a file. - int pace_data (void); + int pace_data (); //// Accessor to the connection manager. - Connection_Manager &connection_manager (void); + Connection_Manager &connection_manager (); private: //// Method to parse the command line arguments. diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp index 0bd805403cb..90667f6c708 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp @@ -1,13 +1,13 @@ #include "ftp.h" -FTP_Client_Callback::FTP_Client_Callback (void) +FTP_Client_Callback::FTP_Client_Callback () :count_ (0) { } int -FTP_Client_Callback::handle_end_stream (void) +FTP_Client_Callback::handle_end_stream () { TAO_AV_CORE::instance ()->stop_run (); return 0; @@ -73,7 +73,7 @@ FTP_Client_Callback::handle_timeout (void *) return 0; } -FTP_Client_Producer::FTP_Client_Producer (void) +FTP_Client_Producer::FTP_Client_Producer () :TAO_FlowProducer ("Data",CLIENT::instance ()->protocols (),CLIENT::instance ()->format ()) { } @@ -155,19 +155,19 @@ Client::parse_args (int argc, } FILE * -Client::file (void) +Client::file () { return this->fp_; } const char* -Client::flowname (void) +Client::flowname () { return this->flowname_.c_str(); } AVStreams::protocolSpec -Client::protocols (void) +Client::protocols () { AVStreams::protocolSpec protocols (1); protocols.length (1); @@ -178,25 +178,25 @@ Client::protocols (void) } const char * -Client::format (void) +Client::format () { return "UNS:ftp"; } const char * -Client::address (void) +Client::address () { return this->address_.c_str (); } TAO_StreamCtrl* -Client::streamctrl (void) +Client::streamctrl () { return &this->streamctrl_; } -Client::Client (void) +Client::Client () : fp_ (0), protocol_ (ACE_OS::strdup ("UDP")), orb_ (TAO_AV_CORE::instance ()->orb ()), @@ -258,7 +258,7 @@ Client::init (int argc, ACE_TCHAR *argv[]) } int -Client::run (void) +Client::run () { try { diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h index ee8214651a8..805f58fd42c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h @@ -19,7 +19,7 @@ class FTP_Client_Producer :public virtual TAO_FlowProducer { public: - FTP_Client_Producer (void); + FTP_Client_Producer (); virtual int get_callback (const char *flowname, TAO_AV_Callback *&callback); int set_protocol_object (const char *flowname, @@ -32,9 +32,9 @@ class FTP_Client_Callback :public TAO_AV_Callback { public: - FTP_Client_Callback (void); + FTP_Client_Callback (); virtual int handle_timeout (void *arg); - virtual int handle_end_stream (void); + virtual int handle_end_stream (); virtual void get_timeout (ACE_Time_Value *&tv, void *&arg); void set_protocol_object (TAO_AV_Protocol_Object *protocol_object) {this->protocol_object_ = protocol_object;} @@ -49,15 +49,15 @@ typedef TAO_AV_Endpoint_Reactive_Strategy_A<TAO_StreamEndPoint_A,TAO_VDev,AV_Nul class Client { public: - Client (void); + Client (); int init (int argc, ACE_TCHAR *argv[]); - int run (void); - FILE *file (void); - const char *flowname (void); - TAO_StreamCtrl* streamctrl (void); - AVStreams::protocolSpec protocols (void); - const char *format (void); - const char *address (void); + int run (); + FILE *file (); + const char *flowname (); + TAO_StreamCtrl* streamctrl (); + AVStreams::protocolSpec protocols (); + const char *format (); + const char *address (); private: int parse_args (int argc, ACE_TCHAR *argv[]); ENDPOINT_STRATEGY endpoint_strategy_; diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp index 74090d97812..77bcbdfd30f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp @@ -1,6 +1,6 @@ #include "server.h" -FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void) +FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint () :TAO_FlowConsumer ("Data",FTP_SERVER::instance ()->protocols (), FTP_SERVER::instance ()->format ()) { AVStreams::protocolSpec protocols (2); @@ -29,12 +29,12 @@ FTP_Server_FlowEndPoint::get_callback (const char *, return 0; } -FTP_Server_Callback::FTP_Server_Callback (void) +FTP_Server_Callback::FTP_Server_Callback () { } int -FTP_Server_Callback::handle_stop (void) +FTP_Server_Callback::handle_stop () { ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::stop\n")); ACE_OS::fclose (FTP_SERVER::instance ()->file ()); @@ -62,14 +62,14 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame, } int -FTP_Server_Callback::handle_end_stream (void) +FTP_Server_Callback::handle_end_stream () { CORBA::ORB_var orb = TAO_AV_CORE::instance ()->orb (); orb->shutdown (); return 0; } -Server::Server (void) +Server::Server () :orb_ (TAO_AV_CORE::instance ()->orb ()), poa_ (TAO_AV_CORE::instance ()->poa ()) { @@ -78,7 +78,7 @@ Server::Server (void) } AVStreams::protocolSpec -Server::protocols (void) +Server::protocols () { AVStreams::protocolSpec protocols (2); protocols.length (2); @@ -88,7 +88,7 @@ Server::protocols (void) } const char* -Server::format (void) +Server::format () { return "UNS:ftp"; } @@ -146,7 +146,7 @@ Server::init (int argc, } int -Server::run (void) +Server::run () { try { @@ -194,7 +194,7 @@ Server::parse_args (int argc, ACE_TCHAR *argv[]) } FILE* -Server::file (void) +Server::file () { return this->fp_; } diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h index 0901c0e4e69..3025cc70017 100644 --- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h @@ -15,19 +15,19 @@ class FTP_Server_Callback :public TAO_AV_Callback { public: - FTP_Server_Callback (void); - virtual int handle_stop (void); + FTP_Server_Callback (); + virtual int handle_stop (); virtual int receive_frame (ACE_Message_Block *frame, TAO_AV_frame_info *, const ACE_Addr &); - virtual int handle_end_stream (void); + virtual int handle_end_stream (); }; class FTP_Server_FlowEndPoint :public TAO_FlowConsumer { public: - FTP_Server_FlowEndPoint (void); + FTP_Server_FlowEndPoint (); int get_callback (const char *flowname, TAO_AV_Callback *&callback); }; @@ -35,17 +35,17 @@ public: class Server { public: - Server (void); + Server (); int init (int argc, ACE_TCHAR *argv[]); - int run (void); - FILE *file (void); - AVStreams::protocolSpec protocols (void); - CORBA::ORB_ptr orb (void); + int run (); + FILE *file (); + AVStreams::protocolSpec protocols (); + CORBA::ORB_ptr orb (); void orb (CORBA::ORB_ptr orb_in); - PortableServer::POA_ptr poa (void); + PortableServer::POA_ptr poa (); void poa (PortableServer::POA_ptr poa_in); - const char *format (void); + const char *format (); protected: int parse_args (int argc, ACE_TCHAR *argv[]); TAO_Naming_Client my_naming_client_; diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp index 72d5d0e4b7f..6b1135648a4 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp @@ -184,7 +184,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // **************************************************************** -Ping_Recv::Ping_Recv (void) +Ping_Recv::Ping_Recv () : TAO_FlowConsumer ("Ping", ping_protocols, "UNS:ping") @@ -200,13 +200,13 @@ Ping_Recv::get_callback (const char *, return 0; } -Ping_Recv_Callback::Ping_Recv_Callback (void) +Ping_Recv_Callback::Ping_Recv_Callback () : count_ (0) { } int -Ping_Recv_Callback::handle_stop (void) +Ping_Recv_Callback::handle_stop () { ACE_DEBUG ((LM_DEBUG,"Ping_Recv_Callback::stop")); TAO_AV_CORE::instance ()->orb ()->shutdown (); @@ -257,7 +257,7 @@ Ping_Recv_Callback::receive_frame (ACE_Message_Block *frame, } int -Ping_Recv_Callback::handle_destroy (void) +Ping_Recv_Callback::handle_destroy () { ACE_DEBUG ((LM_DEBUG,"Ping_Recv_Callback::destroy\n")); return 0; @@ -265,7 +265,7 @@ Ping_Recv_Callback::handle_destroy (void) // **************************************************************** -Pong_Send::Pong_Send (void) +Pong_Send::Pong_Send () : TAO_FlowProducer ("Pong", pong_protocols, "UNS:pong") @@ -298,7 +298,7 @@ Pong_Send_Callback::handle_timeout (void *) } int -Pong_Send_Callback::handle_end_stream (void) +Pong_Send_Callback::handle_end_stream () { return 0; } diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h index d291d427f57..70e3d743bef 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.h +++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.h @@ -19,12 +19,12 @@ class Ping_Recv_Callback : public TAO_AV_Callback { public: - Ping_Recv_Callback (void); - virtual int handle_stop (void); + Ping_Recv_Callback (); + virtual int handle_stop (); virtual int receive_frame (ACE_Message_Block *frame, TAO_AV_frame_info *frame_info = 0, const ACE_Addr &peer_address = ACE_Addr::sap_any); - virtual int handle_destroy (void); + virtual int handle_destroy (); protected: int count_; }; @@ -32,7 +32,7 @@ public: class Ping_Recv : public TAO_FlowConsumer { public: - Ping_Recv (void); + Ping_Recv (); virtual int get_callback (const char *flowname, TAO_AV_Callback *&callback); @@ -50,7 +50,7 @@ public: int send_response (ACE_hrtime_t stamp); virtual int handle_timeout (void *arg); - virtual int handle_end_stream (void); + virtual int handle_end_stream (); virtual void get_timeout (ACE_Time_Value *&tv, void *&arg); }; @@ -58,7 +58,7 @@ public: class Pong_Send : public TAO_FlowProducer { public: - Pong_Send (void); + Pong_Send (); virtual int get_callback (const char *flowname, TAO_AV_Callback *&callback); }; diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp index c636d9d9977..4ea62edf998 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp @@ -202,7 +202,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) // **************************************************************** -Pong_Recv::Pong_Recv (void) +Pong_Recv::Pong_Recv () : TAO_FlowConsumer ("Pong", pong_protocols, "UNS:pong") @@ -219,7 +219,7 @@ Pong_Recv::get_callback (const char *, } int -Pong_Recv_Callback::handle_stop (void) +Pong_Recv_Callback::handle_stop () { // ACE_DEBUG ((LM_DEBUG,"Pong_Recv_Callback::stop")); TAO_AV_CORE::instance ()->orb ()->shutdown (); @@ -259,7 +259,7 @@ Pong_Recv_Callback::receive_frame (ACE_Message_Block *frame, } int -Pong_Recv_Callback::handle_destroy (void) +Pong_Recv_Callback::handle_destroy () { ACE_DEBUG ((LM_DEBUG,"Pong_Recv_Callback::destroy\n")); return 0; @@ -267,7 +267,7 @@ Pong_Recv_Callback::handle_destroy (void) // **************************************************************** -Ping_Send::Ping_Send (void) +Ping_Send::Ping_Send () : TAO_FlowProducer ("Ping", ping_protocols, "UNS:ping") @@ -283,7 +283,7 @@ Ping_Send::get_callback (const char *, return 0; } -Ping_Send_Callback::Ping_Send_Callback (void) +Ping_Send_Callback::Ping_Send_Callback () :count_ (0) { this->timeout_ = ACE_Time_Value (2); @@ -334,7 +334,7 @@ Ping_Send_Callback::handle_timeout (void *) } int -Ping_Send_Callback::handle_end_stream (void) +Ping_Send_Callback::handle_end_stream () { return 0; } diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h index 042874c5726..065af4f4f5a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.h +++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.h @@ -17,17 +17,17 @@ class Pong_Recv_Callback : public TAO_AV_Callback { public: - virtual int handle_stop (void); + virtual int handle_stop (); virtual int receive_frame (ACE_Message_Block *frame, TAO_AV_frame_info *frame_info = 0, const ACE_Addr &peer_address = ACE_Addr::sap_any); - virtual int handle_destroy (void); + virtual int handle_destroy (); }; class Pong_Recv : public TAO_FlowConsumer { public: - Pong_Recv (void); + Pong_Recv (); virtual int get_callback (const char *flowname, TAO_AV_Callback *&callback); @@ -40,10 +40,10 @@ private: class Ping_Send_Callback : public TAO_AV_Callback { public: - Ping_Send_Callback (void); + Ping_Send_Callback (); virtual int handle_timeout (void *arg); - virtual int handle_end_stream (void); + virtual int handle_end_stream (); virtual void get_timeout (ACE_Time_Value *&tv, void *&arg); @@ -59,7 +59,7 @@ private: class Ping_Send : public TAO_FlowProducer { public: - Ping_Send (void); + Ping_Send (); virtual int get_callback (const char *flowname, TAO_AV_Callback *&callback); diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp index fa2b9a8bb5c..0cab42145e8 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp @@ -38,7 +38,7 @@ Receiver_StreamEndPoint::get_callback (const char *, return 0; } -Receiver_Callback::Receiver_Callback (void) +Receiver_Callback::Receiver_Callback () : frame_count_ (0) { } @@ -126,7 +126,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, } int -Receiver_Callback::handle_destroy (void) +Receiver_Callback::handle_destroy () { // Called when the distributer requests the stream to be shutdown. ACE_DEBUG ((LM_DEBUG, @@ -145,12 +145,12 @@ Receiver_Callback::handle_destroy (void) return 0; } -Receiver::Receiver (void) +Receiver::Receiver () : mmdevice_ (0) { } -Receiver::~Receiver (void) +Receiver::~Receiver () { } diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h index e7e42a437dd..5a6cea84bdc 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.h @@ -18,7 +18,7 @@ class Receiver_Callback : public TAO_AV_Callback { public: - Receiver_Callback (void); + Receiver_Callback (); /// Constructor. /// Method that is called when there is data to be received from a @@ -29,7 +29,7 @@ public: /// Called when the sender is done sending data and wants to close /// down the connection. - int handle_destroy (void); + int handle_destroy (); /// Set the related stream control for this flow. void streamctrl (AVStreams::StreamCtrl_ptr streamctrl); @@ -59,10 +59,10 @@ private: class Receiver { public: - Receiver (void); + Receiver (); /// Constructor - ~Receiver (void); + ~Receiver (); /// Destructor. int init (int argc, diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp index f5f5ac9169a..2acff233303 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp @@ -63,7 +63,7 @@ Sender_StreamEndPoint::modify_QoS (AVStreams::streamQoS &new_qos, return 1; } -Sender::Sender (void) +Sender::Sender () : sender_mmdevice_ (0), streamctrl_ (0), frame_count_ (0), @@ -117,7 +117,7 @@ Sender::parse_args (int argc, // Method to get the object reference of the receiver int -Sender::bind_to_receiver (void) +Sender::bind_to_receiver () { CosNaming::Name name (1); name.length (1); @@ -237,7 +237,7 @@ Sender::init (int argc, // Method to send data at the specified rate int -Sender::pace_data (void) +Sender::pace_data () { // The time between two consecutive frames. inter_frame_time.set (1 / (double) this->frame_rate_); diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h index b83bbeb5c48..68302f92daa 100644 --- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.h @@ -53,14 +53,14 @@ SENDER_ENDPOINT_STRATEGY; class Sender { public: - Sender (void); + Sender (); /// Constructor int init (int argc, ACE_TCHAR *argv[]); /// Method to initialize the various data components. - int pace_data (void); + int pace_data (); /// Method to pace and send data from a file. void protocol_object (TAO_AV_Protocol_Object *protocol_object); @@ -70,7 +70,7 @@ private: int parse_args (int argc, ACE_TCHAR *argv[]); /// Method to parse the command line arguments. - int bind_to_receiver (void); + int bind_to_receiver (); /// Method that binds the sender to the receiver. SENDER_ENDPOINT_STRATEGY endpoint_strategy_; diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp index 37a8dfefa2f..b367afdda76 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp @@ -1,18 +1,18 @@ #include "ftp.h" -FTP_Client_Callback::FTP_Client_Callback (void) +FTP_Client_Callback::FTP_Client_Callback () : count_ (0) { } int -FTP_Client_Callback::handle_end_stream (void) +FTP_Client_Callback::handle_end_stream () { TAO_AV_CORE::instance ()->orb ()->shutdown (); return 0; } -FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint (void) +FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint () : callback_ (0) { } @@ -151,24 +151,24 @@ Client::parse_args (int argc, } FILE * -Client::file (void) +Client::file () { return this->fp_; } char* -Client::flowname (void) +Client::flowname () { return this->flowname_; } TAO_StreamCtrl* -Client::streamctrl (void) +Client::streamctrl () { return &this->streamctrl_; } -Client::Client (void) +Client::Client () :endpoint_strategy_ (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa (),this), client_mmdevice_ (&endpoint_strategy_), address_ (ACE_OS::strdup ("224.9.9.2:12345")), @@ -242,7 +242,7 @@ Client::init (int argc, ACE_TCHAR *argv[]) } int -Client::run (void) +Client::run () { try { diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h index ca1ffbe22be..18aa68d2b6f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h @@ -16,8 +16,8 @@ class FTP_Client_Callback :public TAO_AV_Callback { public: - FTP_Client_Callback (void); - virtual int handle_end_stream (void); + FTP_Client_Callback (); + virtual int handle_end_stream (); void set_protocol_object (TAO_AV_Protocol_Object *protocol_object) {this->protocol_object_ = protocol_object;} virtual int handle_timeout (void *arg); virtual void get_timeout (ACE_Time_Value *&tv, @@ -32,7 +32,7 @@ class FTP_Client_StreamEndPoint :public TAO_Client_StreamEndPoint { public: - FTP_Client_StreamEndPoint (void); + FTP_Client_StreamEndPoint (); virtual int get_callback (const char *flowname, TAO_AV_Callback *&callback); @@ -66,12 +66,12 @@ private: class Client { public: - Client (void); + Client (); int init (int argc, ACE_TCHAR *argv[]); - int run (void); - FILE *file (void); - char *flowname (void); - TAO_StreamCtrl* streamctrl (void); + int run (); + FILE *file (); + char *flowname (); + TAO_StreamCtrl* streamctrl (); private: int parse_args (int argc, ACE_TCHAR *argv[]); int bind_to_server (const char *name); diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp index d5efa17a616..662c18e9217 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp @@ -2,7 +2,7 @@ int done = 0; -FTP_Server_StreamEndPoint::FTP_Server_StreamEndPoint (void) +FTP_Server_StreamEndPoint::FTP_Server_StreamEndPoint () { ACE_DEBUG ((LM_DEBUG,"FTP_Server_StreamEndPoint::FTP_Server_StreamEndPoint\n")); } @@ -19,7 +19,7 @@ FTP_Server_StreamEndPoint::get_callback (const char *, } int -FTP_Server_Callback::handle_stop (void) +FTP_Server_Callback::handle_stop () { ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::stop\n")); ACE_OS::fclose (FTP_SERVER::instance ()->file ()); @@ -47,14 +47,14 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame, } int -FTP_Server_Callback::handle_end_stream (void) +FTP_Server_Callback::handle_end_stream () { ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::end_stream\n")); done = 1; return 0; } -Server::Server (void) +Server::Server () { reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa ()); @@ -115,7 +115,7 @@ Server::init (int argc, } int -Server::run (void) +Server::run () { CORBA::ORB_ptr orb = TAO_AV_CORE::instance ()->orb(); try @@ -169,7 +169,7 @@ Server::parse_args (int argc, ACE_TCHAR *argv[]) } FILE* -Server::file (void) +Server::file () { return this->fp_; } diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h index a20ed2ce30b..a260b4ae471 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h @@ -14,7 +14,7 @@ class FTP_Server_StreamEndPoint :public TAO_Server_StreamEndPoint { public: - FTP_Server_StreamEndPoint (void); + FTP_Server_StreamEndPoint (); virtual int get_callback (const char *flowname, TAO_AV_Callback *&callback); }; @@ -23,21 +23,21 @@ class FTP_Server_Callback :public TAO_AV_Callback { public: - virtual int handle_stop (void); + virtual int handle_stop (); virtual int receive_frame (ACE_Message_Block *frame, TAO_AV_frame_info *, const ACE_Addr &); - virtual int handle_end_stream (void); + virtual int handle_end_stream (); }; class Server { public: - Server (void); + Server (); int init (int argc, ACE_TCHAR *argv[]); - int run (void); - FILE *file (void); + int run (); + FILE *file (); protected: int parse_args (int argc, ACE_TCHAR *argv[]); TAO_Naming_Client my_naming_client_; diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp index c07f8cc9356..7d435d90afb 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp @@ -1,13 +1,13 @@ #include "ftp.h" #include "tao/debug.h" -FTP_Client_Callback::FTP_Client_Callback (void) +FTP_Client_Callback::FTP_Client_Callback () :count_ (0) { } int -FTP_Client_Callback::handle_end_stream (void) +FTP_Client_Callback::handle_end_stream () { TAO_AV_CORE::instance ()->orb ()->shutdown (); return 0; @@ -72,7 +72,7 @@ FTP_Client_Callback::handle_timeout (void *) return 0; } -FTP_Client_Producer::FTP_Client_Producer (void) +FTP_Client_Producer::FTP_Client_Producer () :TAO_FlowProducer ("Data",CLIENT::instance ()->protocols (),CLIENT::instance ()->format ()) { } @@ -131,19 +131,19 @@ Client::parse_args (int argc, ACE_TCHAR *argv[]) } FILE * -Client::file (void) +Client::file () { return this->fp_; } char* -Client::flowname (void) +Client::flowname () { return this->flowname_; } AVStreams::protocolSpec -Client::protocols (void) +Client::protocols () { AVStreams::protocolSpec protocols (1); protocols.length (1); @@ -154,25 +154,25 @@ Client::protocols (void) } const char * -Client::format (void) +Client::format () { return "UNS:ftp"; } const char * -Client::address (void) +Client::address () { return this->address_; } TAO_StreamCtrl* -Client::streamctrl (void) +Client::streamctrl () { return &this->streamctrl_; } -Client::Client (void) +Client::Client () : client_mmdevice_ (&endpoint_strategy_), fdev_ (0), address_ (ACE_OS::strdup ("224.9.9.2:10002")), @@ -271,7 +271,7 @@ Client::init (int argc, ACE_TCHAR *argv[]) } int -Client::run (void) +Client::run () { try { diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h index 7144b72f254..458bdbf8479 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h @@ -16,7 +16,7 @@ class FTP_Client_Producer :public virtual TAO_FlowProducer { public: - FTP_Client_Producer (void); + FTP_Client_Producer (); virtual int get_callback (const char *flowname, TAO_AV_Callback *&callback); int set_protocol_object (const char *flowname, @@ -29,9 +29,9 @@ class FTP_Client_Callback :public TAO_AV_Callback { public: - FTP_Client_Callback (void); + FTP_Client_Callback (); virtual int handle_timeout (void *arg); - virtual int handle_end_stream (void); + virtual int handle_end_stream (); virtual void get_timeout (ACE_Time_Value *&tv, void *&arg); // virtual int get_frame (ACE_Message_Block *&block,TAO_AV_frame_info *&frame_info); @@ -50,15 +50,15 @@ typedef TAO_FDev <FTP_Client_Producer,TAO_FlowConsumer> FTP_Client_FDev; class Client { public: - Client (void); + Client (); int init (int argc, ACE_TCHAR *argv[]); - int run (void); - FILE *file (void); - char *flowname (void); - TAO_StreamCtrl* streamctrl (void); - AVStreams::protocolSpec protocols (void); - const char *format (void); - const char *address (void); + int run (); + FILE *file (); + char *flowname (); + TAO_StreamCtrl* streamctrl (); + AVStreams::protocolSpec protocols (); + const char *format (); + const char *address (); private: int parse_args (int argc, ACE_TCHAR *argv[]); int bind_to_server (const char *name); diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp index 568822bd25d..59ba69be705 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp @@ -1,6 +1,6 @@ #include "server.h" -FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void) +FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint () :TAO_FlowConsumer ("Data",FTP_SERVER::instance ()->protocols (),FTP_SERVER::instance ()->format ()) { AVStreams::protocolSpec protocols (2); @@ -30,7 +30,7 @@ FTP_Server_FlowEndPoint::get_callback (const char *, } int -FTP_Server_Callback::handle_stop (void) +FTP_Server_Callback::handle_stop () { ACE_DEBUG ((LM_DEBUG,"FTP_Server_Callback::stop\n")); ACE_OS::fclose (FTP_SERVER::instance ()->file ()); @@ -58,7 +58,7 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame, } int -FTP_Server_Callback::handle_end_stream (void) +FTP_Server_Callback::handle_end_stream () { ACE_DEBUG ((LM_DEBUG,"FTP_SFP_Callback::end_stream\n")); CORBA::ORB_var orb = TAO_AV_CORE::instance ()->orb (); @@ -66,7 +66,7 @@ FTP_Server_Callback::handle_end_stream (void) return 0; } -// FTP_Server_FDev::FTP_Server_FDev (void) +// FTP_Server_FDev::FTP_Server_FDev () // :TAO_FDev ("Data") // { // } @@ -86,14 +86,14 @@ FTP_Server_Callback::handle_end_stream (void) // return endpoint->_this (); // } -Server::Server (void) +Server::Server () { reactive_strategy_.init (TAO_AV_CORE::instance ()->orb (), TAO_AV_CORE::instance ()->poa ()); } AVStreams::protocolSpec -Server::protocols (void) +Server::protocols () { AVStreams::protocolSpec protocols (2); protocols.length (2); @@ -103,7 +103,7 @@ Server::protocols (void) } const char* -Server::format (void) +Server::format () { return "UNS:ftp"; } @@ -168,7 +168,7 @@ Server::init (int argc, ACE_TCHAR *argv[]) } int -Server::run (void) +Server::run () { try { @@ -210,7 +210,7 @@ Server::parse_args (int argc, ACE_TCHAR *argv[]) } FILE* -Server::file (void) +Server::file () { return this->fp_; } diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h index 5cec3a1236f..753935e0b05 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h @@ -12,18 +12,18 @@ class FTP_Server_Callback :public TAO_AV_Callback { public: - virtual int handle_stop (void); + virtual int handle_stop (); virtual int receive_frame (ACE_Message_Block *frame, TAO_AV_frame_info *frame_info, const ACE_Addr &); - virtual int handle_end_stream (void); + virtual int handle_end_stream (); }; class FTP_Server_FlowEndPoint :public TAO_FlowConsumer { public: - FTP_Server_FlowEndPoint (void); + FTP_Server_FlowEndPoint (); int get_callback (const char *flowname, TAO_AV_Callback *&callback); }; @@ -32,7 +32,7 @@ public: // :public TAO_FDev // { // public: -// FTP_Server_FDev (void); +// FTP_Server_FDev (); // virtual AVStreams::FlowConsumer_ptr make_consumer (AVStreams::FlowConnection_ptr the_requester, // AVStreams::QoS & the_qos, // CORBA::Boolean_out met_qos, @@ -48,13 +48,13 @@ typedef TAO_FDev <TAO_FlowProducer, FTP_Server_FlowEndPoint> FTP_Server_FDev; class Server { public: - Server (void); + Server (); int init (int argc, ACE_TCHAR *argv[]); - int run (void); - FILE *file (void); - AVStreams::protocolSpec protocols (void); - const char *format (void); + int run (); + FILE *file (); + AVStreams::protocolSpec protocols (); + const char *format (); protected: int parse_args (int argc, ACE_TCHAR *argv[]); TAO_Naming_Client my_naming_client_; diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp index 6ee1789465a..e7989d81d56 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp @@ -40,7 +40,7 @@ Receiver_StreamEndPoint::set_protocol_object (const char * flowname, return 0; } -Receiver_Callback::Receiver_Callback (void) +Receiver_Callback::Receiver_Callback () : frame_count_ (1), mb_ (BUFSIZ) { @@ -103,7 +103,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, } int -Receiver_Callback::handle_destroy (void) +Receiver_Callback::handle_destroy () { // Called when the distributer requests the stream to be shutdown. ACE_DEBUG ((LM_DEBUG, @@ -114,7 +114,7 @@ Receiver_Callback::handle_destroy (void) return 0; } -Receiver::Receiver (void) +Receiver::Receiver () : mmdevice_ (0), frame_rate_ (30), frame_count_ (0), @@ -123,7 +123,7 @@ Receiver::Receiver (void) { } -Receiver::~Receiver (void) +Receiver::~Receiver () { } @@ -216,7 +216,7 @@ Receiver::init (int argc, } TAO_AV_Protocol_Object* -Receiver::protocol_object (void) +Receiver::protocol_object () { return this->protocol_object_; } diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h index f77e96f88d9..0f5cdd0207e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h @@ -29,7 +29,7 @@ class Receiver_Callback : public TAO_AV_Callback { public: /// Constructor. - Receiver_Callback (void); + Receiver_Callback (); // Method that is called when there is data to be received from a // sender. @@ -39,7 +39,7 @@ public: // Called when the sender is done sending data and wants to close // down the connection. - int handle_destroy (void); + int handle_destroy (); void flowname (const char*); @@ -88,10 +88,10 @@ class Receiver { public: /// Constructor - Receiver (void); + Receiver (); /// Destructor. - ~Receiver (void); + ~Receiver (); /// Initialize data components. int init (int argc, @@ -101,7 +101,7 @@ public: void protocol_object (TAO_AV_Protocol_Object *protocol_object); /// Set the protocol object corresponding to the transport protocol chosen. - TAO_AV_Protocol_Object * protocol_object (void); + TAO_AV_Protocol_Object * protocol_object (); protected: /// The Naming Service Client. diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp index 887f61024ab..bcd859a1f5b 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp @@ -31,7 +31,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *, return 0; } -Sender::Sender (void) +Sender::Sender () : sender_mmdevice_ (0), streamctrl_ (0), frame_count_ (0), @@ -52,7 +52,7 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object) } void -Sender::shutdown (void) +Sender::shutdown () { // File reading is complete, destroy the stream. AVStreams::flowSpec stop_spec; @@ -96,7 +96,7 @@ Sender::parse_args (int argc, // Method to get the object reference of the receiver int -Sender::bind_to_receiver (void) +Sender::bind_to_receiver () { CosNaming::Name name (1); name.length (1); @@ -228,7 +228,7 @@ Sender::init (int argc, // Method to send data at the specified rate int -Sender::pace_data (void) +Sender::pace_data () { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h index 0c24070105d..1d1c5311c02 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h @@ -61,26 +61,26 @@ class Sender { public: /// Constructor - Sender (void); + Sender (); /// Method to initialize the various data components. int init (int argc, ACE_TCHAR *argv[]); /// Method to pace and send data from a file. - int pace_data (void); + int pace_data (); /// Set the protocol object corresponding to the transport protocol chosen. void protocol_object (TAO_AV_Protocol_Object *protocol_object); - void shutdown (void); + void shutdown (); private: /// Method to parse the command line arguments. int parse_args (int argc, ACE_TCHAR *argv[]); /// Method that binds the sender to the receiver. - int bind_to_receiver (void); + int bind_to_receiver (); /// The endpoint strategy used by the sender. SENDER_ENDPOINT_STRATEGY endpoint_strategy_; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp index 2062fc50c38..034592b6f83 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp @@ -9,11 +9,11 @@ ACE_High_Res_Timer last_frame_sent_time; ACE_Time_Value inter_frame_time; // The time that should lapse between two consecutive frames sent. -FTP_Client_Callback::FTP_Client_Callback (void) +FTP_Client_Callback::FTP_Client_Callback () { } -FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint (void) +FTP_Client_StreamEndPoint::FTP_Client_StreamEndPoint () { } @@ -36,7 +36,7 @@ FTP_Client_StreamEndPoint::set_protocol_object (const char *, return 0; } -Client::Client (void) +Client::Client () :client_mmdevice_ (&endpoint_strategy_), count_ (0), address_ (0), @@ -99,26 +99,26 @@ Client::parse_args (int argc, } FILE * -Client::file (void) +Client::file () { return this->fp_; } char* -Client::flowname (void) +Client::flowname () { return this->flowname_; } TAO_StreamCtrl* -Client::streamctrl (void) +Client::streamctrl () { return &this->streamctrl_; } int -Client::frame_rate (void) +Client::frame_rate () { return this->frame_rate_; } @@ -126,7 +126,7 @@ Client::frame_rate (void) // Method to get the object reference of the server int -Client::bind_to_server (void) +Client::bind_to_server () { // Initialize the naming services if (my_naming_client_.init (TAO_AV_CORE::instance ()->orb ()) != 0) @@ -278,7 +278,7 @@ Client::init (int argc, // Method to send data at the specified rate int -Client::pace_data (void) +Client::pace_data () { // Rate at which frames of data need to be sent. this->frame_rate_ = CLIENT::instance ()->frame_rate (); diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h index b3075bfe36a..f7d997fb99c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h @@ -35,7 +35,7 @@ class FTP_Client_Callback : public TAO_AV_Callback { public: ///Constructor - FTP_Client_Callback (void); + FTP_Client_Callback (); }; @@ -52,7 +52,7 @@ class FTP_Client_StreamEndPoint : public TAO_Client_StreamEndPoint { public: /// Constructor - FTP_Client_StreamEndPoint (void); + FTP_Client_StreamEndPoint (); /// Create the application client callback and return its handle to the /// AVStreams for further application callbacks @@ -83,7 +83,7 @@ class Client { public: /// Constructor - Client (void); + Client (); /// Method to initialize the various data components. int init (int argc, @@ -93,26 +93,26 @@ public: void set_protocol_object (TAO_AV_Protocol_Object *protocol_object); /// Method to pace and send data from a file. - int pace_data (void); + int pace_data (); /// File handle from which data is read to be sent. - FILE *file (void); + FILE *file (); /// The stream control interface that manages the stream set up - TAO_StreamCtrl* streamctrl (void); + TAO_StreamCtrl* streamctrl (); /// name of the flow set up. - char *flowname (void); + char *flowname (); /// The requested frame rate for sending each frame of data read from the file. - int frame_rate (void); + int frame_rate (); private: /// Method to parse the command line arguments. int parse_args (int argc, ACE_TCHAR *argv[]); /// Method that binds the ftp client to the server - int bind_to_server (void); + int bind_to_server (); /// The reacfive strategy of the client. ENDPOINT_STRATEGY endpoint_strategy_; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp index 27c0cc9c762..9acfb82641a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp @@ -51,7 +51,7 @@ FTP_Server_Callback::receive_frame (ACE_Message_Block *frame, } int -FTP_Server_Callback::handle_destroy (void) +FTP_Server_Callback::handle_destroy () { // Called when the ftp client requests the stream to be shutdown. ACE_DEBUG ((LM_DEBUG, @@ -60,12 +60,12 @@ FTP_Server_Callback::handle_destroy (void) return 0; } -Server::Server (void) +Server::Server () : mmdevice_ (0) { } -Server::~Server (void) +Server::~Server () { delete this->mmdevice_; } diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h index c0d90d7c4a5..fea72eda173 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.h @@ -34,7 +34,7 @@ public: // Called when the ftp client has finished reading the file and wants // to close4 down the connection. - int handle_destroy (void); + int handle_destroy (); }; /** @@ -69,10 +69,10 @@ class Server { public: /// Constructor - Server (void); + Server (); /// Destructor. - ~Server (void); + ~Server (); /// Initialize data components. int init (int argc, diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp index 090fbf54245..f52576c9482 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp @@ -19,7 +19,7 @@ TimeStamp_Protocol_Object::TimeStamp_Protocol_Object (TAO_AV_Callback *callback, int -TimeStamp_Protocol_Object::handle_input (void) +TimeStamp_Protocol_Object::handle_input () { ssize_t n = this->transport_->recv (this->frame_->rd_ptr (), this->frame_->size ()); @@ -33,7 +33,7 @@ TimeStamp_Protocol_Object::handle_input (void) } // int -// TimeStamp_Protocol_Object::handle_input (void) +// TimeStamp_Protocol_Object::handle_input () // { // iovec iov; // int iovcnt; @@ -167,18 +167,18 @@ TimeStamp_Protocol_Object::send_frame (const char* buf, /// end the stream. int -TimeStamp_Protocol_Object::destroy (void) +TimeStamp_Protocol_Object::destroy () { this->callback_->handle_destroy (); return 0; } -TimeStamp_Protocol_Factory::TimeStamp_Protocol_Factory (void) +TimeStamp_Protocol_Factory::TimeStamp_Protocol_Factory () { } -TimeStamp_Protocol_Factory::~TimeStamp_Protocol_Factory (void) +TimeStamp_Protocol_Factory::~TimeStamp_Protocol_Factory () { } diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h index f940cb1133a..4e0b055a32f 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h @@ -16,7 +16,7 @@ class TAO_TS_Export TimeStamp_Protocol_Object : public TAO_AV_Protocol_Object TimeStamp_Protocol_Object (TAO_AV_Callback *callback, TAO_AV_Transport *transport); - virtual int handle_input (void); + virtual int handle_input (); /// send a data frame. virtual int send_frame (ACE_Message_Block *frame, @@ -30,7 +30,7 @@ class TAO_TS_Export TimeStamp_Protocol_Object : public TAO_AV_Protocol_Object size_t len); /// end the stream. - virtual int destroy (void); + virtual int destroy (); private: /// Pre-allocated memory to receive the data... @@ -41,8 +41,8 @@ class TAO_TS_Export TimeStamp_Protocol_Factory : public TAO_AV_Flow_Protocol_Fac { public: /// Initialization hook. - TimeStamp_Protocol_Factory (void); - virtual ~TimeStamp_Protocol_Factory (void); + TimeStamp_Protocol_Factory (); + virtual ~TimeStamp_Protocol_Factory (); virtual int init (int argc, ACE_TCHAR *argv[]); virtual int match_protocol (const char *flow_string); // Note : Some platforms still don't support Covariant returns diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp index e470d872208..77b08b6b154 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp @@ -20,7 +20,7 @@ Receiver_StreamEndPoint::get_callback (const char *, return 0; } -Receiver_Callback::Receiver_Callback (void) +Receiver_Callback::Receiver_Callback () : frame_count_ (1) { } @@ -68,7 +68,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, } int -Receiver_Callback::handle_destroy (void) +Receiver_Callback::handle_destroy () { // Called when the distributer requests the stream to be shutdown. ACE_DEBUG ((LM_DEBUG, @@ -78,12 +78,12 @@ Receiver_Callback::handle_destroy (void) return 0; } -Receiver::Receiver (void) +Receiver::Receiver () : mmdevice_ (0) { } -Receiver::~Receiver (void) +Receiver::~Receiver () { } diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h index 565824238c0..872f4213484 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.h @@ -28,7 +28,7 @@ class Receiver_Callback : public TAO_AV_Callback { public: /// Constructor. - Receiver_Callback (void); + Receiver_Callback (); // Method that is called when there is data to be received from a // sender. @@ -38,7 +38,7 @@ public: // Called when the sender is done sending data and wants to close // down the connection. - int handle_destroy (void); + int handle_destroy (); private: /// Keeping a count of the incoming frames. @@ -76,10 +76,10 @@ class Receiver { public: /// Constructor - Receiver (void); + Receiver (); /// Destructor. - ~Receiver (void); + ~Receiver (); /// Initialize data components. int init (int argc, diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp index 7e567f8abf3..330e26f925e 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp @@ -31,7 +31,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *, return 0; } -Sender::Sender (void) +Sender::Sender () : sender_mmdevice_ (0), streamctrl_ (0), frame_count_ (0), @@ -85,7 +85,7 @@ Sender::parse_args (int argc, // Method to get the object reference of the receiver int -Sender::bind_to_receiver (void) +Sender::bind_to_receiver () { CosNaming::Name name (1); name.length (1); @@ -205,7 +205,7 @@ Sender::init (int argc, // Method to send data at the specified rate int -Sender::pace_data (void) +Sender::pace_data () { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h index e1e92fced3c..806320d3b2d 100644 --- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.h @@ -58,14 +58,14 @@ class Sender { public: /// Constructor - Sender (void); + Sender (); /// Method to initialize the various data components. int init (int argc, ACE_TCHAR *argv[]); /// Method to pace and send data from a file. - int pace_data (void); + int pace_data (); /// Set the protocol object corresponding to the transport protocol chosen. void protocol_object (TAO_AV_Protocol_Object *protocol_object); @@ -75,7 +75,7 @@ private: int parse_args (int argc, ACE_TCHAR *argv[]); /// Method that binds the sender to the receiver. - int bind_to_receiver (void); + int bind_to_receiver (); /// The endpoint strategy used by the sender. SENDER_ENDPOINT_STRATEGY endpoint_strategy_; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp index 08e7e6c15ab..364a896a791 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp @@ -39,7 +39,7 @@ Distributer_Receiver_StreamEndPoint::get_callback (const char *, return 0; } -Distributer_Receiver_Callback::Distributer_Receiver_Callback (void) +Distributer_Receiver_Callback::Distributer_Receiver_Callback () : frame_count_ (1) { } @@ -69,7 +69,7 @@ Distributer_Receiver_Callback::receive_frame (ACE_Message_Block *frame, } int -Distributer_Receiver_Callback::handle_destroy (void) +Distributer_Receiver_Callback::handle_destroy () { // Called when the sender requests the stream to be shutdown. try @@ -104,12 +104,12 @@ Distributer::sender_protocol_object (TAO_AV_Protocol_Object *object) } TAO_AV_Protocol_Object * -Distributer::sender_protocol_object (void) +Distributer::sender_protocol_object () { return this->sender_protocol_object_; } -Distributer::Distributer (void) +Distributer::Distributer () : distributer_receiver_mmdevice_ (0), distributer_sender_mmdevice_ (0), sender_protocol_object_ (0), @@ -119,7 +119,7 @@ Distributer::Distributer (void) { } -Distributer::~Distributer (void) +Distributer::~Distributer () { } @@ -263,7 +263,7 @@ Distributer::init (int /*argc*/, } TAO_StreamCtrl * -Distributer::receiver_streamctrl (void) +Distributer::receiver_streamctrl () { return this->receiver_streamctrl_; } diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h index cb035503a16..fa3ac21e854 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.h @@ -28,7 +28,7 @@ class Distributer_Receiver_Callback : public TAO_AV_Callback { public: /// Constructor. - Distributer_Receiver_Callback (void); + Distributer_Receiver_Callback (); // Method that is called when there is data to be received from a // sender. @@ -38,7 +38,7 @@ public: // Called when the sender is done sending data and wants to close // down the connection. - int handle_destroy (void); + int handle_destroy (); private: /// Count of the frames passing through us. @@ -111,10 +111,10 @@ class Distributer { public: /// Constructor - Distributer (void); + Distributer (); /// Destructor. - ~Distributer (void); + ~Distributer (); /// Initialize data components. int init (int argc, @@ -125,11 +125,11 @@ public: const ACE_CString &mmdevice_name); /// Get the stream control of the receiver - TAO_StreamCtrl *receiver_streamctrl (void); + TAO_StreamCtrl *receiver_streamctrl (); /// Accessor methods to set/get our sender protocol object int sender_protocol_object (TAO_AV_Protocol_Object *object); - TAO_AV_Protocol_Object *sender_protocol_object (void); + TAO_AV_Protocol_Object *sender_protocol_object (); // Flag to know when we are done. int done () const; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp index db2f5ae960b..01c127152ad 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp @@ -17,7 +17,7 @@ Receiver_StreamEndPoint::get_callback (const char *, return 0; } -Receiver_Callback::Receiver_Callback (void) +Receiver_Callback::Receiver_Callback () : frame_count_ (1) { } @@ -56,7 +56,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, } int -Receiver_Callback::handle_destroy (void) +Receiver_Callback::handle_destroy () { // Called when the distributer requests the stream to be shutdown. ACE_DEBUG ((LM_DEBUG, @@ -75,12 +75,12 @@ Receiver_Callback::handle_destroy (void) return 0; } -Receiver::Receiver (void) +Receiver::Receiver () : mmdevice_ (0) { } -Receiver::~Receiver (void) +Receiver::~Receiver () { } diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h index 565824238c0..872f4213484 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.h @@ -28,7 +28,7 @@ class Receiver_Callback : public TAO_AV_Callback { public: /// Constructor. - Receiver_Callback (void); + Receiver_Callback (); // Method that is called when there is data to be received from a // sender. @@ -38,7 +38,7 @@ public: // Called when the sender is done sending data and wants to close // down the connection. - int handle_destroy (void); + int handle_destroy (); private: /// Keeping a count of the incoming frames. @@ -76,10 +76,10 @@ class Receiver { public: /// Constructor - Receiver (void); + Receiver (); /// Destructor. - ~Receiver (void); + ~Receiver (); /// Initialize data components. int init (int argc, diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp index 53cb840518c..b874d5fb03c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp @@ -50,7 +50,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *, return 0; } -Sender::Sender (void) +Sender::Sender () : sender_mmdevice_ (0), streamctrl_ (0), frame_count_ (0), @@ -171,7 +171,7 @@ Sender::init (int argc, // Method to send data at the specified rate int -Sender::pace_data (void) +Sender::pace_data () { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h index 6b3e764d532..7b3a97863aa 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.h @@ -58,14 +58,14 @@ class Sender { public: /// Constructor - Sender (void); + Sender (); /// Method to initialize the various data components. int init (int argc, ACE_TCHAR *argv[]); /// Method to pace and send data from a file. - int pace_data (void); + int pace_data (); /// Set the protocol object corresponding to the transport protocol chosen. void protocol_object (TAO_AV_Protocol_Object *protocol_object); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h index 8fb1f0083e1..3ca0e7fa23a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Receiver_Stats.h @@ -33,7 +33,7 @@ public: * The number of samples is pre-allocated, and cannot changes once * the class is initialized. */ - Receiver_Stats (void); + Receiver_Stats (); /// The number of samples received so far ACE_UINT32 samples_count () const; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp index 403c5ac0893..65b377646a3 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp @@ -26,7 +26,7 @@ Receiver_StreamEndPoint::get_callback (const char *, return 0; } -Receiver_Callback::Receiver_Callback (void) +Receiver_Callback::Receiver_Callback () : frame_count_ (0) { } @@ -115,7 +115,7 @@ Receiver_Callback::dump_samples (const char* file) } int -Receiver_Callback::handle_destroy (void) +Receiver_Callback::handle_destroy () { // Called when the distributer requests the stream to be shutdown. ACE_DEBUG ((LM_DEBUG, @@ -136,12 +136,12 @@ Receiver_Callback::handle_destroy (void) return 0; } -Receiver::Receiver (void) +Receiver::Receiver () : mmdevice_ (0) { } -Receiver::~Receiver (void) +Receiver::~Receiver () { } diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h index 562a0c7b7f3..c1ecdd5966c 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.h @@ -29,7 +29,7 @@ class Receiver_Callback : public TAO_AV_Callback { public: /// Constructor. - Receiver_Callback (void); + Receiver_Callback (); // Method that is called when there is data to be received from a // sender. @@ -39,7 +39,7 @@ public: // Called when the sender is done sending data and wants to close // down the connection. - int handle_destroy (void); + int handle_destroy (); void dump_samples (const char* file); @@ -81,10 +81,10 @@ class Receiver { public: /// Constructor - Receiver (void); + Receiver (); /// Destructor. - ~Receiver (void); + ~Receiver (); /// Initialize data components. int init (int argc, diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp index f1ad51fba21..1ef57c5fc35 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp @@ -32,7 +32,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *, return 0; } -Sender::Sender (void) +Sender::Sender () : sender_mmdevice_ (0), streamctrl_ (0), frame_count_ (0), @@ -139,7 +139,7 @@ Sender::parse_args (int argc, // Method to get the object reference of the receiver int -Sender::bind_to_receiver (void) +Sender::bind_to_receiver () { CosNaming::Name name (1); name.length (1); @@ -290,7 +290,7 @@ Sender::init (int argc, // Method to send data at the specified rate int -Sender::pace_data (void) +Sender::pace_data () { // The time that should lapse between two consecutive frames sent. ACE_Time_Value inter_frame_time; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h index 672880fdae1..dfd7069736a 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.h @@ -58,14 +58,14 @@ class Sender { public: /// Constructor - Sender (void); + Sender (); /// Method to initialize the various data components. int init (int argc, ACE_TCHAR *argv[]); /// Method to pace and send data from a file. - int pace_data (void); + int pace_data (); /// Set the protocol object corresponding to the transport protocol chosen. void protocol_object (TAO_AV_Protocol_Object *protocol_object); @@ -75,7 +75,7 @@ private: int parse_args (int argc, ACE_TCHAR *argv[]); /// Method that binds the sender to the receiver. - int bind_to_receiver (void); + int bind_to_receiver (); /// The endpoint strategy used by the sender. SENDER_ENDPOINT_STRATEGY endpoint_strategy_; diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp index 222c21eaaf0..1dda9921bb7 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp @@ -18,7 +18,7 @@ Receiver_StreamEndPoint::get_callback (const char *, return 0; } -Receiver_Callback::Receiver_Callback (void) +Receiver_Callback::Receiver_Callback () : frame_count_ (0) { } @@ -57,7 +57,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame, } int -Receiver_Callback::handle_destroy (void) +Receiver_Callback::handle_destroy () { // Called when the distributer requests the stream to be shutdown. ACE_DEBUG ((LM_DEBUG, @@ -76,12 +76,12 @@ Receiver_Callback::handle_destroy (void) return 0; } -Receiver::Receiver (void) +Receiver::Receiver () : mmdevice_ (0) { } -Receiver::~Receiver (void) +Receiver::~Receiver () { } diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h index 79df05554f7..39981ceb659 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.h @@ -29,7 +29,7 @@ class Receiver_Callback : public TAO_AV_Callback { public: /// Constructor. - Receiver_Callback (void); + Receiver_Callback (); // Method that is called when there is data to be received from a // sender. @@ -39,7 +39,7 @@ public: // Called when the sender is done sending data and wants to close // down the connection. - int handle_destroy (void); + int handle_destroy (); private: /// Keeping a count of the incoming frames. @@ -77,10 +77,10 @@ class Receiver { public: /// Constructor - Receiver (void); + Receiver (); /// Destructor. - ~Receiver (void); + ~Receiver (); /// Initialize data components. int init (int argc, diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp index 0936a4361c2..e75a3ebf319 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp @@ -56,7 +56,7 @@ Sender_StreamEndPoint::set_protocol_object (const char *, return 0; } -Sender::Sender (void) +Sender::Sender () : sender_mmdevice_ (0), streamctrl_ (0), frame_count_ (0), @@ -183,7 +183,7 @@ Sender::fill_qos (AVStreams::streamQoS &qos) // Method to get the object reference of the receiver int -Sender::bind_to_receiver (void) +Sender::bind_to_receiver () { CosNaming::Name name (1); name.length (1); @@ -340,7 +340,7 @@ Sender::init (int argc, // Method to send data at the specified rate int -Sender::pace_data (void) +Sender::pace_data () { // The time between two consecutive frames. inter_frame_time.set (1.0 / this->frame_rate_); diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h index c3a323f966f..36c44d8c2f2 100644 --- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h +++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.h @@ -60,14 +60,14 @@ class Sender { public: /// Constructor - Sender (void); + Sender (); /// Method to initialize the various data components. int init (int argc, ACE_TCHAR *argv[]); /// Method to pace and send data from a file. - int pace_data (void); + int pace_data (); /// Set the protocol object corresponding to the transport protocol chosen. void protocol_object (TAO_AV_Protocol_Object *protocol_object); @@ -80,7 +80,7 @@ private: int parse_args (int argc, ACE_TCHAR *argv[]); /// Method that binds the sender to the receiver. - int bind_to_receiver (void); + int bind_to_receiver (); /// The endpoint strategy used by the sender. SENDER_ENDPOINT_STRATEGY endpoint_strategy_; diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp index a8a0be20826..cbe94d65983 100644 --- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp +++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp @@ -11,13 +11,13 @@ class Time_impl : { public: virtual TimeModule::TimeOfDay - get_gmt (void); + get_gmt (); - void Shutdown (void); + void Shutdown (); }; -TimeModule::TimeOfDay Time_impl::get_gmt (void) +TimeModule::TimeOfDay Time_impl::get_gmt () { time_t time_now = ACE_OS::time(0); struct tm *time_p = ACE_OS::gmtime(&time_now); @@ -32,7 +32,7 @@ TimeModule::TimeOfDay Time_impl::get_gmt (void) } void -Time_impl::Shutdown (void) +Time_impl::Shutdown () { ACE_OS::exit(0); } diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp index 64e3ab0b89a..ff10ea68735 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.cpp @@ -28,13 +28,13 @@ Test_i::Test_i (CORBA::ORB_ptr orb) : } } -Test_i::~Test_i (void) +Test_i::~Test_i () { this->policies_[0]->destroy (); } int -Test_i::try_and_create_POA (void) +Test_i::try_and_create_POA () { try { @@ -62,7 +62,7 @@ Test_i::try_and_create_POA (void) } void -Test_i::shutdown (void) +Test_i::shutdown () { orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h index cc58a7f592a..8170db6196d 100644 --- a/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h +++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Test_i.h @@ -13,12 +13,12 @@ public: Test_i (CORBA::ORB_ptr orb); /// Destructor - ~Test_i (void); + ~Test_i (); /// Try and create a persistant POA - int try_and_create_POA (void); + int try_and_create_POA (); - void shutdown (void); + void shutdown (); protected: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp index 296091f8adf..8eb96ccb635 100644 --- a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp +++ b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp @@ -14,7 +14,7 @@ ORB_Task::ORB_Task (CORBA::ORB_ptr orb) } int -ORB_Task::svc (void) +ORB_Task::svc () { try { diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h index 8114d09b443..4a29671bfd8 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Client_i.h @@ -15,7 +15,7 @@ public: Client_i (CORBA::ORB_ptr orb); // Our constructor - int init (void); + int init (); // Initialize the ORB etc. private: diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp index 04240e20fac..31316978ce2 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp @@ -117,7 +117,7 @@ ACE_TMAIN (int argc, return 0; } -Manager::Manager (void) +Manager::Manager () :orb_ (0), merged_set_ (0) { @@ -146,7 +146,7 @@ Manager::init (int argc, } int -Manager::make_merged_iors (void) +Manager::make_merged_iors () { // First server object_primary = @@ -186,7 +186,7 @@ Manager::make_merged_iors (void) } int -Manager::set_properties (void) +Manager::set_properties () { FT::TagFTGroupTaggedComponent ft_tag_component; @@ -228,7 +228,7 @@ Manager::set_properties (void) } int -Manager::run (void) +Manager::run () { try { @@ -245,7 +245,7 @@ Manager::run (void) } int -Manager::write_to_file (void) +Manager::write_to_file () { // CORBA::String_var iorref = @@ -267,7 +267,7 @@ Manager::write_to_file (void) } CORBA::ORB_ptr -Manager::orb (void) +Manager::orb () { return this->orb_.in (); } @@ -512,7 +512,7 @@ int run_full_shutdown_test (Simple_Server_ptr server) } int -Client_i::init (void) +Client_i::init () { // Open the file for reading. ACE_HANDLE f_handle = ACE_OS::open (ior_output_file, diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h index faf7974845d..74eb1df0b67 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.h @@ -13,7 +13,7 @@ class Manager { public: - Manager (void); + Manager (); // Ctor void init (int argc, @@ -21,19 +21,19 @@ public: // Initialize the ORB, POA etc. - int make_merged_iors (void); + int make_merged_iors (); // Merges the different IORS - int set_properties (void); + int set_properties (); // Sets the properties for the profiles - int run (void); + int run (); // Run the ORB event loop.. - int write_to_file (void); + int write_to_file (); // Write the merged IOR to a file - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); // Return the pointer to the copy of our ORB private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp index 2979804966c..73da3a1b889 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.cpp @@ -9,13 +9,13 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, const char* key) { } -Simple_Server_i::Simple_Server_i (void) +Simple_Server_i::Simple_Server_i () : orb_ (0) { } char* -Simple_Server_i::remote_call (void) +Simple_Server_i::remote_call () { ACE_DEBUG ((LM_DEBUG, "SERVER(%C)> executing remote_call()\n", _key.in())); diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h index d19daef2f93..87404054b51 100644 --- a/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h +++ b/TAO/orbsvcs/tests/Bug_2247_Regression/test_i.h @@ -15,11 +15,11 @@ public: Simple_Server_i (CORBA::ORB_ptr orb, const char* key); // ctor - Simple_Server_i (void); + Simple_Server_i (); // ctor // = The Simple_Server methods. - char* remote_call (void); + char* remote_call (); char* shutdown (const char* key); diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h index 1c6cbd957a5..f3cd250942b 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Client_i.h @@ -26,7 +26,7 @@ public: Client_i (CORBA::ORB_ptr orb); /// Initialize the ORB etc. - int init (void); + int init (); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp index ab461eda26e..4472202635c 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.cpp @@ -6,7 +6,7 @@ #include "Server_Request_Interceptor.h" -Server_ORBInitializer::Server_ORBInitializer (void) +Server_ORBInitializer::Server_ORBInitializer () : server_interceptor_ () { } @@ -37,7 +37,7 @@ Server_ORBInitializer::post_init ( } PortableInterceptor::ServerRequestInterceptor_ptr -Server_ORBInitializer::server_interceptor (void) +Server_ORBInitializer::server_interceptor () { return PortableInterceptor::ServerRequestInterceptor::_duplicate ( diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h index 9ef8038e345..d8ca966bf5b 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_ORBInitializer.h @@ -40,7 +40,7 @@ class Server_ORBInitializer : { public: /// Constructor. - Server_ORBInitializer (void); + Server_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); @@ -48,7 +48,7 @@ public: /// Return the created server request interceptor. Only valid after /// post_init(), i.e. ORB_init(), has been called. - PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor (void); + PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor (); private: /// Pointer to the server request interceptor. ORB is responsible diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp index bbf5b376e30..f51aa60d6c3 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.cpp @@ -6,12 +6,12 @@ #include "tao/CDR.h" #include "testS.h" -Server_Request_Interceptor::Server_Request_Interceptor (void) +Server_Request_Interceptor::Server_Request_Interceptor () : request_forwarded_ (0) { } -Server_Request_Interceptor::~Server_Request_Interceptor (void) +Server_Request_Interceptor::~Server_Request_Interceptor () { } @@ -23,13 +23,13 @@ Server_Request_Interceptor::forward_reference ( } char * -Server_Request_Interceptor::name (void) +Server_Request_Interceptor::name () { return CORBA::string_dup ("Server_Request_Interceptor"); } void -Server_Request_Interceptor::destroy (void) +Server_Request_Interceptor::destroy () { } diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h index 0ca097fd5e4..7b752e9d8b3 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Server_Request_Interceptor.h @@ -34,10 +34,10 @@ class Server_Request_Interceptor { public: /// Constructor. - Server_Request_Interceptor (void); + Server_Request_Interceptor (); /// Destructor. - ~Server_Request_Interceptor (void); + ~Server_Request_Interceptor (); /// Set the references to which requests will be forwarded. virtual void forward_reference (const char* iorstr); @@ -52,9 +52,9 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri); diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp index 2e3634eef67..99e5e9ab739 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp @@ -112,7 +112,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return 0; } -Manager::Manager (void) +Manager::Manager () { //no-op } @@ -139,7 +139,7 @@ Manager::init (int& argc, } int -Manager::make_merged_iors (void) +Manager::make_merged_iors () { // Get an object reference for the ORBs IORManipultion object! CORBA::Object_var IORM = @@ -260,7 +260,7 @@ Manager::set_properties (TAO_IOP::TAO_IOR_Manipulation_ptr iorm, } int -Manager::run (void) +Manager::run () { try { @@ -308,7 +308,7 @@ Manager::write_to_file (CORBA::Object_ptr ior, const ACE_TCHAR *ior_output_file) } CORBA::ORB_ptr -Manager::orb (void) +Manager::orb () { return this->orb_.in (); } @@ -448,7 +448,7 @@ int run_test (Simple_Server_ptr server) } int -Client_i::init (void) +Client_i::init () { char iogrstr[1024]; ACE_OS::sprintf (iogrstr, "file://%s", ACE_TEXT_ALWAYS_CHAR (first_iogr_file)); diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h index ef85b83dc8a..047620f5d42 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.h @@ -12,7 +12,7 @@ class Manager { public: - Manager (void); + Manager (); // Ctor void init (int& argc, @@ -20,17 +20,17 @@ public: // Initialize the ORB, POA etc. - int make_merged_iors (void); + int make_merged_iors (); // Merges the different IORS /// Run the ORB event loop.. - int run (void); + int run (); /// Write the merged IOGRs to a file - int write_to_files (void); + int write_to_files (); /// Return the pointer to the copy of our ORB - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); private: /// Write the merged IOGRs to a file diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp index 306ab9f96e6..0ff6c3fa130 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.cpp @@ -9,13 +9,13 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb, const char* key) { } -Simple_Server_i::Simple_Server_i (void) +Simple_Server_i::Simple_Server_i () : orb_ (0) { } char* -Simple_Server_i::remote_call (void) +Simple_Server_i::remote_call () { ACE_DEBUG ((LM_DEBUG, "SERVER(%C)> executing remote_call()\n", _key.in())); diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h index 392ba9fcdea..5b6e84639df 100644 --- a/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h +++ b/TAO/orbsvcs/tests/Bug_2248_Regression/test_i.h @@ -15,11 +15,11 @@ public: Simple_Server_i (CORBA::ORB_ptr orb, const char* key); // ctor - Simple_Server_i (void); + Simple_Server_i (); // ctor // = The Simple_Server methods. - char* remote_call (void); + char* remote_call (); char* shutdown (const char* key); diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp index e0dafe75c04..a47abab6868 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp @@ -11,19 +11,19 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id } char * -Hello::get_string (void) +Hello::get_string () { return CORBA::string_dup ("Hello there!"); } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } void -Hello::throw_exception (void) +Hello::throw_exception () { throw Test::MyException (); } @@ -38,7 +38,7 @@ Hello::call_me_back (Test::Hello_ptr me) // Nested sequence step 2 - This op called by the server on the client CORBA::Boolean -Hello::call_back (void) +Hello::call_back () { CORBA::Boolean result = server_->check_request_id (); return result; @@ -46,7 +46,7 @@ Hello::call_back (void) // Nested sequence step 3 - This op called by the client on the server CORBA::Boolean -Hello::check_request_id (void) +Hello::check_request_id () { // The server request interceptor will have set this public static member // false if the same retention id has been used twice @@ -54,7 +54,7 @@ Hello::check_request_id (void) } CORBA::ULong -Hello::drop_down_dead (void) +Hello::drop_down_dead () { return server_id_; } diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h index aa5305f1866..5b58bbb8183 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h @@ -19,19 +19,19 @@ public: Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0); // = The skeleton methods - virtual char * get_string (void); + virtual char * get_string (); - virtual void shutdown (void); + virtual void shutdown (); - virtual void throw_exception (void); + virtual void throw_exception (); virtual CORBA::Boolean call_me_back (Test::Hello_ptr me); - virtual CORBA::Boolean call_back (void); + virtual CORBA::Boolean call_back (); - virtual CORBA::Boolean check_request_id (void); + virtual CORBA::Boolean check_request_id (); - virtual CORBA::ULong drop_down_dead (void); + virtual CORBA::ULong drop_down_dead (); static CORBA::Boolean ids_differ_; diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp index 27b6c365b28..97b3505f83b 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp @@ -11,25 +11,25 @@ #include "ace/OS_NS_string.h" #include "Hello.h" -TAO249_ServerRequest_Interceptor::TAO249_ServerRequest_Interceptor (void) +TAO249_ServerRequest_Interceptor::TAO249_ServerRequest_Interceptor () : orb_ (0), client_id_ (0) { } -TAO249_ServerRequest_Interceptor::~TAO249_ServerRequest_Interceptor (void) +TAO249_ServerRequest_Interceptor::~TAO249_ServerRequest_Interceptor () { } char * -TAO249_ServerRequest_Interceptor::name (void) +TAO249_ServerRequest_Interceptor::name () { return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor"); } void -TAO249_ServerRequest_Interceptor::destroy (void) +TAO249_ServerRequest_Interceptor::destroy () { } diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h index 8089136cce8..00bd3d8fea5 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h @@ -23,10 +23,10 @@ class TAO249_ServerRequest_Interceptor { public: /// Constructor. -TAO249_ServerRequest_Interceptor (void); +TAO249_ServerRequest_Interceptor (); /// Destructor. -~TAO249_ServerRequest_Interceptor (void); +~TAO249_ServerRequest_Interceptor (); /** * @name Methods Required by the Server Request Interceptor @@ -38,9 +38,9 @@ TAO249_ServerRequest_Interceptor (void); */ //@{ /// Return the name of this ServerRequestinterceptor. -virtual char * name (void); +virtual char * name (); -virtual void destroy (void); +virtual void destroy (); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri); diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp index c2425cca81a..50f3f99a44f 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp @@ -13,25 +13,25 @@ #include "Hello.h" #include "ace/OS_NS_sys_time.h" -TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void) +TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 () : orb_ (0), client_id_ (0) { } -TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void) +TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 () { } char * -TAO249_ServerRequest_Interceptor2::name (void) +TAO249_ServerRequest_Interceptor2::name () { return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor2"); } void -TAO249_ServerRequest_Interceptor2::destroy (void) +TAO249_ServerRequest_Interceptor2::destroy () { } @@ -175,7 +175,7 @@ catch (const CORBA::Exception& ex) } TimeBase::TimeT -TAO249_ServerRequest_Interceptor2::get_now (void) +TAO249_ServerRequest_Interceptor2::get_now () { // 1582... const TimeBase::TimeT timeOffset = ACE_UINT64_LITERAL (0x1B21DD213814000); diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h index f1816a2676c..1e2765ca15b 100644 --- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h +++ b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h @@ -24,10 +24,10 @@ class TAO249_ServerRequest_Interceptor2 { public: /// Constructor. -TAO249_ServerRequest_Interceptor2 (void); +TAO249_ServerRequest_Interceptor2 (); /// Destructor. -~TAO249_ServerRequest_Interceptor2 (void); +~TAO249_ServerRequest_Interceptor2 (); /** * @name Methods Required by the Server Request Interceptor @@ -39,9 +39,9 @@ TAO249_ServerRequest_Interceptor2 (void); */ //@{ /// Return the name of this ServerRequestinterceptor. -virtual char * name (void); +virtual char * name (); -virtual void destroy (void); +virtual void destroy (); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri); @@ -60,7 +60,7 @@ virtual void send_other ( //@} protected: - TimeBase::TimeT get_now (void); + TimeBase::TimeT get_now (); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp index 7a8b89da632..c63bd4a210c 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp @@ -7,19 +7,19 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong) } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } void -Hello::ping (void) +Hello::ping () { return; } void -Hello::throw_location_forward (void) +Hello::throw_location_forward () { return; } diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h index 93461daa94d..4ca11570043 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h @@ -19,11 +19,11 @@ public: Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0); // = The skeleton methods - virtual void shutdown (void); + virtual void shutdown (); - virtual void ping (void); + virtual void ping (); - virtual void throw_location_forward (void); + virtual void throw_location_forward (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp index 5becd14b268..8b6ebd8a2b5 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp @@ -5,7 +5,7 @@ #include "tao/Exception.h" -Server_ORBInitializer2::Server_ORBInitializer2 (void) +Server_ORBInitializer2::Server_ORBInitializer2 () : sri_ (0) { } diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h index 9abb165e2f1..8ab29827aa2 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h @@ -25,7 +25,7 @@ class Server_ORBInitializer2 : public virtual ::CORBA::LocalObject { public: - Server_ORBInitializer2 (void); + Server_ORBInitializer2 (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp index ef1519b4a3d..720ac6d87dc 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp @@ -14,24 +14,24 @@ #include "ace/OS_NS_sys_time.h" #include "tao/PI/PIForwardRequestC.h" -TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void) +TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 () : orb_ (0), expired_ (0) { } -TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void) +TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 () { } char * -TAO249_ServerRequest_Interceptor2::name (void) +TAO249_ServerRequest_Interceptor2::name () { return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor2"); } void -TAO249_ServerRequest_Interceptor2::destroy (void) +TAO249_ServerRequest_Interceptor2::destroy () { } @@ -111,7 +111,7 @@ TAO249_ServerRequest_Interceptor2::receive_request ( } TimeBase::TimeT -TAO249_ServerRequest_Interceptor2::get_now (void) +TAO249_ServerRequest_Interceptor2::get_now () { // 1582... const TimeBase::TimeT timeOffset = ACE_UINT64_LITERAL (0x1B21DD213814000); diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h index 9582c2fc71e..ad930572875 100644 --- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h +++ b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h @@ -24,10 +24,10 @@ class TAO249_ServerRequest_Interceptor2 { public: /// Constructor. - TAO249_ServerRequest_Interceptor2 (void); + TAO249_ServerRequest_Interceptor2 (); /// Destructor. - ~TAO249_ServerRequest_Interceptor2 (void); + ~TAO249_ServerRequest_Interceptor2 (); /** * @name Methods Required by the Server Request Interceptor @@ -67,7 +67,7 @@ public: CORBA::Object_var server_iogr_; protected: - TimeBase::TimeT get_now (void); + TimeBase::TimeT get_now (); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp index 822aec3cc9f..51d7cae2ccc 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.cpp @@ -9,19 +9,19 @@ Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong) } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } void -Hello::ping (void) +Hello::ping () { return; } CORBA::Boolean -Hello::has_ft_request_service_context (void) +Hello::has_ft_request_service_context () { return ServerRequest_Interceptor2::has_ft_request_sc_; } diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h index 5f48cef8b47..0d37a35b486 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/Hello.h @@ -19,11 +19,11 @@ public: Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0); // = The skeleton methods - virtual void shutdown (void); + virtual void shutdown (); - virtual void ping (void); + virtual void ping (); - virtual CORBA::Boolean has_ft_request_service_context (void); + virtual CORBA::Boolean has_ft_request_service_context (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp index 25eac5e2ed5..8edbe615942 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.cpp @@ -17,23 +17,23 @@ CORBA::Boolean ServerRequest_Interceptor2::has_ft_request_sc_ = false; -ServerRequest_Interceptor2::ServerRequest_Interceptor2 (void) +ServerRequest_Interceptor2::ServerRequest_Interceptor2 () : orb_ (0) { } -ServerRequest_Interceptor2::~ServerRequest_Interceptor2 (void) +ServerRequest_Interceptor2::~ServerRequest_Interceptor2 () { } char * -ServerRequest_Interceptor2::name (void) +ServerRequest_Interceptor2::name () { return CORBA::string_dup ("ServerRequest_Interceptor2"); } void -ServerRequest_Interceptor2::destroy (void) +ServerRequest_Interceptor2::destroy () { } diff --git a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h index 90e7b28be04..5e2354ef9fc 100644 --- a/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h +++ b/TAO/orbsvcs/tests/Bug_2615_Regression/ServerRequest_Interceptor2.h @@ -23,10 +23,10 @@ class ServerRequest_Interceptor2 { public: /// Constructor. -ServerRequest_Interceptor2 (void); +ServerRequest_Interceptor2 (); /// Destructor. -~ServerRequest_Interceptor2 (void); +~ServerRequest_Interceptor2 (); /** * @name Methods Required by the Server Request Interceptor @@ -38,9 +38,9 @@ ServerRequest_Interceptor2 (void); */ //@{ /// Return the name of this ServerRequestinterceptor. -virtual char * name (void); +virtual char * name (); -virtual void destroy (void); +virtual void destroy (); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri); diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp index 6fe6f190c88..ea65e8cdb2d 100644 --- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp +++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.cpp @@ -84,7 +84,7 @@ Client_Task::make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA: } /// Thread entry point -int Client_Task::svc (void) +int Client_Task::svc () { try { diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h index adf9b07397b..c13b3f15298 100644 --- a/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h +++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Client_Task.h @@ -19,7 +19,7 @@ public: CORBA::ULong group_version); /// Thread entry point - int svc (void); + int svc (); private: CORBA::ORB_var corb_; diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp index f7904897fff..457285eeac9 100644 --- a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp +++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.cpp @@ -16,7 +16,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output, } int -Server_Task::svc (void) +Server_Task::svc () { try { diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h index 881b0dddb18..4010d61c399 100644 --- a/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h +++ b/TAO/orbsvcs/tests/Bug_2709_Regression/Server_Task.h @@ -15,7 +15,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Output file for IOR diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp index f0be3e754a6..63010aacfcf 100644 --- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp +++ b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.cpp @@ -7,14 +7,14 @@ TestImpl::TestImpl (CORBA::ORB_ptr orb) } // virtual -void TestImpl::myMethod (void) +void TestImpl::myMethod () { ACE_DEBUG ((LM_ERROR, "(%P): TestImpl::myMethod called!.\n") ); } // virtual -void TestImpl::shutdown (void) +void TestImpl::shutdown () { // Give the client thread time to return from the collocated // call to this method before shutting down the ORB. We sleep diff --git a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h index 6e31010ec83..7e19e202d18 100644 --- a/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h +++ b/TAO/orbsvcs/tests/Bug_2709_Regression/TestImpl.h @@ -8,9 +8,9 @@ public: TestImpl (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void myMethod (void); + virtual void myMethod (); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp index 4efc517a981..0ce11d8abb5 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.cpp @@ -7,13 +7,13 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (void) +Hello::get_string () { return CORBA::string_dup ("Hello there!"); } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/Hello.h @@ -14,9 +14,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void); + virtual char * get_string (); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp index c11d9ebe239..7e9b59fda89 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.cpp @@ -6,7 +6,7 @@ NsShutdown::NsShutdown (CORBA::ORB_ptr orb) } void -NsShutdown::shutdown (void) +NsShutdown::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h index 1a6c841d700..c849efdebb5 100644 --- a/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h +++ b/TAO/orbsvcs/tests/Bug_2800_Regression/NsShutdown.h @@ -13,7 +13,7 @@ public: /// Constructor NsShutdown (CORBA::ORB_ptr orb); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp index bcbbebb7f2d..bb3257e2aca 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.cpp @@ -5,7 +5,7 @@ #include "tao/Exception.h" -Server_ORBInitializer2::Server_ORBInitializer2 (void) +Server_ORBInitializer2::Server_ORBInitializer2 () : sri_ (0) { } diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h index 9abb165e2f1..8ab29827aa2 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerORBInitializer2.h @@ -25,7 +25,7 @@ class Server_ORBInitializer2 : public virtual ::CORBA::LocalObject { public: - Server_ORBInitializer2 (void); + Server_ORBInitializer2 (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp index cb01b6ce8e3..bb71b45abee 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.cpp @@ -16,13 +16,13 @@ int invocation_count = 0; -TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void) +TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 () : orb_ (0), expired_ (0) { } -TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void) +TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 () { } @@ -138,7 +138,7 @@ TAO249_ServerRequest_Interceptor2::receive_request ( } TimeBase::TimeT -TAO249_ServerRequest_Interceptor2::get_now (void) +TAO249_ServerRequest_Interceptor2::get_now () { // 1582... const TimeBase::TimeT timeOffset = ACE_UINT64_LITERAL (0x1B21DD213814000); diff --git a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h index 9582c2fc71e..ad930572875 100644 --- a/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h +++ b/TAO/orbsvcs/tests/Bug_3215_Regression/ServerRequest_Interceptor2.h @@ -24,10 +24,10 @@ class TAO249_ServerRequest_Interceptor2 { public: /// Constructor. - TAO249_ServerRequest_Interceptor2 (void); + TAO249_ServerRequest_Interceptor2 (); /// Destructor. - ~TAO249_ServerRequest_Interceptor2 (void); + ~TAO249_ServerRequest_Interceptor2 (); /** * @name Methods Required by the Server Request Interceptor @@ -67,7 +67,7 @@ public: CORBA::Object_var server_iogr_; protected: - TimeBase::TimeT get_now (void); + TimeBase::TimeT get_now (); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp index fa4b6386745..fe9ba1b094a 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.cpp @@ -10,13 +10,13 @@ #include "ace/OS_NS_string.h" #include "Hello.h" -TAO249_ServerRequest_Interceptor::TAO249_ServerRequest_Interceptor (void) +TAO249_ServerRequest_Interceptor::TAO249_ServerRequest_Interceptor () : orb_ (0), client_id_ (0) { } -TAO249_ServerRequest_Interceptor::~TAO249_ServerRequest_Interceptor (void) +TAO249_ServerRequest_Interceptor::~TAO249_ServerRequest_Interceptor () { } diff --git a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h index d499c499f0b..78ed68f0631 100644 --- a/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h +++ b/TAO/orbsvcs/tests/Bug_3216_Regression/ServerRequest_Interceptor.h @@ -23,10 +23,10 @@ class TAO249_ServerRequest_Interceptor { public: /// Constructor. -TAO249_ServerRequest_Interceptor (void); +TAO249_ServerRequest_Interceptor (); /// Destructor. -~TAO249_ServerRequest_Interceptor (void); +~TAO249_ServerRequest_Interceptor (); /** * @name Methods Required by the Server Request Interceptor diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp index 164895340fb..f889b69ae73 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.cpp @@ -75,7 +75,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) } -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h index ad99b055f31..90cb0343cef 100644 --- a/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h +++ b/TAO/orbsvcs/tests/Bug_3387_Regression/Messenger_i.h @@ -10,7 +10,7 @@ class Messenger_i : public POA_Messenger public: Messenger_i (CORBA::ORB_ptr orb); - virtual ~Messenger_i (void); + virtual ~Messenger_i (); CORBA::Boolean send_message (const char * user_name, const char * subject, diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp index 3c88fae18c2..776f2b80058 100644 --- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp +++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.cpp @@ -7,12 +7,12 @@ CORBA::Boolean ClientRequest_Interceptor::success_flag_ = 0; - ClientRequest_Interceptor::ClientRequest_Interceptor (void) + ClientRequest_Interceptor::ClientRequest_Interceptor () : name_ ("ClientRequest_Interceptor") { } - ClientRequest_Interceptor::~ClientRequest_Interceptor (void) + ClientRequest_Interceptor::~ClientRequest_Interceptor () { } diff --git a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h index 36235e54b3a..1ba41d68aba 100644 --- a/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h +++ b/TAO/orbsvcs/tests/Bug_3598b_Regression/ClientRequest_Interceptor.h @@ -28,9 +28,9 @@ class ClientRequest_Interceptor public virtual ::CORBA::LocalObject { public: -ClientRequest_Interceptor (void); +ClientRequest_Interceptor (); -~ClientRequest_Interceptor (void); +~ClientRequest_Interceptor (); /// Canonical name of the interceptor. virtual char * name (); diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp index 4efc517a981..0ce11d8abb5 100644 --- a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp +++ b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.cpp @@ -7,13 +7,13 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (void) +Hello::get_string () { return CORBA::string_dup ("Hello there!"); } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h +++ b/TAO/orbsvcs/tests/Bug_3673_Regression/Hello.h @@ -14,9 +14,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void); + virtual char * get_string (); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp index c11d9ebe239..7e9b59fda89 100644 --- a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp +++ b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.cpp @@ -6,7 +6,7 @@ NsShutdown::NsShutdown (CORBA::ORB_ptr orb) } void -NsShutdown::shutdown (void) +NsShutdown::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h index 1a6c841d700..c849efdebb5 100644 --- a/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h +++ b/TAO/orbsvcs/tests/Bug_3673_Regression/NsShutdown.h @@ -13,7 +13,7 @@ public: /// Constructor NsShutdown (CORBA::ORB_ptr orb); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp index 189f408731f..e9840f46d6e 100644 --- a/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp +++ b/TAO/orbsvcs/tests/Bug_4080_Regression/server.cpp @@ -53,7 +53,7 @@ public: { } - virtual int svc (void) + virtual int svc () { try { diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp index ec19adb739f..0106a7436b7 100644 --- a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp +++ b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.cpp @@ -9,7 +9,7 @@ UIPMC_Object_Impl::UIPMC_Object_Impl (CORBA::ORB_ptr orb, { } -UIPMC_Object_Impl::~UIPMC_Object_Impl (void) +UIPMC_Object_Impl::~UIPMC_Object_Impl () { } diff --git a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h index 25aad8e5c45..ae2aa913035 100644 --- a/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h +++ b/TAO/orbsvcs/tests/Bug_4080_Regression/test_impl.h @@ -9,7 +9,7 @@ class UIPMC_Object_Impl : public virtual POA_Test::UIPMC_Object { public: UIPMC_Object_Impl (CORBA::ORB_ptr orb, CORBA::ULong num_threads); - ~UIPMC_Object_Impl (void); + ~UIPMC_Object_Impl (); // The skeleton methods virtual void process (); diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp index d1ee5370765..a03559bd56a 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.cpp @@ -16,7 +16,7 @@ Client_Task::Client_Task (CosNaming::NamingContext_ptr root_context, } int -Client_Task::svc (void) +Client_Task::svc () { try { diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h index 6148938a66b..2961144d06f 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Client_Task.h @@ -22,7 +22,7 @@ public: CORBA::Boolean result); /// Thread entry point - int svc (void); + int svc (); private: CosNaming::NamingContext_var root_context_; diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp index f047a361bee..ae17e626300 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.cpp @@ -12,7 +12,7 @@ } char * -Hello::get_string (void) +Hello::get_string () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Upcall in process ..\n")); @@ -54,7 +54,7 @@ Hello::get_string (void) } void -Hello::shutdown (void) +Hello::shutdown () { // Give the client thread time to return from the collocated // call to this method before shutting down the ORB. We sleep diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h index 043a6968853..e9c0f470f49 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Hello.h @@ -15,9 +15,9 @@ public: ACE_thread_t thr_id); // = The skeleton methods - virtual char * get_string (void); + virtual char * get_string (); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp index 9b72cfaecad..8b398a90449 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.cpp @@ -16,7 +16,7 @@ Server_Task::Server_Task (CosNaming::NamingContext_ptr root_context, } int -Server_Task::svc (void) +Server_Task::svc () { try { diff --git a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h index f4bdbbf8f0c..b909a5aef7c 100644 --- a/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h +++ b/TAO/orbsvcs/tests/COIOP_Naming_Test/Server_Task.h @@ -28,7 +28,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: CosNaming::NamingContext_var root_context_; diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp index 1f02ddec574..89ff1865f37 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp @@ -25,7 +25,7 @@ // Constructor. -CC_Client::CC_Client (void) +CC_Client::CC_Client () : naming_service_ (0), cc_factory_ior_file_ (0), cc_factory_key_ (0), @@ -39,7 +39,7 @@ CC_Client::CC_Client (void) { } -CC_Client::~CC_Client (void) +CC_Client::~CC_Client () { // Free resources and close the ior files. if (this->cc_factory_ior_file_) @@ -81,7 +81,7 @@ CC_Client::read_ior (ACE_TCHAR *filename) // Parses the command line arguments and returns an error status. int -CC_Client::parse_args (void) +CC_Client::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dc:sf:k:xbhe:")); int c; @@ -141,7 +141,7 @@ CC_Client::parse_args (void) // Execute client example code. int -CC_Client::run (void) +CC_Client::run () { int tests_run = 0; // Tells whether any tests have been run @@ -204,7 +204,7 @@ CC_Client::run (void) // This function runs basic tests concerned with only one lock set int -CC_Client::run_basic_tests (void) +CC_Client::run_basic_tests () { Test_Single_Lock_With_Mode t1 (naming_service_, CosConcurrencyControl::read); @@ -337,7 +337,7 @@ CC_Client::run_extended_tests (ACE_TCHAR *params) } void -CC_Client::print_usage (void) +CC_Client::print_usage () { ACE_ERROR ((LM_ERROR, "usage: %s" @@ -353,7 +353,7 @@ CC_Client::print_usage (void) } int -CC_Client::init_naming_service (void) +CC_Client::init_naming_service () { try { diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.h b/TAO/orbsvcs/tests/Concurrency/CC_client.h index 475c869b6c8..0902623fd3f 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_client.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_client.h @@ -28,7 +28,7 @@ #define _CC_CLIENT_H_ // Stuff to be used by the command file parser -int ace_cc_yyparse(void); +int ace_cc_yyparse(); int line_no = 1; char line_buf[500]; CC_CommandList *cmdlist; @@ -49,30 +49,30 @@ class CC_Client { public: /// Default constructor. - CC_Client (void); + CC_Client (); /// Destructor. - ~CC_Client (void); + ~CC_Client (); /// Run the test. - int run (void); + int run (); /// Initialize the test with the parameters from the command line. int init (int argc, ACE_TCHAR **argv); private: /// Function to initialize the naming service. - int init_naming_service (void); + int init_naming_service (); /// Function to parse the command line arguments. - int parse_args (void); + int parse_args (); /// Function to read the ior from the given file. int read_ior (ACE_TCHAR *filename); /// Runs the basic tests (on a single lock set). Returns CC_SUCCESS /// upon success CC_FAIL otherwise. - int run_basic_tests (void); + int run_basic_tests (); /// Runs the extended tests (on more lock sets). Returns CC_SUCCESS /// upon success CC_FAIL otherwise. @@ -131,6 +131,6 @@ private: ACE_TCHAR *script_file_; /// Prints out the options to the program. - void print_usage (void); + void print_usage (); }; #endif /* !defined (_CC_CLIENT_H_) */ diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp index 02c06d83899..28b22d7c5d4 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp @@ -20,7 +20,7 @@ #include "ace/OS_NS_unistd.h" #include "ace/OS_NS_string.h" -CC_Command::~CC_Command(void) +CC_Command::~CC_Command() { } @@ -29,7 +29,7 @@ int CC_Command::execute() return 0; } -CC_Command::CC_Command(void) +CC_Command::CC_Command() { } @@ -88,7 +88,7 @@ CC_Start_Cmd::~CC_Start_Cmd() } } -int CC_Start_Cmd::execute(void) +int CC_Start_Cmd::execute() { if (excep_) { @@ -136,7 +136,7 @@ CC_CreateLockSet_Cmd::~CC_CreateLockSet_Cmd() } } -int CC_CreateLockSet_Cmd::execute(void) +int CC_CreateLockSet_Cmd::execute() { if(excep_) { @@ -185,7 +185,7 @@ CC_Lock_Cmd::~CC_Lock_Cmd() ACE_OS::free (this->name_); } -int CC_Lock_Cmd::execute(void) +int CC_Lock_Cmd::execute() { if(excep_) { @@ -226,7 +226,7 @@ CC_UnLock_Cmd::~CC_UnLock_Cmd() ACE_OS::free (this->name_); } -int CC_UnLock_Cmd::execute(void) +int CC_UnLock_Cmd::execute() { if(excep_) { @@ -267,7 +267,7 @@ CC_TryLock_Cmd::~CC_TryLock_Cmd() ACE_OS::free (this->name_); } -int CC_TryLock_Cmd::execute(void) +int CC_TryLock_Cmd::execute() { if(excep_) { @@ -327,7 +327,7 @@ CC_ChangeMode_Cmd::~CC_ChangeMode_Cmd() ACE_OS::strdup (this->name_); } -int CC_ChangeMode_Cmd::execute(void) +int CC_ChangeMode_Cmd::execute() { if(excep_) { @@ -363,7 +363,7 @@ CC_Sleep_Cmd::~CC_Sleep_Cmd() { } -int CC_Sleep_Cmd::execute(void) +int CC_Sleep_Cmd::execute() { if(excep_) { @@ -388,7 +388,7 @@ CC_Repeat_Cmd::~CC_Repeat_Cmd() { } -int CC_Repeat_Cmd::execute(void) +int CC_Repeat_Cmd::execute() { if(excep_) { @@ -413,7 +413,7 @@ CC_Wait_Cmd::~CC_Wait_Cmd() ACE_OS::free (this->prompt_); } -int CC_Wait_Cmd::execute(void) +int CC_Wait_Cmd::execute() { if (excep_) { @@ -437,13 +437,13 @@ CC_Excep_Cmd::CC_Excep_Cmd (const char *excep) // printf("CC_Excep_Cmd::CC_Excep_Cmd: excep: %s\n", excep); } -CC_Excep_Cmd::~CC_Excep_Cmd(void) +CC_Excep_Cmd::~CC_Excep_Cmd() { ACE_OS::free (this->ex_); } int -CC_Excep_Cmd::execute(void) +CC_Excep_Cmd::execute() { ACE_OS::printf ("Executing excep command (expected: %s)\n", ex_); // First we check to see if an exception has occurred. If not we fail @@ -467,16 +467,16 @@ CC_Excep_Cmd::execute(void) } } -CC_Dummy_Cmd::CC_Dummy_Cmd(void) +CC_Dummy_Cmd::CC_Dummy_Cmd() { } -CC_Dummy_Cmd::~CC_Dummy_Cmd(void) +CC_Dummy_Cmd::~CC_Dummy_Cmd() { } int -CC_Dummy_Cmd::execute(void) +CC_Dummy_Cmd::execute() { return 1; // CC_SUCCESS } @@ -486,13 +486,13 @@ CC_Print_Cmd::CC_Print_Cmd (const char * message) { } -CC_Print_Cmd::~CC_Print_Cmd(void) +CC_Print_Cmd::~CC_Print_Cmd() { ACE_OS::free(msg_); } int -CC_Print_Cmd::execute(void) +CC_Print_Cmd::execute() { ACE_OS::printf ("%s\n", msg_); return 1; // CC_SUCCESS @@ -513,7 +513,7 @@ CC_Lookup_Cmd::~CC_Lookup_Cmd() } int -CC_Lookup_Cmd::execute(void) +CC_Lookup_Cmd::execute() { if(excep_) { @@ -552,17 +552,17 @@ CC_CommandElem::CC_CommandElem(CC_Command *cmd, CC_CommandElem *next) { } -CC_CommandElem::~CC_CommandElem(void) +CC_CommandElem::~CC_CommandElem() { } -CC_Command *CC_CommandElem::GetCommand(void) +CC_Command *CC_CommandElem::GetCommand() { return cmd_; } CC_CommandElem * -CC_CommandElem::GetNext(void) +CC_CommandElem::GetNext() { return next_; } @@ -573,13 +573,13 @@ CC_CommandElem::SetNext(CC_CommandElem *next) next_ = next; } -CC_CommandList::CC_CommandList(void) +CC_CommandList::CC_CommandList() : head_ (0), last_ (0), times_ (1) { ACE_OS::printf("CC_CommandList::CC_CommandList\n"); } -CC_CommandList::~CC_CommandList(void) +CC_CommandList::~CC_CommandList() { } @@ -601,7 +601,7 @@ CC_CommandList::add(CC_Command *cmd) } int -CC_CommandList::execute(void) +CC_CommandList::execute() { CC_CommandElem *current = head_; diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.h b/TAO/orbsvcs/tests/Concurrency/CC_command.h index 91f2299127d..3e322c09dac 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.h @@ -32,7 +32,7 @@ class CC_Command { public: /// Destructor - virtual ~CC_Command(void); + virtual ~CC_Command(); /// Abstract execute method virtual int execute() = 0; @@ -44,7 +44,7 @@ class CC_Command GetLockSet (const char *lock_set_name); /// Default constructor. We do not want instances of this class - CC_Command(void); + CC_Command(); /** * The last exception raised in one of the test commands. This variable @@ -83,7 +83,7 @@ class CC_Start_Cmd : public CC_Command /// Start the child process. The current version does not wait for the /// process to terminate. - virtual int execute(void); + virtual int execute(); private: /// The name of the script file @@ -110,7 +110,7 @@ class CC_CreateLockSet_Cmd : public CC_Command /// Executes the command, i.e. creates the lock set and binds the name /// in the naming service. - virtual int execute(void); + virtual int execute(); private: /// The name used to bind in the naming service. @@ -137,7 +137,7 @@ class CC_Lock_Cmd:public CC_Command /// Executes the command, i.e. looks up the lock set with the requested /// name in the naming server and executes the lock command on that lock set. - virtual int execute(void); + virtual int execute(); private: /// The name to look up in the naming service. @@ -170,7 +170,7 @@ class CC_UnLock_Cmd:public CC_Command * name in the naming server and executes the unlock command on that * lock set. */ - virtual int execute(void); + virtual int execute(); private: /// The name to look up in the naming service. @@ -203,7 +203,7 @@ class CC_TryLock_Cmd:public CC_Command * name in the naming server and executes the try_lock command on that * lock set. */ - virtual int execute(void); + virtual int execute(); private: /// The name to look up in the naming service. @@ -237,7 +237,7 @@ class CC_ChangeMode_Cmd:public CC_Command * name in the naming server and executes the change_mode command on that * lock set. */ - virtual int execute(void); + virtual int execute(); private: /// The name to look up in the naming service. @@ -269,7 +269,7 @@ class CC_Sleep_Cmd:public CC_Command virtual ~CC_Sleep_Cmd(); /// Executes the command. - virtual int execute(void); + virtual int execute(); private: /// The number of seconds to sleep @@ -295,7 +295,7 @@ class CC_Repeat_Cmd:public CC_Command virtual ~CC_Repeat_Cmd(); /// Executes the command. - virtual int execute(void); + virtual int execute(); private: /// The number of times the commands should be repeated int times_; @@ -320,7 +320,7 @@ class CC_Wait_Cmd:public CC_Command virtual ~CC_Wait_Cmd(); /// Executes the command. - virtual int execute(void); + virtual int execute(); private: /// The prompt to print on the screen @@ -343,14 +343,14 @@ class CC_Excep_Cmd : public CC_Command CC_Excep_Cmd (const char *excep); /// Destructor. - virtual ~CC_Excep_Cmd(void); + virtual ~CC_Excep_Cmd(); /** * Executes the command. Checks to see if the excep_ class variable is set, * and if that's the case check that it is of the expected type. If not the * test fails. */ - virtual int execute(void); + virtual int execute(); private: /// The string representation of the expected exception @@ -369,13 +369,13 @@ class CC_Dummy_Cmd: public CC_Command { public: /// Constructor. - CC_Dummy_Cmd(void); + CC_Dummy_Cmd(); /// Destructor. - virtual ~CC_Dummy_Cmd(void); + virtual ~CC_Dummy_Cmd(); /// Executes the command, i.e. does nothing. - virtual int execute(void); + virtual int execute(); private: }; @@ -395,10 +395,10 @@ public: CC_Print_Cmd (const char *message); /// Destructor. - virtual ~CC_Print_Cmd(void); + virtual ~CC_Print_Cmd(); /// Executes the command. - virtual int execute(void); + virtual int execute(); private: /// Holds the message to print @@ -425,7 +425,7 @@ public: /// Executes the command, i.e. looks up the lock set with the requested /// name in the naming server and sets the cc_lockset_ variable. - virtual int execute(void); + virtual int execute(); private: /// The name to look up in the naming service. @@ -448,13 +448,13 @@ class CC_CommandElem CC_CommandElem (CC_Command *cmd, CC_CommandElem *next); /// Destructor. - ~CC_CommandElem(void); + ~CC_CommandElem(); /// Returns a pointer to the command in this element - CC_Command *GetCommand(void); + CC_Command *GetCommand(); /// Returns the pointer to the next element - CC_CommandElem *GetNext(void); + CC_CommandElem *GetNext(); /// Sets the next pointer void SetNext(CC_CommandElem *next); @@ -480,16 +480,16 @@ class CC_CommandList { public: /// Constructor. - CC_CommandList(void); + CC_CommandList(); /// Destructor. - ~CC_CommandList(void); + ~CC_CommandList(); /// Adds the command to the list int add(CC_Command *cmd); /// Executes all the commands in the list from head to tail - int execute(void); + int execute(); /// Sets the number of times to repeat the script void setrepeat(int times); diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp index 9ca80305f9e..a6e3b6a798c 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp @@ -32,7 +32,7 @@ #include "ace/OS_NS_stdio.h" void ace_cc_yyerror (const char* s); -int ace_cc_yylex(void); +int ace_cc_yylex(); extern int line_no; extern char line_buf[500]; @@ -436,7 +436,7 @@ __ace_cc_yy_memcpy (char *to, char *from, unsigned int count) #ifdef ACE_CC_YYPARSE_PARAM int ace_cc_yyparse (void *); #else -int ace_cc_yyparse (void); +int ace_cc_yyparse (); #endif #endif diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp index 573e991246f..b9a1d4ecdb6 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.cpp @@ -26,7 +26,7 @@ CC_naming_service::CC_naming_service (CORBA::ORB_var orb) instance_ = this; } -CC_naming_service::CC_naming_service(void) +CC_naming_service::CC_naming_service() : cc_factory_key_ (0), orb_ (0), factory_ (0) @@ -43,7 +43,7 @@ CC_naming_service::Init(CORBA::ORB_var orb) throw CORBA::INTERNAL (); } -CC_naming_service::~CC_naming_service (void) +CC_naming_service::~CC_naming_service () { // if(instance_!=0) // delete instance_; @@ -51,7 +51,7 @@ CC_naming_service::~CC_naming_service (void) } CC_naming_service * -CC_naming_service::Instance(void) +CC_naming_service::Instance() { if(instance_ == 0) { @@ -118,13 +118,13 @@ CC_naming_service::bind_name (const char *n, } CosConcurrencyControl::LockSetFactory_var -CC_naming_service::get_lock_set_factory (void) +CC_naming_service::get_lock_set_factory () { return this->factory_; } int -CC_naming_service::init_naming_service (void) +CC_naming_service::init_naming_service () { try { diff --git a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h index 05f8032d130..1fa453174d1 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_naming_service.h @@ -37,7 +37,7 @@ public: CC_naming_service (CORBA::ORB_var orb_); /// Default destructor. - ~CC_naming_service (void); + ~CC_naming_service (); /// Initialization method must be called after first call of Instance() /// in order to initialize the object correctly @@ -52,14 +52,14 @@ public: CORBA::Object_ptr obj); /// Gets the cc lock set factory which is common for all tests. - CosConcurrencyControl::LockSetFactory_var get_lock_set_factory (void); + CosConcurrencyControl::LockSetFactory_var get_lock_set_factory (); /// The naming service object is a singleton - static CC_naming_service *Instance(void); + static CC_naming_service *Instance(); private: /// Function to initialize the naming service. - int init_naming_service (void); + int init_naming_service (); /// Key of factory obj ref. char *cc_factory_key_; diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp index 84a8735d485..60a98f4fc27 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp @@ -36,7 +36,7 @@ char *CC_TestUtils::get_lock_mode_name (CosConcurrencyControl::lock_mode mode) } CosConcurrencyControl::LockSet_ptr -CC_TestUtils::create_lock_set (void) +CC_TestUtils::create_lock_set () { // Create the lock set and return an obj ref corresponding to the // key. diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h index a9176e5874e..bf1f3791ec0 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.h @@ -24,7 +24,7 @@ class CC_TestUtils /// Creates a lock set by means of th lock set factory in the concurrency /// service server. - static CosConcurrencyControl::LockSet_ptr create_lock_set (void); + static CosConcurrencyControl::LockSet_ptr create_lock_set (); private: }; diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp index 5073a4f2aab..0dc8df76628 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp @@ -20,12 +20,12 @@ CC_Test::CC_Test (CC_naming_service *ns) { } -CC_Test::~CC_Test (void) +CC_Test::~CC_Test () { } CosConcurrencyControl::LockSet_ptr -CC_Test::create_lock_set (void) +CC_Test::create_lock_set () { // Create the lock set and return an obj ref corresponding to the // key. @@ -79,7 +79,7 @@ Test_Single_Lock_With_Mode::Test_Single_Lock_With_Mode (CC_naming_service *namin { } -Test_Single_Lock_With_Mode::~Test_Single_Lock_With_Mode (void) +Test_Single_Lock_With_Mode::~Test_Single_Lock_With_Mode () { } @@ -152,7 +152,7 @@ Test_Setup_LockSet::Test_Setup_LockSet (CC_naming_service *naming_service, { } -Test_Setup_LockSet::~Test_Setup_LockSet (void) +Test_Setup_LockSet::~Test_Setup_LockSet () { } @@ -192,7 +192,7 @@ Test_Use_Already_Created_LockSet (CC_naming_service *naming_service, { } -Test_Use_Already_Created_LockSet::~Test_Use_Already_Created_LockSet (void) +Test_Use_Already_Created_LockSet::~Test_Use_Already_Created_LockSet () { } @@ -229,7 +229,7 @@ Test_Unlock_Already_Created_LockSet (CC_naming_service *naming_service, { } -Test_Unlock_Already_Created_LockSet::~Test_Unlock_Already_Created_LockSet (void) +Test_Unlock_Already_Created_LockSet::~Test_Unlock_Already_Created_LockSet () { } @@ -264,7 +264,7 @@ Test_Release_Not_Held_Lock::Test_Release_Not_Held_Lock (CC_naming_service *namin { } -Test_Release_Not_Held_Lock::~Test_Release_Not_Held_Lock (void) +Test_Release_Not_Held_Lock::~Test_Release_Not_Held_Lock () { } diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.h b/TAO/orbsvcs/tests/Concurrency/CC_tests.h index 0582031aede..d07b084c718 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_tests.h +++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.h @@ -40,7 +40,7 @@ public: CC_Test (CC_naming_service *ns); /// Destructor - virtual ~CC_Test (void); + virtual ~CC_Test (); /// Run the test times_to_run number of times. Returns CC_SUCCESS on /// success CC_FAIL otherwise. @@ -48,7 +48,7 @@ public: /// Create a new lock set using the default global lock set factory /// from the naming service. - CosConcurrencyControl::LockSet_ptr create_lock_set (void); + CosConcurrencyControl::LockSet_ptr create_lock_set (); /// Returns a human readable string from the lock mode enum. char *get_lock_mode_name (CosConcurrencyControl::lock_mode mode); @@ -79,7 +79,7 @@ public: CosConcurrencyControl::lock_mode mode); /// Destructor - virtual ~Test_Single_Lock_With_Mode (void); + virtual ~Test_Single_Lock_With_Mode (); /// Runs the test the specified number of times. virtual int run (int times_to_run = 1); @@ -107,7 +107,7 @@ public: char *name); /// Destructor - virtual ~Test_Setup_LockSet (void); + virtual ~Test_Setup_LockSet (); /// Runs the test the specified number of times. virtual int run (int times_to_run = 1); @@ -135,7 +135,7 @@ public: char *name); /// Destructor - virtual ~Test_Use_Already_Created_LockSet (void); + virtual ~Test_Use_Already_Created_LockSet (); /// Runs the test the specified number of times. virtual int run (int times_to_run = 1); @@ -163,7 +163,7 @@ public: char *name); /// Destructor - virtual ~Test_Unlock_Already_Created_LockSet (void); + virtual ~Test_Unlock_Already_Created_LockSet (); /// Runs the test the specified number of times. virtual int run (int times_to_run = 1); @@ -188,7 +188,7 @@ public: CosConcurrencyControl::lock_mode mode_); /// Destructor - virtual ~Test_Release_Not_Held_Lock (void); + virtual ~Test_Release_Not_Held_Lock (); /// Runs the test the specified number of times. virtual int run (int times_to_run = 1); diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp index 9ad047ca96e..3074ea3b246 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp @@ -113,7 +113,7 @@ MTD_Task::svc () } void -MTD_Task::run_iteration (void) +MTD_Task::run_iteration () { // Obtain the consumer admin.. CosEventChannelAdmin::ConsumerAdmin_var consumer_admin = diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h index 4864aa04f86..db266b65cc2 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h +++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h @@ -26,10 +26,10 @@ public: int use_callbacks); // = Check the ACE_Task_Base documentation. - int svc (void); + int svc (); /// Run a single iteration of the test - void run_iteration (void); + void run_iteration (); private: /// The event channel used on the test diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp index 8ad7a6de0f8..f962621288c 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp @@ -25,7 +25,7 @@ deactivate_servant (PortableServer::Servant servant) } -RND_Driver::RND_Driver (void) +RND_Driver::RND_Driver () : nsuppliers_ (4), nconsumers_ (4), max_recursion_ (1) @@ -326,7 +326,7 @@ RND_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin) } void -RND_Consumer::disconnect (void) +RND_Consumer::disconnect () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -344,7 +344,7 @@ RND_Consumer::push (const CORBA::Any &event) } void -RND_Consumer::disconnect_push_consumer (void) +RND_Consumer::disconnect_push_consumer () { } @@ -376,7 +376,7 @@ RND_Supplier::connect (CosEventChannelAdmin::SupplierAdmin_ptr admin) } void -RND_Supplier::disconnect (void) +RND_Supplier::disconnect () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -388,7 +388,7 @@ RND_Supplier::disconnect (void) } void -RND_Supplier::push_new_event (void) +RND_Supplier::push_new_event () { CORBA::Any event; CORBA::Long recursion = 0; @@ -415,12 +415,12 @@ RND_Supplier::push (CORBA::Any &event) } void -RND_Supplier::disconnect_push_supplier (void) +RND_Supplier::disconnect_push_supplier () { } int -RND_Supplier::svc (void) +RND_Supplier::svc () { ACE_DEBUG ((LM_DEBUG, "Thread %t started\n")); int percent = 10; diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h index b273a714725..2f1f0cb015e 100644 --- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.h +++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.h @@ -35,10 +35,10 @@ public: RND_Consumer (RND_Driver *driver); void push (const CORBA::Any &event); - void disconnect_push_consumer (void); + void disconnect_push_consumer (); void connect (CosEventChannelAdmin::ConsumerAdmin_ptr admin); - void disconnect (void); + void disconnect (); protected: /// The driver @@ -68,16 +68,16 @@ class RND_Supplier { public: /// Constructor - RND_Supplier (void); + RND_Supplier (); void connect (CosEventChannelAdmin::SupplierAdmin_ptr admin); - void disconnect (void); + void disconnect (); /// Push a single event... - void push_new_event (void); + void push_new_event (); void push (CORBA::Any &event); - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); /// Active method virtual int svc (); @@ -91,7 +91,7 @@ private: }; inline -RND_Supplier::RND_Supplier (void) +RND_Supplier::RND_Supplier () { } @@ -100,7 +100,7 @@ RND_Supplier::RND_Supplier (void) class RND_Driver { public: - RND_Driver (void); + RND_Driver (); /// Run the test int run (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp index 2a800d6cd5a..702214b989d 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.cpp @@ -26,7 +26,7 @@ CEC_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer } void -CEC_Counting_Consumer::disconnect (void) +CEC_Counting_Consumer::disconnect () { if (!CORBA::is_nil (this->supplier_proxy_.in ())) { @@ -79,7 +79,7 @@ CEC_Counting_Consumer::push (const CORBA::Any&) } void -CEC_Counting_Consumer::disconnect_push_consumer (void) +CEC_Counting_Consumer::disconnect_push_consumer () { this->disconnect_count++; this->supplier_proxy_ = @@ -113,7 +113,7 @@ CEC_Pull_Counting_Consumer::connect (CosEventChannelAdmin::ConsumerAdmin_ptr con } void -CEC_Pull_Counting_Consumer::disconnect (void) +CEC_Pull_Counting_Consumer::disconnect () { if (!CORBA::is_nil (this->supplier_proxy_.in ())) { @@ -131,7 +131,7 @@ CEC_Pull_Counting_Consumer::disconnect (void) } CORBA::Any* -CEC_Pull_Counting_Consumer::pull (void) +CEC_Pull_Counting_Consumer::pull () { if (CORBA::is_nil (this->supplier_proxy_.in ())) { @@ -180,7 +180,7 @@ CEC_Pull_Counting_Consumer::dump_results (int expected_count, int tolerance) } void -CEC_Pull_Counting_Consumer::disconnect_pull_consumer (void) +CEC_Pull_Counting_Consumer::disconnect_pull_consumer () { this->disconnect_count++; this->supplier_proxy_ = @@ -214,20 +214,20 @@ CEC_Counting_Consumer_Task::svc () } void -CEC_Counting_Consumer_Task::stop (void) +CEC_Counting_Consumer_Task::stop () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->stop_flag_ = 1; } CORBA::ULong -CEC_Counting_Consumer_Task::pull_count (void) +CEC_Counting_Consumer_Task::pull_count () { return this->pull_count_; } void -CEC_Counting_Consumer_Task::run (void) +CEC_Counting_Consumer_Task::run () { CORBA::Any event; event <<= CORBA::Long(0); diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h index 1fe0e7dbb14..7147c487958 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Consumer.h @@ -36,7 +36,7 @@ public: /// Simple connect/disconnect methods.. void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin); - void disconnect (void); + void disconnect (); /// Print out an error message if the event count is too far from the /// expected count. @@ -46,7 +46,7 @@ public: /// The skeleton methods. virtual void push (const CORBA::Any& events); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); /// Keep track of the number of events received. CORBA::ULong event_count; @@ -79,18 +79,18 @@ public: /// Simple connect/disconnect methods.. void connect (CosEventChannelAdmin::ConsumerAdmin_ptr consumer_admin); - void disconnect (void); + void disconnect (); /// Print out an error message if the event count is too far from the /// expected count. void dump_results (int expected_count, int tolerance); - CORBA::Any *pull (void); + CORBA::Any *pull (); CORBA::Any *try_pull (CORBA::Boolean_out has_event); // = The CosEventComm::PullConsumer methods /// The skeleton methods. - virtual void disconnect_pull_consumer (void); + virtual void disconnect_pull_consumer (); /// Keep track of the number of events received. CORBA::ULong event_count; @@ -116,13 +116,13 @@ public: int milliseconds = 0); // = Check the ACE_Task_Base documentation. - int svc (void); + int svc (); - void stop (void); - CORBA::ULong pull_count (void); + void stop (); + CORBA::ULong pull_count (); /// Run a single iteration of the test - void run (void); + void run (); private: /// The consumer we are turning into an active object diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp index f097d4e47e4..734fae09013 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.cpp @@ -2,7 +2,7 @@ #include "ace/OS_NS_unistd.h" -CEC_Counting_Supplier::CEC_Counting_Supplier (void) +CEC_Counting_Supplier::CEC_Counting_Supplier () : event_count (0), disconnect_count (0) { @@ -25,7 +25,7 @@ CEC_Counting_Supplier::connect ( } void -CEC_Counting_Supplier::disconnect (void) +CEC_Counting_Supplier::disconnect () { if (!CORBA::is_nil (this->consumer_proxy_.in ())) { @@ -56,7 +56,7 @@ CEC_Counting_Supplier::push (const CORBA::Any&) } void -CEC_Counting_Supplier::disconnect_push_supplier (void) +CEC_Counting_Supplier::disconnect_push_supplier () { this->disconnect_count++; this->consumer_proxy_ = @@ -90,20 +90,20 @@ CEC_Counting_Supplier_Task::svc () } void -CEC_Counting_Supplier_Task::stop (void) +CEC_Counting_Supplier_Task::stop () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->stop_flag_ = 1; } CORBA::ULong -CEC_Counting_Supplier_Task::push_count (void) +CEC_Counting_Supplier_Task::push_count () { return this->push_count_; } void -CEC_Counting_Supplier_Task::run (void) +CEC_Counting_Supplier_Task::run () { CORBA::Any event; event <<= CORBA::Long(0); @@ -133,7 +133,7 @@ CEC_Counting_Supplier_Task::run (void) // **************************************************************** -CEC_Pull_Counting_Supplier::CEC_Pull_Counting_Supplier (void) +CEC_Pull_Counting_Supplier::CEC_Pull_Counting_Supplier () : event_count (0), disconnect_count (0) { @@ -156,7 +156,7 @@ CEC_Pull_Counting_Supplier::connect ( } void -CEC_Pull_Counting_Supplier::disconnect (void) +CEC_Pull_Counting_Supplier::disconnect () { if (!CORBA::is_nil (this->consumer_proxy_.in ())) { @@ -174,7 +174,7 @@ CEC_Pull_Counting_Supplier::disconnect (void) } CORBA::Any* -CEC_Pull_Counting_Supplier::pull (void) +CEC_Pull_Counting_Supplier::pull () { if (CORBA::is_nil (this->consumer_proxy_.in ())) throw CosEventComm::Disconnected (); @@ -217,7 +217,7 @@ CEC_Pull_Counting_Supplier::try_pull (CORBA::Boolean_out has_event) } void -CEC_Pull_Counting_Supplier::disconnect_pull_supplier (void) +CEC_Pull_Counting_Supplier::disconnect_pull_supplier () { this->disconnect_count++; this->consumer_proxy_ = diff --git a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h index f505200c8fb..73ee061f1c3 100644 --- a/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h +++ b/TAO/orbsvcs/tests/CosEvent/lib/Counting_Supplier.h @@ -32,19 +32,19 @@ class CEC_Test_Export CEC_Counting_Supplier : public POA_CosEventComm::PushSuppl { public: /// Constructor - CEC_Counting_Supplier (void); + CEC_Counting_Supplier (); // = The CosEventComm::PushSupplier methods /// Simple connect/disconnect methods.. void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin); - void disconnect (void); + void disconnect (); /// Push an event. void push (const CORBA::Any& events); /// The skeleton methods. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); /// Count the number of events sent CORBA::ULong event_count; @@ -65,13 +65,13 @@ public: int milliseconds = 0); // = Check the ACE_Task_Base documentation. - int svc (void); + int svc (); - void stop (void); - CORBA::ULong push_count (void); + void stop (); + CORBA::ULong push_count (); /// Run a single iteration of the test - void run (void); + void run (); private: /// The supplier we are turning into an active object @@ -103,18 +103,18 @@ class CEC_Test_Export CEC_Pull_Counting_Supplier : public POA_CosEventComm::Pull { public: /// Constructor - CEC_Pull_Counting_Supplier (void); + CEC_Pull_Counting_Supplier (); // = The CosEventComm::PullSupplier methods /// Simple connect/disconnect methods.. void connect (CosEventChannelAdmin::SupplierAdmin_ptr supplier_admin); - void disconnect (void); + void disconnect (); // The PullSupplier methods. - CORBA::Any* pull (void); + CORBA::Any* pull (); CORBA::Any* try_pull (CORBA::Boolean_out has_event); - virtual void disconnect_pull_supplier (void); + virtual void disconnect_pull_supplier (); /// Count the number of events sent CORBA::ULong event_count; diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp index 9473b645f16..5ca3fcfad91 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp @@ -25,7 +25,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -Driver::Driver (void) +Driver::Driver () : n_consumers_ (1), event_count_ (100), event_a_ (ACE_ES_EVENT_UNDEFINED), @@ -274,7 +274,7 @@ Driver::connect_consumers (RtecEventChannelAdmin::EventChannel_ptr channel) } void -Driver::disconnect_consumers (void) +Driver::disconnect_consumers () { for (int i = 0; i < this->n_consumers_; ++i) { @@ -383,7 +383,7 @@ Test_Consumer::connect (int event_a, } void -Test_Consumer::disconnect (void) +Test_Consumer::disconnect () { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; @@ -402,6 +402,6 @@ Test_Consumer::push (const RtecEventComm::EventSet& events) } void -Test_Consumer::disconnect_push_consumer (void) +Test_Consumer::disconnect_push_consumer () { } diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h index 1294bcf411b..625bbcf9b55 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.h @@ -37,11 +37,11 @@ public: RtecEventChannelAdmin::EventChannel_ptr ec); // This method connects the consumer to the EC. - void disconnect (void); + void disconnect (); // Disconnect from the EC. virtual void push (const RtecEventComm::EventSet& events); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); // The skeleton methods. private: @@ -64,7 +64,7 @@ class Driver // = DESCRIPTION // public: - Driver (void); + Driver (); enum { MAX_CONSUMERS = 16 @@ -85,7 +85,7 @@ private: // parse the command line args void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec); - void disconnect_consumers (void); + void disconnect_consumers (); // Connect and disconnect the consumers. private: diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp index 316116add8d..8c51234d305 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp @@ -15,7 +15,7 @@ #include "ace/OS_NS_errno.h" -ECMS_Driver::ECMS_Driver (void) +ECMS_Driver::ECMS_Driver () : n_suppliers_ (1), event_count_ (100), event_period_ (100), @@ -286,7 +286,7 @@ ECMS_Driver::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr channel) } void -ECMS_Driver::activate_suppliers (void) +ECMS_Driver::activate_suppliers () { for (int i = 0; i < this->n_suppliers_; ++i) { @@ -295,7 +295,7 @@ ECMS_Driver::activate_suppliers (void) } void -ECMS_Driver::disconnect_suppliers (void) +ECMS_Driver::disconnect_suppliers () { for (int i = 0; i < this->n_suppliers_; ++i) { @@ -435,7 +435,7 @@ Test_Supplier::connect (const char* name, } void -Test_Supplier::disconnect (void) +Test_Supplier::disconnect () { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; @@ -470,7 +470,7 @@ Test_Supplier::svc () } void -Test_Supplier::disconnect_push_supplier (void) +Test_Supplier::disconnect_push_supplier () { this->consumer_proxy_ = RtecEventChannelAdmin::ProxyPushConsumer::_nil (); @@ -482,7 +482,7 @@ int Test_Supplier::supplier_id () const } RtecEventChannelAdmin::ProxyPushConsumer_ptr -Test_Supplier::consumer_proxy (void) +Test_Supplier::consumer_proxy () { return this->consumer_proxy_.in (); } diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h index 9726d936a7e..de843e6632f 100644 --- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h +++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.h @@ -32,7 +32,7 @@ class Test_Supplier : public ACE_Task<ACE_SYNCH> public: Test_Supplier (ECMS_Driver *driver); - int svc (void); + int svc (); // Run the test, just forwards to the driver void connect (const char* name, @@ -41,16 +41,16 @@ public: RtecEventChannelAdmin::EventChannel_ptr ec); // This method connects the supplier to the EC. - void disconnect (void); + void disconnect (); // Disconnect from the EC. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); // The methods in the skeleton. RtecEventComm::EventSourceID supplier_id () const; // The supplier ID. - RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy (void); + RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy (); // We talk to the EC (as a supplier) using this proxy, no duplicates // are done here... @@ -80,7 +80,7 @@ class ECMS_Driver // = DESCRIPTION // public: - ECMS_Driver (void); + ECMS_Driver (); enum { MAX_SUPPLIERS = 16 @@ -107,10 +107,10 @@ private: // parse the command line args void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec); - void disconnect_suppliers (void); + void disconnect_suppliers (); // Connect the suppliers. - void activate_suppliers (void); + void activate_suppliers (); // Activate the suppliers, i.e. they start generating events. private: diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp index 9874912832e..6c9004deb79 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp @@ -4,7 +4,7 @@ #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/Event_Service_Constants.h" -Consumer::Consumer (void) +Consumer::Consumer () : event_count_ (0) { } @@ -38,7 +38,7 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin) } void -Consumer::disconnect (void) +Consumer::disconnect () { try { @@ -81,7 +81,7 @@ Consumer::push (const RtecEventComm::EventSet& events) } void -Consumer::disconnect_push_consumer (void) +Consumer::disconnect_push_consumer () { } diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h index a3f09d10e17..401740731d9 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.h @@ -20,19 +20,19 @@ class Consumer : public POA_RtecEventComm::PushConsumer // It simply subscribes to one event type. // public: - Consumer (void); + Consumer (); // Constructor void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin); // Connect to the Event Channel - void disconnect (void); + void disconnect (); // Disconnect from the event channel // = The RtecEventComm::PushConsumer methods virtual void push (const RtecEventComm::EventSet& events); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); // The skeleton methods. private: diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp index c0e4a5641a7..0b4c78f6b54 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp @@ -4,7 +4,7 @@ #include "orbsvcs/RtecEventChannelAdminS.h" #include "orbsvcs/Event_Service_Constants.h" -Supplier::Supplier (void) +Supplier::Supplier () { } @@ -32,7 +32,7 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin) } void -Supplier::disconnect (void) +Supplier::disconnect () { // Disconnect from the EC try @@ -51,7 +51,7 @@ Supplier::disconnect (void) } void -Supplier::perform_push (void) +Supplier::perform_push () { try { @@ -71,7 +71,7 @@ Supplier::perform_push (void) } void -Supplier::disconnect_push_supplier (void) +Supplier::disconnect_push_supplier () { } diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h index 3f131c1d4fa..8f848d01721 100644 --- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h +++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.h @@ -21,21 +21,21 @@ class Supplier : public POA_RtecEventComm::PushSupplier // method is invoked it pushes the event through the event service // public: - Supplier (void); + Supplier (); // Constructor void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin); // Connect to the event channel - void disconnect (void); + void disconnect (); // Disconnect from the event channel - void perform_push (void); + void perform_push (); // Push a single event // = The RtecEventComm::PushSupplier methods - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); // The skeleton methods. private: diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp index 37fa4b842c3..2c8792999f2 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp @@ -21,7 +21,7 @@ #include "EC_Mcast.inl" #endif /* __ACE_INLINE__ */ -ECM_Driver::ECM_Driver (void) +ECM_Driver::ECM_Driver () : event_period_ (250000), event_count_ (100), config_filename_ (0), @@ -214,7 +214,7 @@ ECM_Driver::activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec) } void -ECM_Driver::close_federations (void) +ECM_Driver::close_federations () { for (int i = 0; i < this->local_federations_count_; ++i) { @@ -251,7 +251,7 @@ ECM_Driver::open_senders (RtecEventChannelAdmin::EventChannel_ptr ec) } void -ECM_Driver::close_senders (void) +ECM_Driver::close_senders () { for (int i = 0; i < this->all_federations_count_; ++i) { @@ -277,7 +277,7 @@ ECM_Driver::open_receivers (RtecEventChannelAdmin::EventChannel_ptr ec) } void -ECM_Driver::close_receivers (void) +ECM_Driver::close_receivers () { for (int i = 0; i < this->local_federations_count_; ++i) { @@ -286,7 +286,7 @@ ECM_Driver::close_receivers (void) } void -ECM_Driver::dump_results (void) +ECM_Driver::dump_results () { for (int i = 0; i < this->local_federations_count_; ++i) { @@ -369,7 +369,7 @@ ECM_Driver::parse_args (int argc, ACE_TCHAR *argv []) } int -ECM_Driver::parse_config_file (void) +ECM_Driver::parse_config_file () { FILE* cfg = 0; if (this->config_filename_ != 0) @@ -566,7 +566,7 @@ ECM_Federation::ECM_Federation (char* name, } } -ECM_Federation::~ECM_Federation (void) +ECM_Federation::~ECM_Federation () { delete[] this->consumer_ipaddr_; delete[] this->supplier_ipaddr_; @@ -605,13 +605,13 @@ ECM_Federation::open (TAO_ECG_UDP_Out_Endpoint *endpoint, } void -ECM_Federation::close (void) +ECM_Federation::close () { this->sender_->shutdown (); } RtecUDPAdmin::AddrServer_ptr -ECM_Federation::addr_server (void) +ECM_Federation::addr_server () { return this->addr_server_._this (); } @@ -656,7 +656,7 @@ ECM_Supplier::open (const char* name, } void -ECM_Supplier::close (void) +ECM_Supplier::close () { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; @@ -710,13 +710,13 @@ ECM_Supplier::push (const RtecEventComm::EventSet& events) } void -ECM_Supplier::disconnect_push_supplier (void) +ECM_Supplier::disconnect_push_supplier () { // this->supplier_proxy_->disconnect_push_supplier (); } void -ECM_Supplier::disconnect_push_consumer (void) +ECM_Supplier::disconnect_push_consumer () { } @@ -786,7 +786,7 @@ ECM_Consumer::connect (unsigned int *seed) } void -ECM_Consumer::disconnect (void) +ECM_Consumer::disconnect () { if (CORBA::is_nil (this->supplier_proxy_.in ()) || CORBA::is_nil (this->consumer_admin_.in ())) @@ -799,7 +799,7 @@ ECM_Consumer::disconnect (void) } void -ECM_Consumer::close (void) +ECM_Consumer::close () { try { @@ -823,7 +823,7 @@ ECM_Consumer::push (const RtecEventComm::EventSet& events) } void -ECM_Consumer::disconnect_push_consumer (void) +ECM_Consumer::disconnect_push_consumer () { } @@ -855,7 +855,7 @@ ECM_Local_Federation::ECM_Local_Federation (ECM_Federation *federation, CORBA::Boolean[this->consumer_types ()]); } -ECM_Local_Federation::~ECM_Local_Federation (void) +ECM_Local_Federation::~ECM_Local_Federation () { delete mcast_eh_; delete[] this->subscription_subset_; @@ -882,7 +882,7 @@ ECM_Local_Federation::open (int event_count, } void -ECM_Local_Federation::close (void) +ECM_Local_Federation::close () { this->consumer_.close (); @@ -1014,7 +1014,7 @@ ECM_Local_Federation::open_receiver (RtecEventChannelAdmin::EventChannel_ptr ec, } void -ECM_Local_Federation::close_receiver (void) +ECM_Local_Federation::close_receiver () { this->receiver_->shutdown (); this->mcast_eh_->shutdown (); diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h index 1311ca53bf9..a472b11e5b6 100644 --- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h +++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h @@ -86,7 +86,7 @@ public: // Constructor, it assumes ownership of the buffers, strings must be // allocated using CORBA::string_alloc(), buffers using operator new. - ~ECM_Federation (void); + ~ECM_Federation (); // Dtor const char* name () const; @@ -117,13 +117,13 @@ public: RtecEventChannelAdmin::EventChannel_ptr ec); // Connect the UDP sender to the EC. - void close (void); + void close (); // Close the UDP sender, disconnect from the EC int sender_local_addr (ACE_INET_Addr& addr); // Return the sender local address - RtecUDPAdmin::AddrServer_ptr addr_server (void); + RtecUDPAdmin::AddrServer_ptr addr_server (); // This address server can be used to convert event headers // (type,source) to UDP addresses (ipaddr,port) @@ -169,7 +169,7 @@ public: RtecEventChannelAdmin::EventChannel_ptr event_channel); // This method connects the supplier to the EC. - void close (void); + void close (); // Disconnect from the EC. void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel, @@ -180,11 +180,11 @@ public: // The supplier ID. void push (const RtecEventComm::EventSet& events); - void disconnect_push_consumer (void); + void disconnect_push_consumer (); // Implement the callbacks for our consumer personality. // = The POA_RtecEventComm::PushSupplier methods. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); private: ECM_Local_Federation* federation_; @@ -222,17 +222,17 @@ public: unsigned int *seed); // This method connects the consumer to the EC. - void close (void); + void close (); // Disconnect from the EC. void connect (unsigned int *seed); - void disconnect (void); + void disconnect (); // Disconnect from the supplier, but do not forget about it or close // it. // = The POA_RtecEventComm::PushComsumer methods. virtual void push (const RtecEventComm::EventSet& events); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); private: ECM_Local_Federation* federation_; @@ -255,14 +255,14 @@ public: ECM_Local_Federation (ECM_Federation *federation, ECM_Driver *driver); // Constructor. - ~ECM_Local_Federation (void); + ~ECM_Local_Federation (); // Destructor void open (int event_count, RtecEventChannelAdmin::EventChannel_ptr event_channel); // Connect both the supplier and the consumer. - void close (void); + void close (); // Disconnect everybody from the EC void activate (RtecEventChannelAdmin::EventChannel_ptr event_channel, @@ -283,7 +283,7 @@ public: TAO_ECG_Refcounted_Endpoint ignore_from); // Connect the UDP receiver to the EC. - void close_receiver (void); + void close_receiver (); // Close the UDP receiver, disconnect from the EC void dump_results () const; @@ -386,7 +386,7 @@ class ECM_Driver // receive and send multicast messages, etc. // public: - ECM_Driver (void); + ECM_Driver (); enum { MAX_EVENTS = 1024, @@ -414,7 +414,7 @@ private: void activate_federations (RtecEventChannelAdmin::EventChannel_ptr ec); // Activate all the federations - void close_federations (void); + void close_federations (); // Close the federations, i.e. disconnect from the EC, deactivate // the objects, etc. @@ -425,19 +425,19 @@ private: // Connect all the receivers, thus we accept events arriving through // multicast. - void close_senders (void); + void close_senders (); // Close all the senders to cleanup resources. - void close_receivers (void); + void close_receivers (); // Close all the receivers to cleanup resources. - int shutdown (void); + int shutdown (); // Called when the main thread. int parse_args (int argc, ACE_TCHAR* argv[]); // parse the command line arguments - int parse_config_file (void); + int parse_config_file (); // parse the command line arguments int parse_name_list (FILE* file, int n, char** names, @@ -448,7 +448,7 @@ private: const char* error_msg); // skip the blanks in the file. - void dump_results (void); + void dump_results (); // Dump the results to the standard output. private: diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp index 4ae2fb8e539..5ab4ea8cdc8 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp @@ -25,7 +25,7 @@ # include <sys/lwp.h> /* for _lwp_self */ #endif /* sun */ -Test_ECG::Test_ECG (void) +Test_ECG::Test_ECG () : lcl_name_ ("Test_ECG"), rmt_name_ (""), scheduling_type_ (Test_ECG::ss_runtime), @@ -598,7 +598,7 @@ Test_ECG::get_ec (CosNaming::NamingContext_ptr naming_context, } void -Test_ECG::disconnect_suppliers (void) +Test_ECG::disconnect_suppliers () { for (int i = 0; i < this->hp_suppliers_ + this->lp_suppliers_; ++i) { @@ -655,7 +655,7 @@ Test_ECG::connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec) } void -Test_ECG::disconnect_consumers (void) +Test_ECG::disconnect_consumers () { for (int i = 0; i < this->hp_consumers_ + this->lp_consumers_; ++i) { @@ -892,7 +892,7 @@ Test_ECG::push_consumer (void *consumer_cookie, } void -Test_ECG::wait_until_ready (void) +Test_ECG::wait_until_ready () { ACE_GUARD (TAO_SYNCH_MUTEX, ready_mon, this->ready_mtx_); while (!this->ready_) @@ -945,7 +945,7 @@ Test_ECG::shutdown_consumer (int id) } int -Test_ECG::shutdown (void) +Test_ECG::shutdown () { ACE_DEBUG ((LM_DEBUG, "Shutting down the multiple EC test\n")); @@ -959,7 +959,7 @@ Test_ECG::shutdown (void) } void -Test_ECG::dump_results (void) +Test_ECG::dump_results () { const int bufsize = 512; ACE_TCHAR buf[bufsize]; @@ -1259,7 +1259,7 @@ Test_Supplier::open (const char* name, } void -Test_Supplier::close (void) +Test_Supplier::close () { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; @@ -1387,7 +1387,7 @@ Test_Supplier::push (const RtecEventComm::EventSet& events) } void -Test_Supplier::disconnect_push_supplier (void) +Test_Supplier::disconnect_push_supplier () { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; @@ -1396,7 +1396,7 @@ Test_Supplier::disconnect_push_supplier (void) } void -Test_Supplier::disconnect_push_consumer (void) +Test_Supplier::disconnect_push_consumer () { } @@ -1458,7 +1458,7 @@ Test_Consumer::open (const char* name, } void -Test_Consumer::close (void) +Test_Consumer::close () { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; @@ -1476,7 +1476,7 @@ Test_Consumer::push (const RtecEventComm::EventSet& events) } void -Test_Consumer::disconnect_push_consumer (void) +Test_Consumer::disconnect_push_consumer () { } diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h index 1ed57831bdc..a45e6f85f68 100644 --- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h +++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.h @@ -53,7 +53,7 @@ public: RtecEventChannelAdmin::EventChannel_ptr ec); // This method connects the supplier to the EC. - void close (void); + void close (); // Disconnect from the EC. void activate (const char* name, @@ -61,11 +61,11 @@ public: RtecEventChannelAdmin::EventChannel_ptr ec); void push (const RtecEventComm::EventSet& events); - void disconnect_push_consumer (void); + void disconnect_push_consumer (); // Implement the callbacks for our consumer personality. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); // The methods in the skeleton. RtecEventComm::EventSourceID supplier_id () const; @@ -118,11 +118,11 @@ public: RtecEventChannelAdmin::EventChannel_ptr ec); // This method connects the consumer to the EC. - void close (void); + void close (); // Disconnect from the EC. virtual void push (const RtecEventComm::EventSet& events); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); // The skeleton methods. private: @@ -158,7 +158,7 @@ class Test_ECG // and publications list. // public: - Test_ECG (void); + Test_ECG (); enum { MAX_EVENTS = 1024, @@ -199,7 +199,7 @@ private: // Helper routine to obtain an EC given its name. void connect_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec); - void disconnect_suppliers (void); + void disconnect_suppliers (); // Connect the suppliers. void activate_suppliers (RtecEventChannelAdmin::EventChannel_ptr local_ec); @@ -212,20 +212,20 @@ private: // Publications list. void connect_consumers (RtecEventChannelAdmin::EventChannel_ptr local_ec); - void disconnect_consumers (void); + void disconnect_consumers (); // Connect and disconnect the consumers. - int shutdown (void); + int shutdown (); // Called when the main thread (i.e. not the scavenger thread) is // shutting down. int parse_args (int argc, ACE_TCHAR* argv[]); // parse the command line args - void dump_results (void); + void dump_results (); // Dump the results to the standard output. - void wait_until_ready (void); + void wait_until_ready (); // Block event delivery until all the consumers are ready. struct Stats; diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp index b81e9af1c92..afefd875ca2 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp @@ -71,7 +71,7 @@ Test_Consumer::connect (RtecScheduler::Scheduler_ptr scheduler, } void -Test_Consumer::disconnect (void) +Test_Consumer::disconnect () { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; @@ -165,6 +165,6 @@ Test_Consumer::push (const RtecEventComm::EventSet& events) } void -Test_Consumer::disconnect_push_consumer (void) +Test_Consumer::disconnect_push_consumer () { } diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h index 61afa504683..96d859e2945 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.h @@ -49,7 +49,7 @@ public: RtecEventChannelAdmin::EventChannel_ptr ec); // This method connects the consumer to the EC. - void disconnect (void); + void disconnect (); // Disconnect from the EC. void dump_results (const ACE_TCHAR* name, @@ -60,7 +60,7 @@ public: // Add our throughput and latency statistics to <stats> virtual void push (const RtecEventComm::EventSet& events); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); // The skeleton methods. private: diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index e63814343d8..cdd00671df5 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -23,7 +23,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -ECT_Consumer_Driver::ECT_Consumer_Driver (void) +ECT_Consumer_Driver::ECT_Consumer_Driver () : n_consumers_ (1), n_suppliers_ (1), type_start_ (ACE_ES_EVENT_UNDEFINED), @@ -35,7 +35,7 @@ ECT_Consumer_Driver::ECT_Consumer_Driver (void) { } -ECT_Consumer_Driver::~ECT_Consumer_Driver (void) +ECT_Consumer_Driver::~ECT_Consumer_Driver () { } @@ -234,7 +234,7 @@ ECT_Consumer_Driver::connect_consumers } void -ECT_Consumer_Driver::dump_results (void) +ECT_Consumer_Driver::dump_results () { ACE_High_Res_Timer::global_scale_factor_type gsf = ACE_High_Res_Timer::global_scale_factor (); @@ -252,7 +252,7 @@ ECT_Consumer_Driver::dump_results (void) } void -ECT_Consumer_Driver::disconnect_consumers (void) +ECT_Consumer_Driver::disconnect_consumers () { for (int i = 0; i < this->n_consumers_; ++i) { diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h index 9732e3d4558..32b92e1cc6d 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.h @@ -32,8 +32,8 @@ class ECT_Consumer_Driver : public ECT_Driver // = DESCRIPTION // public: - ECT_Consumer_Driver (void); - virtual ~ECT_Consumer_Driver (void); + ECT_Consumer_Driver (); + virtual ~ECT_Consumer_Driver (); enum { MAX_CONSUMERS = 16 @@ -54,10 +54,10 @@ private: void connect_consumers (RtecScheduler::Scheduler_ptr scheduler, RtecEventChannelAdmin::EventChannel_ptr local_ec); - void disconnect_consumers (void); + void disconnect_consumers (); // Connect and disconnect the consumers. - void dump_results (void); + void dump_results (); // Print out the results private: diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp index 2e088db72f5..f04b2a66959 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.cpp @@ -2,6 +2,6 @@ #include "ace/High_Res_Timer.h" -ECT_Driver::~ECT_Driver (void) +ECT_Driver::~ECT_Driver () { } diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h index 1d8a800c539..be17fda434b 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h @@ -31,7 +31,7 @@ class ECT_Driver // = DESCRIPTION // public: - virtual ~ECT_Driver (void); + virtual ~ECT_Driver (); virtual void shutdown_consumer (void* consumer_cookie) = 0; // Callback method for consumers, each consumer will call this diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp index 60cfca06515..869c4277d90 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp @@ -95,7 +95,7 @@ Test_Supplier::connect (RtecScheduler::Scheduler_ptr scheduler, } void -Test_Supplier::disconnect (void) +Test_Supplier::disconnect () { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; @@ -216,7 +216,7 @@ Test_Supplier::svc () } void -Test_Supplier::disconnect_push_supplier (void) +Test_Supplier::disconnect_push_supplier () { } @@ -226,7 +226,7 @@ int Test_Supplier::supplier_id () const } RtecEventChannelAdmin::ProxyPushConsumer_ptr -Test_Supplier::consumer_proxy (void) +Test_Supplier::consumer_proxy () { return this->consumer_proxy_.in (); } diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h index 2a2a442a65a..90d9b416f69 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.h @@ -33,7 +33,7 @@ class Test_Supplier : public ACE_Task<ACE_SYNCH> public: Test_Supplier (ECT_Driver *driver); - int svc (void); + int svc (); // Run the test, just forwards to the driver void connect (RtecScheduler::Scheduler_ptr scheduler, @@ -47,16 +47,16 @@ public: RtecEventChannelAdmin::EventChannel_ptr ec); // This method connects the supplier to the EC. - void disconnect (void); + void disconnect (); // Disconnect from the EC. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); // The methods in the skeleton. RtecEventComm::EventSourceID supplier_id () const; // The supplier ID. - RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy (void); + RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer_proxy (); // We talk to the EC (as a supplier) using this proxy, no duplicates // are done here... diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index 8f64e4f77f4..b4db10c3107 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -23,7 +23,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -ECT_Supplier_Driver::ECT_Supplier_Driver (void) +ECT_Supplier_Driver::ECT_Supplier_Driver () : n_suppliers_ (1), burst_count_ (10), burst_size_ (100), @@ -35,7 +35,7 @@ ECT_Supplier_Driver::ECT_Supplier_Driver (void) { } -ECT_Supplier_Driver::~ECT_Supplier_Driver (void) +ECT_Supplier_Driver::~ECT_Supplier_Driver () { } @@ -231,7 +231,7 @@ ECT_Supplier_Driver::connect_suppliers } void -ECT_Supplier_Driver::activate_suppliers (void) +ECT_Supplier_Driver::activate_suppliers () { for (int i = 0; i < this->n_suppliers_; ++i) { @@ -240,7 +240,7 @@ ECT_Supplier_Driver::activate_suppliers (void) } void -ECT_Supplier_Driver::disconnect_suppliers (void) +ECT_Supplier_Driver::disconnect_suppliers () { for (int i = 0; i < this->n_suppliers_; ++i) { @@ -252,7 +252,7 @@ ECT_Supplier_Driver::disconnect_suppliers (void) } void -ECT_Supplier_Driver::dump_results (void) +ECT_Supplier_Driver::dump_results () { ACE_High_Res_Timer::global_scale_factor_type gsf = ACE_High_Res_Timer::global_scale_factor (); diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h index 960a697e712..7eb995f7b1f 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.h @@ -30,8 +30,8 @@ class ECT_Supplier_Driver : public ECT_Driver // = DESCRIPTION // public: - ECT_Supplier_Driver (void); - virtual ~ECT_Supplier_Driver (void); + ECT_Supplier_Driver (); + virtual ~ECT_Supplier_Driver (); virtual void shutdown_consumer (void* consumer_cookie); // Not used.... @@ -50,13 +50,13 @@ private: void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler, RtecEventChannelAdmin::EventChannel_ptr local_ec); - void disconnect_suppliers (void); + void disconnect_suppliers (); // Connect the suppliers. - void activate_suppliers (void); + void activate_suppliers (); // Activate the suppliers, i.e. they start generating events. - void dump_results (void); + void dump_results (); // Dump the results for each supplier. private: diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index 12f9bffe059..29e4c432adc 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -31,7 +31,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -ECT_Throughput::ECT_Throughput (void) +ECT_Throughput::ECT_Throughput () : n_consumers_ (1), n_suppliers_ (1), burst_count_ (10), @@ -51,7 +51,7 @@ ECT_Throughput::ECT_Throughput (void) { } -ECT_Throughput::~ECT_Throughput (void) +ECT_Throughput::~ECT_Throughput () { } @@ -364,7 +364,7 @@ ECT_Throughput::connect_suppliers } void -ECT_Throughput::activate_suppliers (void) +ECT_Throughput::activate_suppliers () { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) @@ -383,7 +383,7 @@ ECT_Throughput::activate_suppliers (void) } void -ECT_Throughput::disconnect_suppliers (void) +ECT_Throughput::disconnect_suppliers () { for (int i = 0; i < this->n_suppliers_; ++i) { @@ -392,7 +392,7 @@ ECT_Throughput::disconnect_suppliers (void) } void -ECT_Throughput::disconnect_consumers (void) +ECT_Throughput::disconnect_consumers () { for (int i = 0; i < this->n_consumers_; ++i) { @@ -401,7 +401,7 @@ ECT_Throughput::disconnect_consumers (void) } void -ECT_Throughput::dump_results (void) +ECT_Throughput::dump_results () { ACE_High_Res_Timer::global_scale_factor_type gsf = ACE_High_Res_Timer::global_scale_factor (); diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h index 9d2a48261b1..5849a90d5b9 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.h @@ -23,9 +23,9 @@ class ECT_Throughput : public ECT_Driver { public: - ECT_Throughput (void); + ECT_Throughput (); - virtual ~ECT_Throughput (void); + virtual ~ECT_Throughput (); enum { MAX_CONSUMERS = 16, @@ -48,18 +48,18 @@ private: void connect_consumers (RtecScheduler::Scheduler_ptr scheduler, RtecEventChannelAdmin::EventChannel_ptr local_ec); - void disconnect_consumers (void); + void disconnect_consumers (); // Connect and disconnect the consumers. void connect_suppliers (RtecScheduler::Scheduler_ptr scheduler, RtecEventChannelAdmin::EventChannel_ptr local_ec); - void disconnect_suppliers (void); + void disconnect_suppliers (); // Connect the suppliers. - void activate_suppliers (void); + void activate_suppliers (); // Activate the suppliers, i.e. they start generating events. - void dump_results (void); + void dump_results (); // Dump the results for each supplier. private: diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp index 095c7869dae..79461b2ec01 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp @@ -15,7 +15,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -EC_BCast::EC_BCast (void) +EC_BCast::EC_BCast () : bcast_address_ (ACE_TEXT("255.255.255.255")), bcast_port_ (12345) { @@ -58,7 +58,7 @@ EC_BCast::print_args () const } void -EC_BCast::print_usage (void) +EC_BCast::print_usage () { this->EC_Driver::print_usage (); } @@ -69,7 +69,7 @@ EC_BCast::modify_attributes (TAO_EC_Event_Channel_Attributes&) } void -EC_BCast::execute_test (void) +EC_BCast::execute_test () { // Subscription determining which EC events will get sent out on the // UDP socket. @@ -123,7 +123,7 @@ EC_BCast::execute_test (void) } void -EC_BCast::dump_results (void) +EC_BCast::dump_results () { this->EC_Driver::dump_results (); } diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h index 60953f5bc95..a1fcc91f865 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.h +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h @@ -26,22 +26,22 @@ class EC_BCast : public EC_Driver { public: /// Constructor - EC_BCast (void); + EC_BCast (); // = The EC_Driver methods /// add some command line args to enable/disable bcastions virtual int parse_args (int& argc, ACE_TCHAR* argv[]); virtual void print_args () const; - virtual void print_usage (void); + virtual void print_usage (); /// set the bcastion flags virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr); /// Don't run the suppliers, just test connect and disconnect calls. - void execute_test (void); + void execute_test (); /// Don't dump the EC_Driver results, they are meaningless. - void dump_results (void); + void dump_results (); private: /// The IP address used to broadcast diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp index 727ab33817c..e6a4e04c443 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp @@ -115,7 +115,7 @@ Task::svc () } void -Task::run_iteration (void) +Task::run_iteration () { // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h index f1047ca6ceb..53ba9a2af11 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h @@ -26,10 +26,10 @@ public: int use_callbacks); // = Check the ACE_Task_Base documentation. - int svc (void); + int svc (); /// Run a single iteration of the test - void run_iteration (void); + void run_iteration (); private: /// The event channel used on the test diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp index dc00e890387..c04a9ec350d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp @@ -16,14 +16,14 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -EC_Master::EC_Master (void) +EC_Master::EC_Master () : seed_ (0), n_channels_ (4), channels_ (0) { } -EC_Master::~EC_Master (void) +EC_Master::~EC_Master () { if (this->channels_ != 0) { @@ -220,7 +220,7 @@ EC_Observer::EC_Observer (EC_Master *master, this->root_poa_ = PortableServer::POA::_duplicate (root_poa); } -EC_Observer::~EC_Observer (void) +EC_Observer::~EC_Observer () { if (this->gwys_ != 0) delete[] this->gwys_; @@ -244,13 +244,13 @@ EC_Observer::print_args () const } void -EC_Observer::print_usage (void) +EC_Observer::print_usage () { this->EC_Driver::print_usage (); } void -EC_Observer::execute_test (void) +EC_Observer::execute_test () { int peer_count = this->master_->channel_count (); ACE_NEW (this->gwys_, TAO_EC_Gateway_IIOP[peer_count]); @@ -286,7 +286,7 @@ EC_Observer::execute_test (void) } void -EC_Observer::run_cleanup (void) +EC_Observer::run_cleanup () { for (int j = 0; j != this->master_->channel_count (); ++j) { @@ -302,7 +302,7 @@ EC_Observer::run_cleanup (void) } void -EC_Observer::dump_results (void) +EC_Observer::dump_results () { ACE_DEBUG ((LM_DEBUG, "===== Results for %d =====\n", this->id_)); diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h index 5dc1f40ce7e..5240135ff47 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.h +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h @@ -31,9 +31,9 @@ class EC_Observer; class EC_Master { public: - EC_Master (void); + EC_Master (); - virtual ~EC_Master (void); + virtual ~EC_Master (); /// Execute the test. virtual int run (int argc, ACE_TCHAR* argv[]); @@ -79,20 +79,20 @@ public: int id); /// Destructor - ~EC_Observer (void); + ~EC_Observer (); // = The EC_Driver methods /// add some command line args to enable/disable observerions virtual void initialize_orb_and_poa (int& argc, ACE_TCHAR* argv[]); virtual int parse_args (int& argc, ACE_TCHAR* argv[]); virtual void print_args () const; - virtual void print_usage (void); + virtual void print_usage (); /// Run the suppliers, using the <thread_manager> parameter - void execute_test (void); - void run_cleanup (void); + void execute_test (); + void run_cleanup (); - void dump_results (void); + void dump_results (); void connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, int i); diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp index 724d404cdb9..d3c94ac4582 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp @@ -29,7 +29,7 @@ deactivate_servant (PortableServer::Servant servant) } -RND_Driver::RND_Driver (void) +RND_Driver::RND_Driver () : timer_ (this), supplier_ (0), nsuppliers_ (4), @@ -386,7 +386,7 @@ RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin, } void -RND_Consumer::disconnect (void) +RND_Consumer::disconnect () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -404,7 +404,7 @@ RND_Consumer::push (const RtecEventComm::EventSet &event) } void -RND_Consumer::disconnect_push_consumer (void) +RND_Consumer::disconnect_push_consumer () { } @@ -433,7 +433,7 @@ RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin, } void -RND_Supplier::disconnect (void) +RND_Supplier::disconnect () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -445,7 +445,7 @@ RND_Supplier::disconnect (void) } void -RND_Supplier::push_new_event (void) +RND_Supplier::push_new_event () { RtecEventComm::EventSet event (1); event.length (1); @@ -473,12 +473,12 @@ RND_Supplier::push (RtecEventComm::EventSet &event) } void -RND_Supplier::disconnect_push_supplier (void) +RND_Supplier::disconnect_push_supplier () { } int -RND_Supplier::svc (void) +RND_Supplier::svc () { ACE_DEBUG ((LM_DEBUG, "Thread %t started\n")); int percent = 10; diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h index 2db23e8c8a3..82de8a0d9ac 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.h +++ b/TAO/orbsvcs/tests/Event/Basic/Random.h @@ -32,11 +32,11 @@ public: RND_Consumer (RND_Driver *driver); void push (const RtecEventComm::EventSet &event); - void disconnect_push_consumer (void); + void disconnect_push_consumer (); void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin, const RtecEventChannelAdmin::ConsumerQOS &qos); - void disconnect (void); + void disconnect (); protected: /// The driver @@ -86,13 +86,13 @@ public: void connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin, const RtecEventChannelAdmin::SupplierQOS &qos); - void disconnect (void); + void disconnect (); /// Push a single event... - void push_new_event (void); + void push_new_event (); void push (RtecEventComm::EventSet &event); - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); /// Active method virtual int svc (); @@ -119,7 +119,7 @@ RND_Supplier::RND_Supplier (int verbose) class RND_Driver { public: - RND_Driver (void); + RND_Driver (); /// Run the test int run (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp index cf10b808d83..8816d9d8190 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp @@ -14,7 +14,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -EC_Reconnect::EC_Reconnect (void) +EC_Reconnect::EC_Reconnect () : allow_consumer_reconnect_ (0), allow_supplier_reconnect_ (0), disconnections_ (1000) @@ -69,7 +69,7 @@ EC_Reconnect::print_args () const } void -EC_Reconnect::print_usage (void) +EC_Reconnect::print_usage () { this->EC_Driver::print_usage (); @@ -84,7 +84,7 @@ EC_Reconnect::modify_attributes (TAO_EC_Event_Channel_Attributes& attr) } void -EC_Reconnect::execute_test (void) +EC_Reconnect::execute_test () { this->execute_consumer_test (); this->execute_supplier_test (); @@ -98,12 +98,12 @@ EC_Reconnect::execute_test (void) } void -EC_Reconnect::dump_results (void) +EC_Reconnect::dump_results () { } void -EC_Reconnect::execute_consumer_test (void) +EC_Reconnect::execute_consumer_test () { RtecEventChannelAdmin::ConsumerQOS qos; int shutdown_event_type; @@ -159,7 +159,7 @@ EC_Reconnect::execute_consumer_test (void) } void -EC_Reconnect::execute_supplier_test (void) +EC_Reconnect::execute_supplier_test () { RtecEventChannelAdmin::SupplierQOS qos; int shutdown_event_type; diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h index 77b9275e1f5..b541edd8dde 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h @@ -37,26 +37,26 @@ class EC_Reconnect : public EC_Driver { public: /// Constructor - EC_Reconnect (void); + EC_Reconnect (); // = The EC_Driver methods /// add some command line args to enable/disable reconnections virtual int parse_args (int& argc, ACE_TCHAR* argv[]); virtual void print_args () const; - virtual void print_usage (void); + virtual void print_usage (); /// set the reconnection flags virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr); /// Don't run the suppliers, just test connect and disconnect calls. - void execute_test (void); + void execute_test (); /// Don't dump the EC_Driver results, they are meaningless. - void dump_results (void); + void dump_results (); /// Separate the suppliers and consumers. - void execute_consumer_test (void); - void execute_supplier_test (void); + void execute_consumer_test (); + void execute_supplier_test (); private: /// What aspect of reconnection are we going to test? diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp index 4723d3c58b0..4af4b4d0092 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp @@ -19,7 +19,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -EC_Schedule::EC_Schedule (void) +EC_Schedule::EC_Schedule () : scheduler_impl_ (0) { } @@ -40,13 +40,13 @@ EC_Schedule::print_args () const } void -EC_Schedule::print_usage (void) +EC_Schedule::print_usage () { this->EC_Driver::print_usage (); } void -EC_Schedule::initialize_ec_impl (void) +EC_Schedule::initialize_ec_impl () { this->scheduler_impl_ = new ACE_Config_Scheduler; this->scheduler_ = this->scheduler_impl_->_this (); @@ -61,14 +61,14 @@ EC_Schedule::modify_attributes (TAO_EC_Event_Channel_Attributes& attr) } void -EC_Schedule::cleanup_ec (void) +EC_Schedule::cleanup_ec () { this->EC_Driver::cleanup_ec (); delete this->scheduler_impl_; } void -EC_Schedule::execute_test (void) +EC_Schedule::execute_test () { CORBA::Long min_priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) @@ -195,6 +195,6 @@ EC_Schedule::build_supplier_qos ( } void -EC_Schedule::dump_results (void) +EC_Schedule::dump_results () { } diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.h b/TAO/orbsvcs/tests/Event/Basic/Schedule.h index f4f4827af2f..601a797316d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.h +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.h @@ -40,25 +40,25 @@ class EC_Schedule : public EC_Driver { public: /// Constructor - EC_Schedule (void); + EC_Schedule (); // = The EC_Driver methods /// add some command line args to change the scheduling service to /// use. virtual int parse_args (int& argc, ACE_TCHAR* argv[]); virtual void print_args () const; - virtual void print_usage (void); + virtual void print_usage (); /// Set the scheduling service attribute - void initialize_ec_impl (void); - void cleanup_ec (void); + void initialize_ec_impl (); + void cleanup_ec (); virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr); /// Don't run the suppliers, just compute the schedule. - void execute_test (void); + void execute_test (); /// Don't dump the EC_Driver results, they are meaningless. - void dump_results (void); + void dump_results (); /// This time really connect to the scheduler virtual void build_consumer_qos ( diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp index c8248e4d06a..c329a989165 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp @@ -12,14 +12,14 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -EC_Shutdown::EC_Shutdown (void) +EC_Shutdown::EC_Shutdown () : consumer_disconnects_ (0), supplier_disconnects_ (0) { } void -EC_Shutdown::execute_test (void) +EC_Shutdown::execute_test () { if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) destroying EC\n")); @@ -49,7 +49,7 @@ EC_Shutdown::execute_test (void) } void -EC_Shutdown::dump_results (void) +EC_Shutdown::dump_results () { if (this->consumer_disconnects_ != this->n_consumers_) ACE_ERROR ((LM_ERROR, diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h index 0f796f87b5b..c1b4d2edd3c 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h +++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h @@ -30,14 +30,14 @@ class EC_Shutdown : public EC_Driver { public: /// Constructor - EC_Shutdown (void); + EC_Shutdown (); // = The EC_Driver methods /// Don't run the suppliers just create the EC and then destroy it. - void execute_test (void); + void execute_test (); /// Don't dump the EC_Driver results, they are meaningless. - void dump_results (void); + void dump_results (); /// One of the consumers in the test has been disconnected from the EC virtual void consumer_disconnect (void* consumer_cookie); diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp index acfd331e622..91465be463b 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp @@ -2,14 +2,14 @@ #include "orbsvcs/Event/EC_Event_Channel.h" #include <memory> -EC_Wrapper::EC_Wrapper (void) +EC_Wrapper::EC_Wrapper () : ec_impl_ (0), orb_ () { } PortableServer::Servant_var<EC_Wrapper> -EC_Wrapper::create (void) +EC_Wrapper::create () { PortableServer::Servant_var<EC_Wrapper> w; ACE_NEW_RETURN (w, @@ -18,7 +18,7 @@ EC_Wrapper::create (void) return w; } -EC_Wrapper::~EC_Wrapper (void) +EC_Wrapper::~EC_Wrapper () { try { @@ -71,7 +71,7 @@ EC_Wrapper::init (CORBA::ORB_ptr orb, } RtecEventChannelAdmin::ConsumerAdmin_ptr -EC_Wrapper::for_consumers (void) +EC_Wrapper::for_consumers () { if (this->ec_impl_) return this->ec_impl_->for_consumers (); @@ -80,7 +80,7 @@ EC_Wrapper::for_consumers (void) } RtecEventChannelAdmin::SupplierAdmin_ptr -EC_Wrapper::for_suppliers (void) +EC_Wrapper::for_suppliers () { if (this->ec_impl_) return this->ec_impl_->for_suppliers (); @@ -89,7 +89,7 @@ EC_Wrapper::for_suppliers (void) } void -EC_Wrapper::destroy_ec (void) +EC_Wrapper::destroy_ec () { std::unique_ptr<TAO_EC_Event_Channel> ec_impl_aptr (this->ec_impl_); this->ec_impl_ = 0; @@ -101,7 +101,7 @@ EC_Wrapper::destroy_ec (void) } void -EC_Wrapper::destroy (void) +EC_Wrapper::destroy () { // Deregister from POA. this->deactivator_.deactivate (); diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h index cf73b4bca21..c089c8f6ff5 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h @@ -29,10 +29,10 @@ public: /// Create a new EC_Wrapper object. /// (Constructor access is restricted to insure that all /// EC_Wrapper objects are heap-allocated.) - static PortableServer::Servant_var<EC_Wrapper> create (void); + static PortableServer::Servant_var<EC_Wrapper> create (); /// Destructor. Destroys the Event Channel implementation. - virtual ~EC_Wrapper (void); + virtual ~EC_Wrapper (); /// Create and initialize underlying EC servant. int init (CORBA::ORB_ptr orb, @@ -41,13 +41,13 @@ public: /// RtecEventChannelAdmin::Event_Channel methods. //@{ virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (void); + for_consumers (); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (void); + for_suppliers (); /// Destroy the Event Channel, deactivate from POA, and shut down /// the ORB. - virtual void destroy (void); + virtual void destroy (); virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr observer); @@ -57,12 +57,12 @@ public: protected: /// Constructor (protected). Clients can create new /// EC_Wrapper objects using the static create() method. - EC_Wrapper (void); + EC_Wrapper (); private: /// Helper - destroys Event Channel and deactivate from POA, if /// necessary. - void destroy_ec (void); + void destroy_ec (); /// Event Channel implementation. /* diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp index 1163e50c20a..e81c7e39244 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp @@ -6,7 +6,7 @@ #include "ace/Dynamic_Service.h" #include "ace/OS_NS_stdio.h" -Gateway_EC::Gateway_EC (void) +Gateway_EC::Gateway_EC () : ec_ior_file_ (ACE_TEXT("gateway-ec.ior")) { } diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h index 455a9149cc9..86756de78f2 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h @@ -21,7 +21,7 @@ class ECMcastTests_Export Gateway_EC { public: /// Constructor. - Gateway_EC (void); + Gateway_EC (); /// Run the server. /// Valid arguments: [-i ior_filename]. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp index 645816641d2..71df48f6d3c 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp @@ -19,12 +19,12 @@ public: virtual void push (const RtecEventComm::EventSet &events); /// No-op. - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); private: /// Helper - destroys EC, shutdowns the ORB and prints number of /// events received. - void disconnect (void); + void disconnect (); /// Number of events of different types pushed to us by EC. //@{ @@ -82,12 +82,12 @@ EC_Consumer::push (const RtecEventComm::EventSet &events) } void -EC_Consumer::disconnect_push_consumer (void) +EC_Consumer::disconnect_push_consumer () { } void -EC_Consumer::disconnect (void) +EC_Consumer::disconnect () { if (this->a_events_ == 100 && this->b_events_ == 100 diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp index 62aaa088c5a..8586ae2efc4 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp @@ -17,13 +17,13 @@ public: /// Logs each event. Initiates shutdown after receiving 100 events. virtual void push (const RtecEventComm::EventSet &events); /// No-op. - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); //@} private: /// Helper - destroys EC, shutdowns the ORB and prints number of /// events received. - void disconnect (void); + void disconnect (); /// Number of events pushed to us by EC. size_t n_events_; @@ -55,12 +55,12 @@ EC_Consumer::push (const RtecEventComm::EventSet &events) } void -EC_Consumer::disconnect_push_consumer (void) +EC_Consumer::disconnect_push_consumer () { } void -EC_Consumer::disconnect (void) +EC_Consumer::disconnect () { if (this->n_events_ == 100) { diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp index c810cb37229..a756d6575f9 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp @@ -40,10 +40,10 @@ class Heartbeat_Application : { public: /// Constructor. - Heartbeat_Application (void); + Heartbeat_Application (); /// Destructor. - ~Heartbeat_Application (void); + ~Heartbeat_Application (); // Initializes the object: connects with EC as a supplier and a // consumer and registers with reactor for timeouts. If init () @@ -59,7 +59,7 @@ public: // No-op if the object hasn't been fully initialized. Otherwise, // deregister from reactor and poa, destroy ec or just disconnect from it // (based on <destroy_ec> flag), and shut down the orb. - void shutdown (void); + void shutdown (); //FUZZ: enable check_for_lack_ACE_OS /// Send another heartbeat or, if we already sent/attempted the required @@ -73,7 +73,7 @@ public: virtual void push (const RtecEventComm::EventSet &events); /// Initiate shutdown(). - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); //@} private: @@ -101,16 +101,16 @@ private: int check_args (CORBA::ORB_var orb, RtecEventChannelAdmin::EventChannel_var ec); /// Connects to EC as a supplier. - void connect_as_supplier (void); + void connect_as_supplier (); /// Connects to EC as a consumer. Activate with default POA. - void connect_as_consumer (void); + void connect_as_consumer (); /// Call destroy() on the EC. Does not propagate exceptions. - void destroy_ec (void); + void destroy_ec (); /// Registers with orb's reactor for timeouts ocurring every 0.5 /// seconds. Returns 0 on success, -1 on error. - int register_for_timeouts (void); + int register_for_timeouts (); /// Deregister from reactor. - void stop_timeouts (void); + void stop_timeouts (); //@} /// Flag indicating whether this object has been fully initialized. @@ -171,7 +171,7 @@ handle_timeout (const ACE_Time_Value& tv, // ************************************************************************** -Heartbeat_Application::Heartbeat_Application (void) +Heartbeat_Application::Heartbeat_Application () : initialized_ (0) , timeout_handler_ (this) , n_timeouts_ (0) @@ -183,7 +183,7 @@ Heartbeat_Application::Heartbeat_Application (void) { } -Heartbeat_Application::~Heartbeat_Application (void) +Heartbeat_Application::~Heartbeat_Application () { } @@ -266,7 +266,7 @@ Heartbeat_Application::init (CORBA::ORB_var orb, } int -Heartbeat_Application::register_for_timeouts (void) +Heartbeat_Application::register_for_timeouts () { // Schedule timeout every 0.5 seconds, for sending heartbeat events. ACE_Time_Value timeout_interval (0, 500000); @@ -286,7 +286,7 @@ Heartbeat_Application::register_for_timeouts (void) } void -Heartbeat_Application::stop_timeouts (void) +Heartbeat_Application::stop_timeouts () { ACE_Reactor *reactor = this->orb_->orb_core ()->reactor (); if (!reactor @@ -299,7 +299,7 @@ Heartbeat_Application::stop_timeouts (void) } void -Heartbeat_Application::connect_as_supplier (void) +Heartbeat_Application::connect_as_supplier () { // Obtain reference to SupplierAdmin. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = @@ -322,7 +322,7 @@ Heartbeat_Application::connect_as_supplier (void) } void -Heartbeat_Application::connect_as_consumer (void) +Heartbeat_Application::connect_as_consumer () { // Activate with poa. RtecEventComm::PushConsumer_var consumer_ref; @@ -441,13 +441,13 @@ Heartbeat_Application::push (const RtecEventComm::EventSet &events) } void -Heartbeat_Application::disconnect_push_consumer (void) +Heartbeat_Application::disconnect_push_consumer () { this->shutdown (); } void -Heartbeat_Application::destroy_ec (void) +Heartbeat_Application::destroy_ec () { if (!CORBA::is_nil (this->ec_.in ())) { @@ -465,7 +465,7 @@ Heartbeat_Application::destroy_ec (void) } } void -Heartbeat_Application::shutdown (void) +Heartbeat_Application::shutdown () { if (!this->initialized_) return; diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index f810a281bc7..4bf80a412d2 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp @@ -15,13 +15,13 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -EC_Connect::EC_Connect (void) +EC_Connect::EC_Connect () : order_ (0) { } void -EC_Connect::execute_test (void) +EC_Connect::execute_test () { // this->EC_Driver::execute_test (); } @@ -70,7 +70,7 @@ EC_Connect::parse_args (int& argc, ACE_TCHAR* argv[]) } void -EC_Connect::print_usage (void) +EC_Connect::print_usage () { this->EC_Driver::print_usage (); @@ -92,7 +92,7 @@ EC_Connect::print_args () const } void -EC_Connect::dump_results (void) +EC_Connect::dump_results () { ACE_High_Res_Timer::global_scale_factor_type gsf = ACE_High_Res_Timer::global_scale_factor (); @@ -142,7 +142,7 @@ EC_Connect::allocate_supplier (int i) } void -EC_Connect::connect_clients (void) +EC_Connect::connect_clients () { this->start_time_ = ACE_OS::gethrtime (); switch (this->order_) @@ -187,7 +187,7 @@ EC_Connect::connect_clients (void) } void -EC_Connect::disconnect_clients (void) +EC_Connect::disconnect_clients () { switch (this->order_) { @@ -247,7 +247,7 @@ EC_Connect::disconnect_clients (void) } void -EC_Connect::disconnect_consumers (void) +EC_Connect::disconnect_consumers () { ACE_hrtime_t start_time = ACE_OS::gethrtime (); for (int i = 0; i < this->n_consumers_; ++i) @@ -269,7 +269,7 @@ EC_Connect::disconnect_consumers (void) } void -EC_Connect::disconnect_suppliers (void) +EC_Connect::disconnect_suppliers () { ACE_hrtime_t start_time = ACE_OS::gethrtime (); for (int i = 0; i < this->n_suppliers_; ++i) diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.h b/TAO/orbsvcs/tests/Event/Performance/Connect.h index 22623793bea..418cd5353f3 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.h +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.h @@ -38,17 +38,17 @@ class EC_Connect : public EC_Driver { public: /// Constructor - EC_Connect (void); + EC_Connect (); // = The EC_Driver methods virtual int parse_args (int& argc, ACE_TCHAR* argv[]); - virtual void print_usage (void); + virtual void print_usage (); virtual void print_args () const; /// Don't run the suppliers, just test connect and disconnect calls. - void execute_test (void); + void execute_test (); - virtual void dump_results (void); + virtual void dump_results (); virtual void connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, @@ -56,14 +56,14 @@ public: virtual void connect_supplier ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, int i); - virtual void disconnect_consumers (void); - virtual void disconnect_suppliers (void); + virtual void disconnect_consumers (); + virtual void disconnect_suppliers (); virtual EC_Consumer* allocate_consumer (int i); virtual EC_Supplier* allocate_supplier (int i); - virtual void connect_clients (void); - virtual void disconnect_clients (void); + virtual void connect_clients (); + virtual void disconnect_clients (); private: ACE_hrtime_t start_time_; diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp index 8c949bfcd1e..b6e082e55be 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp @@ -15,7 +15,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -EC_Inversion::EC_Inversion (void) +EC_Inversion::EC_Inversion () : same_events_ (0) { } @@ -50,7 +50,7 @@ EC_Inversion::parse_args (int &argc, ACE_TCHAR *argv []) } void -EC_Inversion::connect_consumers (void) +EC_Inversion::connect_consumers () { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = this->event_channel_->for_consumers (); @@ -84,7 +84,7 @@ EC_Inversion::connect_consumers (void) } void -EC_Inversion::connect_suppliers (void) +EC_Inversion::connect_suppliers () { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = this->event_channel_->for_suppliers (); @@ -117,7 +117,7 @@ EC_Inversion::connect_suppliers (void) } void -EC_Inversion::activate_tasks (void) +EC_Inversion::activate_tasks () { int priority; diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.h b/TAO/orbsvcs/tests/Event/Performance/Inversion.h index 03c07d71439..e9e101f1c3e 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.h +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.h @@ -26,7 +26,7 @@ class EC_Inversion : public EC_Driver { public: /// Constructor - EC_Inversion (void); + EC_Inversion (); // = The EC_Driver methods /** @@ -42,11 +42,11 @@ public: * other consumer receives events from a set of low priority * suppliers. */ - virtual void connect_consumers (void); - virtual void connect_suppliers (void); + virtual void connect_consumers (); + virtual void connect_suppliers (); /// Activate the suppliers at different priorities - virtual void activate_tasks (void); + virtual void activate_tasks (); private: /// If set then both low priority and high priority suppliers diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index 0ea6cd2f969..f3644488f24 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -280,7 +280,7 @@ EC_Latency_Consumer::EC_Latency_Consumer (ACE_Sample_History *history, } int -EC_Latency_Consumer::done (void) +EC_Latency_Consumer::done () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_, -1); return this->remaining_messages_ <= 0; @@ -306,18 +306,18 @@ EC_Latency_Consumer::push (const RtecEventComm::EventSet& events) } void -EC_Latency_Consumer::disconnect_push_consumer (void) +EC_Latency_Consumer::disconnect_push_consumer () { } // **************************************************************** -EC_Latency_Supplier::EC_Latency_Supplier (void) +EC_Latency_Supplier::EC_Latency_Supplier () { } void -EC_Latency_Supplier::disconnect_push_supplier (void) +EC_Latency_Supplier::disconnect_push_supplier () { } @@ -331,14 +331,14 @@ Task::Task (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer, } int -Task::done (void) +Task::done () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 1); return this->remaining_messages_ == 0; } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h index 47f32d3a180..dd5cdb86b0a 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.h +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h @@ -33,10 +33,10 @@ public: int message_count); /// Return 1 when all the messages have been received - int done (void); + int done (); virtual void push (const RtecEventComm::EventSet& events); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); private: /// Roundtrip delays are recorded here @@ -55,9 +55,9 @@ class EC_Latency_Supplier : public POA_RtecEventComm::PushSupplier { public: /// Constructor - EC_Latency_Supplier (void); + EC_Latency_Supplier (); - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); }; // **************************************************************** @@ -71,10 +71,10 @@ public: int iterations); /// Return 1 when all the messages have been sent - int done (void); + int done (); /// Run the experiment - int svc (void); + int svc (); private: /// The consumer diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp index 780e75ac9f1..dc5377b5c6a 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp @@ -13,7 +13,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -EC_Throughput::EC_Throughput (void) +EC_Throughput::EC_Throughput () { } @@ -32,7 +32,7 @@ EC_Throughput::print_args () const } void -EC_Throughput::print_usage (void) +EC_Throughput::print_usage () { this->EC_Driver::print_usage (); } @@ -43,13 +43,13 @@ EC_Throughput::modify_attributes (TAO_EC_Event_Channel_Attributes&) } void -EC_Throughput::execute_test (void) +EC_Throughput::execute_test () { this->EC_Driver::execute_test (); } void -EC_Throughput::dump_results (void) +EC_Throughput::dump_results () { this->EC_Driver::dump_results (); } diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.h b/TAO/orbsvcs/tests/Event/Performance/Throughput.h index 1b414749d8b..72d06bc50ca 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.h +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.h @@ -26,22 +26,22 @@ class EC_Throughput : public EC_Driver { public: /// Constructor - EC_Throughput (void); + EC_Throughput (); // = The EC_Driver methods /// add some command line args to enable/disable throughputions virtual int parse_args (int& argc, ACE_TCHAR* argv[]); virtual void print_args () const; - virtual void print_usage (void); + virtual void print_usage (); /// set the throughpution flags virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr); /// Don't run the suppliers, just test connect and disconnect calls. - void execute_test (void); + void execute_test (); /// Don't dump the EC_Driver results, they are meaningless. - void dump_results (void); + void dump_results (); private: }; diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp index b6b70325e93..550942be7a5 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp @@ -45,7 +45,7 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin) } void -Consumer::disconnect (void) +Consumer::disconnect () { try { @@ -124,7 +124,7 @@ Consumer::push (const RtecEventComm::EventSet& events) } void -Consumer::disconnect_push_consumer (void) +Consumer::disconnect_push_consumer () { } diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.h b/TAO/orbsvcs/tests/Event/UDP/Consumer.h index c5cca80be8c..5c0dfe9f43c 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Consumer.h +++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.h @@ -36,13 +36,13 @@ public: void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin); /// Disconnect from the event channel - void disconnect (void); + void disconnect (); // = The RtecEventComm::PushConsumer methods /// The skeleton methods. virtual void push (const RtecEventComm::EventSet& events); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); CORBA::ULong event_count () const; private: diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp index 2180da5fc08..845db3d1e08 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp @@ -30,7 +30,7 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin) } void -Supplier::disconnect (void) +Supplier::disconnect () { // Disconnect from the EC try @@ -55,7 +55,7 @@ Supplier::insert_into_any (CORBA::Any& any, Components::EventBase* vb) } void -Supplier::perform_push (void) +Supplier::perform_push () { try { @@ -89,7 +89,7 @@ Supplier::perform_push (void) } void -Supplier::disconnect_push_supplier (void) +Supplier::disconnect_push_supplier () { } diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.h b/TAO/orbsvcs/tests/Event/UDP/Supplier.h index ff0ce11b4c0..8142f79ce21 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Supplier.h +++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.h @@ -37,15 +37,15 @@ public: void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin); /// Disconnect from the event channel - void disconnect (void); + void disconnect (); /// Push a single event - void perform_push (void); + void perform_push (); // = The RtecEventComm::PushSupplier methods /// The skeleton methods. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); private: void insert_into_any (CORBA::Any& any, Components::EventBase* vb); diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp index 4872289a5a3..56df011d037 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp @@ -53,7 +53,7 @@ EC_Consumer::connected () const } void -EC_Consumer::disconnect (void) +EC_Consumer::disconnect () { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; @@ -65,7 +65,7 @@ EC_Consumer::disconnect (void) } void -EC_Consumer::shutdown (void) +EC_Consumer::shutdown () { if (!this->is_active_) return; @@ -137,7 +137,7 @@ EC_Consumer::push (const RtecEventComm::EventSet& events) } void -EC_Consumer::disconnect_push_consumer (void) +EC_Consumer::disconnect_push_consumer () { this->driver_->consumer_disconnect (this->cookie_); this->supplier_proxy_ = diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h index d8dd29aba14..7a6beedcf3b 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.h +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h @@ -61,10 +61,10 @@ public: /// The application can invoke this method to disconnect from the EC /// and deactivate this class. - void disconnect (void); + void disconnect (); /// The application is shutting down, deactivate the consumer. - void shutdown (void); + void shutdown (); /// Accumulate our statistics to the totals. void accumulate (ACE_Throughput_Stats& throughput) const; @@ -78,7 +78,7 @@ public: /// The skeleton methods. virtual void push (const RtecEventComm::EventSet& events); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); private: /// The main driver for the test. diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp index 939f3218210..e68c91f2a2a 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp @@ -28,7 +28,7 @@ EC_Counting_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer } void -EC_Counting_Consumer::disconnect (void) +EC_Counting_Consumer::disconnect () { if (!CORBA::is_nil (this->supplier_proxy_.in ())) { @@ -40,7 +40,7 @@ EC_Counting_Consumer::disconnect (void) } void -EC_Counting_Consumer::deactivate (void) +EC_Counting_Consumer::deactivate () { PortableServer::POA_var consumer_poa = this->_default_POA (); @@ -94,7 +94,7 @@ EC_Counting_Consumer::push (const RtecEventComm::EventSet& events) } void -EC_Counting_Consumer::disconnect_push_consumer (void) +EC_Counting_Consumer::disconnect_push_consumer () { this->disconnect_count++; this->supplier_proxy_ = diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h index 91cbe460445..afbe9007f13 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h @@ -36,8 +36,8 @@ public: /// Simple connect/disconnect methods.. void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, const RtecEventChannelAdmin::ConsumerQOS &qos); - void disconnect (void); - void deactivate (void); + void disconnect (); + void deactivate (); /// Print out an error message if the event count is too far from the /// expected count. @@ -47,7 +47,7 @@ public: /// The skeleton methods. virtual void push (const RtecEventComm::EventSet& events); - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); /// Keep track of the number of events received. CORBA::ULong event_count; diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp index 52ea5d4d378..05f6d5d4556 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp @@ -2,7 +2,7 @@ #include "orbsvcs/Event_Utilities.h" #include "ace/OS_NS_unistd.h" -EC_Counting_Supplier::EC_Counting_Supplier (void) +EC_Counting_Supplier::EC_Counting_Supplier () : event_count (0), disconnect_count (0), consumer_adapter_ (this), @@ -38,7 +38,7 @@ EC_Counting_Supplier::activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consume } void -EC_Counting_Supplier::deactivate (void) +EC_Counting_Supplier::deactivate () { this->supplier_proxy_->disconnect_push_supplier (); @@ -87,7 +87,7 @@ EC_Counting_Supplier::connect ( } void -EC_Counting_Supplier::disconnect (void) +EC_Counting_Supplier::disconnect () { if (!CORBA::is_nil (this->consumer_proxy_.in ())) { @@ -121,12 +121,12 @@ EC_Counting_Supplier::push (const RtecEventComm::EventSet&) } void -EC_Counting_Supplier::disconnect_push_consumer (void) +EC_Counting_Supplier::disconnect_push_consumer () { } void -EC_Counting_Supplier::disconnect_push_supplier (void) +EC_Counting_Supplier::disconnect_push_supplier () { this->disconnect_count++; this->consumer_proxy_ = @@ -158,20 +158,20 @@ EC_Counting_Supplier_Task::svc () } void -EC_Counting_Supplier_Task::stop (void) +EC_Counting_Supplier_Task::stop () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); this->stop_flag_ = 1; } CORBA::ULong -EC_Counting_Supplier_Task::push_count (void) +EC_Counting_Supplier_Task::push_count () { return this->push_count_; } void -EC_Counting_Supplier_Task::run (void) +EC_Counting_Supplier_Task::run () { this->event_.length (1); diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h index 8104a801765..28c733a1173 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h @@ -32,7 +32,7 @@ class EC_Test_Export EC_Counting_Supplier : public POA_RtecEventComm::PushSuppli { public: /// Constructor - EC_Counting_Supplier (void); + EC_Counting_Supplier (); // = The RtecEventComm::PushSupplier methods @@ -44,7 +44,7 @@ public: */ void activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, int period); - void deactivate (void); + void deactivate (); /// Simple connect/disconnect methods.. void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, @@ -54,14 +54,14 @@ public: int event_type); void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, const RtecEventChannelAdmin::SupplierQOS &qos); - void disconnect (void); + void disconnect (); /// The Consumer side methods. void push (const RtecEventComm::EventSet& events); - void disconnect_push_consumer (void); + void disconnect_push_consumer (); /// The skeleton methods. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); /// Count the number of events sent CORBA::ULong event_count; @@ -93,13 +93,13 @@ public: EC_Counting_Supplier_Task (EC_Counting_Supplier *supplier); // = Check the ACE_Task_Base documentation. - int svc (void); + int svc (); - void stop (void); - CORBA::ULong push_count (void); + void stop (); + CORBA::ULong push_count (); /// Run a single iteration of the test - void run (void); + void run (); private: /// The supplier we are turning into an active object diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index 086662e4d48..1cd92c02a78 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -25,7 +25,7 @@ #endif /* __ACE_INLINE__ */ -EC_Driver::EC_Driver (void) +EC_Driver::EC_Driver () : n_consumers_ (1), consumers_ (0), n_suppliers_ (1), @@ -51,7 +51,7 @@ EC_Driver::EC_Driver (void) TAO_EC_Default_Factory::init_svcs (); } -EC_Driver::~EC_Driver (void) +EC_Driver::~EC_Driver () { } @@ -123,7 +123,7 @@ EC_Driver::run_init (int &argc, ACE_TCHAR* argv[]) } void -EC_Driver::run_cleanup (void) +EC_Driver::run_cleanup () { this->disconnect_clients (); @@ -214,7 +214,7 @@ EC_Driver::print_args () const } int -EC_Driver::move_to_rt_class (void) +EC_Driver::move_to_rt_class () { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) @@ -248,7 +248,7 @@ EC_Driver::move_to_rt_class (void) } void -EC_Driver::initialize_ec_impl (void) +EC_Driver::initialize_ec_impl () { #if !defined(EC_DISABLE_REMOTE_EC) if (this->use_remote_ec_ == 1) @@ -263,7 +263,7 @@ EC_Driver::initialize_ec_impl (void) #if !defined(EC_DISABLE_REMOTE_EC) void -EC_Driver::obtain_remote_ec (void) +EC_Driver::obtain_remote_ec () { CosNaming::NamingContext_var naming_context = this->get_naming_context (); @@ -280,7 +280,7 @@ EC_Driver::obtain_remote_ec (void) } CosNaming::NamingContext_ptr -EC_Driver::get_naming_context (void) +EC_Driver::get_naming_context () { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references ("NameService"); @@ -295,7 +295,7 @@ EC_Driver::get_naming_context (void) #endif void -EC_Driver::initialize_new_ec (void) +EC_Driver::initialize_new_ec () { TAO_EC_Event_Channel_Attributes attr (this->root_poa_.in (), this->root_poa_.in ()); @@ -313,7 +313,7 @@ EC_Driver::initialize_new_ec (void) } void -EC_Driver::deactivate_ec (void) +EC_Driver::deactivate_ec () { #if !defined(EC_DISABLE_REMOTE_EC) if (this->use_remote_ec_ == 1) @@ -334,13 +334,13 @@ EC_Driver::deactivate_ec (void) } void -EC_Driver::destroy_ec (void) +EC_Driver::destroy_ec () { this->event_channel_->destroy (); } int -EC_Driver::allocate_consumers (void) +EC_Driver::allocate_consumers () { ACE_NEW_RETURN (this->consumers_, EC_Consumer*[this->n_consumers_], @@ -352,7 +352,7 @@ EC_Driver::allocate_consumers (void) } int -EC_Driver::allocate_suppliers (void) +EC_Driver::allocate_suppliers () { ACE_NEW_RETURN (this->suppliers_, EC_Supplier*[this->n_suppliers_], @@ -378,7 +378,7 @@ EC_Driver::allocate_supplier (int i) } void -EC_Driver::connect_clients (void) +EC_Driver::connect_clients () { this->connect_consumers (); @@ -386,7 +386,7 @@ EC_Driver::connect_clients (void) } void -EC_Driver::disconnect_clients (void) +EC_Driver::disconnect_clients () { this->disconnect_suppliers (); @@ -394,7 +394,7 @@ EC_Driver::disconnect_clients (void) } void -EC_Driver::shutdown_clients (void) +EC_Driver::shutdown_clients () { this->shutdown_suppliers (); @@ -402,7 +402,7 @@ EC_Driver::shutdown_clients (void) } void -EC_Driver::connect_consumers (void) +EC_Driver::connect_consumers () { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = this->event_channel_->for_consumers (); @@ -454,7 +454,7 @@ EC_Driver::build_consumer_qos ( } void -EC_Driver::connect_suppliers (void) +EC_Driver::connect_suppliers () { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = this->event_channel_->for_suppliers (); @@ -508,7 +508,7 @@ EC_Driver::build_supplier_qos ( } void -EC_Driver::execute_test (void) +EC_Driver::execute_test () { if (this->allocate_tasks () == -1) return; @@ -529,7 +529,7 @@ EC_Driver::execute_test (void) } int -EC_Driver::allocate_tasks (void) +EC_Driver::allocate_tasks () { if (this->tasks_ != 0) return 0; @@ -559,7 +559,7 @@ EC_Driver::allocate_task (int i) } void -EC_Driver::activate_tasks (void) +EC_Driver::activate_tasks () { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) @@ -585,7 +585,7 @@ EC_Driver::activate_tasks (void) } void -EC_Driver::disconnect_suppliers (void) +EC_Driver::disconnect_suppliers () { if (this->suppliers_ == 0) return; @@ -598,7 +598,7 @@ EC_Driver::disconnect_suppliers (void) } void -EC_Driver::disconnect_consumers (void) +EC_Driver::disconnect_consumers () { if (this->consumers_ == 0) return; @@ -611,7 +611,7 @@ EC_Driver::disconnect_consumers (void) } void -EC_Driver::shutdown_suppliers (void) +EC_Driver::shutdown_suppliers () { if (this->suppliers_ == 0) return; @@ -624,7 +624,7 @@ EC_Driver::shutdown_suppliers (void) } void -EC_Driver::shutdown_consumers (void) +EC_Driver::shutdown_consumers () { if (this->consumers_ == 0) return; @@ -637,7 +637,7 @@ EC_Driver::shutdown_consumers (void) } void -EC_Driver::dump_results (void) +EC_Driver::dump_results () { ACE_Throughput_Stats throughput; ACE_High_Res_Timer::global_scale_factor_type gsf = @@ -845,7 +845,7 @@ EC_Driver::parse_args (int &argc, ACE_TCHAR *argv []) } void -EC_Driver::print_usage (void) +EC_Driver::print_usage () { ACE_DEBUG ((LM_DEBUG, "EC_Driver Usage:\n" @@ -878,7 +878,7 @@ EC_Driver::modify_attributes (TAO_EC_Event_Channel_Attributes& attr) } void -EC_Driver::cleanup_tasks (void) +EC_Driver::cleanup_tasks () { if (this->tasks_ != 0) { @@ -893,7 +893,7 @@ EC_Driver::cleanup_tasks (void) } void -EC_Driver::cleanup_suppliers (void) +EC_Driver::cleanup_suppliers () { if (this->suppliers_ != 0) { @@ -908,7 +908,7 @@ EC_Driver::cleanup_suppliers (void) } void -EC_Driver::cleanup_consumers (void) +EC_Driver::cleanup_consumers () { if (this->consumers_ != 0) { @@ -923,7 +923,7 @@ EC_Driver::cleanup_consumers (void) } void -EC_Driver::cleanup_ec (void) +EC_Driver::cleanup_ec () { delete this->ec_impl_; #if !defined(EC_DISABLE_OLD_EC) diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h index cfbf9e1d21b..f577bce079f 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.h +++ b/TAO/orbsvcs/tests/Event/lib/Driver.h @@ -51,10 +51,10 @@ class EC_Test_Export EC_Driver { public: /// Constructor - EC_Driver (void); + EC_Driver (); /// Destructor - virtual ~EC_Driver (void); + virtual ~EC_Driver (); /// Flag to indicate in the test should be verbose. int verbose () const; @@ -66,7 +66,7 @@ public: virtual void run_init (int& argc, ACE_TCHAR* argv[]); /// The cleanup section - virtual void run_cleanup (void); + virtual void run_cleanup (); /// Initialize the ORB and obtain the RootPOA object virtual void initialize_orb_and_poa (int& argc, ACE_TCHAR* argv[]); @@ -75,33 +75,33 @@ public: virtual int parse_args (int& argc, ACE_TCHAR* argv[]); /// Print the usage method - virtual void print_usage (void); + virtual void print_usage (); /// Print out the arguments virtual void print_args () const; /// Run the test in the real-time class, return -1 on error. - virtual int move_to_rt_class (void); + virtual int move_to_rt_class (); /// Construct the EC and its helper objects, also activates the EC in /// the RootPOA. - virtual void initialize_ec_impl (void); + virtual void initialize_ec_impl (); /// By default connect the consumers and then the suppliers, other /// orders should work too. - virtual void connect_clients (void); + virtual void connect_clients (); /// By default disconnect the suppliers and then the consumers, other /// orders should work too. - virtual void disconnect_clients (void); + virtual void disconnect_clients (); /// By default deactivate the suppliers and then the consumers, other /// orders should work too. - virtual void shutdown_clients (void); + virtual void shutdown_clients (); /// Connect all the consumers, by default it lets each consumer /// connect itself. - virtual void connect_consumers (void); + virtual void connect_consumers (); /// Connect consumer number <i> using the consumer_admin provided. virtual void connect_consumer ( @@ -116,7 +116,7 @@ public: /// Connect all the suppliers, by default it lets each supplier /// connect itself. - virtual void connect_suppliers (void); + virtual void connect_suppliers (); /// Connect supplier number <i> using the supplier_admin provided. virtual void connect_supplier ( @@ -130,38 +130,38 @@ public: int& shutdown_event_type); /// Execute the test, by default simply call activate_suppliers() - virtual void execute_test (void); + virtual void execute_test (); /** * Dump the results, i.e. invoke dump_results on all the suppliers * and consumers, collect the latency and throughput results for * each and print the totals too. */ - virtual void dump_results (void); + virtual void dump_results (); /// Disconnect all the consumers. - virtual void disconnect_consumers (void); + virtual void disconnect_consumers (); /// Disconnect all the suppliers. - virtual void disconnect_suppliers (void); + virtual void disconnect_suppliers (); /// Deactivate all the consumers. - virtual void shutdown_consumers (void); + virtual void shutdown_consumers (); /// Deactivate all the suppliers. - virtual void shutdown_suppliers (void); + virtual void shutdown_suppliers (); /// Call EC->destroy - virtual void destroy_ec (void); + virtual void destroy_ec (); /// De-activate the EC (and its helper classes). - virtual void deactivate_ec (void); + virtual void deactivate_ec (); /// Cleanup the resources - virtual void cleanup_ec (void); - virtual void cleanup_tasks (void); - virtual void cleanup_consumers (void); - virtual void cleanup_suppliers (void); + virtual void cleanup_ec (); + virtual void cleanup_tasks (); + virtual void cleanup_consumers (); + virtual void cleanup_suppliers (); /// Allow modifications of the default EC attributes virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr); @@ -187,30 +187,30 @@ public: #if !defined(EC_DISABLE_REMOTE_EC) /// Obtain the EC from the Naming service - virtual void obtain_remote_ec (void); + virtual void obtain_remote_ec (); virtual CosNaming::NamingContext_ptr - get_naming_context (void); + get_naming_context (); #endif /// Initialize the EC using the new implementation - virtual void initialize_new_ec (void); + virtual void initialize_new_ec (); /// Allocate the suppliers and the consumers - virtual int allocate_consumers (void); - virtual int allocate_suppliers (void); + virtual int allocate_consumers (); + virtual int allocate_suppliers (); /// Allocate one consumer or supplier virtual EC_Consumer* allocate_consumer (int i); virtual EC_Supplier* allocate_supplier (int i); /// Allocate one task for supplier number <i> - virtual int allocate_tasks (void); + virtual int allocate_tasks (); virtual ACE_Task_Base* allocate_task (int i); /// Activate all the tasks, by default runs each supplier on its /// own thread. - virtual void activate_tasks (void); + virtual void activate_tasks (); protected: /// The ORB diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp index a2e74436ef0..ffce96cff06 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp @@ -129,7 +129,7 @@ EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos, } void -EC_Supplier::disconnect (void) +EC_Supplier::disconnect () { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; @@ -141,7 +141,7 @@ EC_Supplier::disconnect (void) } void -EC_Supplier::shutdown (void) +EC_Supplier::shutdown () { if (!this->is_active_) return; @@ -157,7 +157,7 @@ EC_Supplier::shutdown (void) } void -EC_Supplier::disconnect_push_supplier (void) +EC_Supplier::disconnect_push_supplier () { this->driver_->supplier_disconnect (this->cookie_); this->consumer_proxy_ = @@ -202,7 +202,7 @@ EC_Supplier_Task::EC_Supplier_Task (EC_Supplier* supplier, } int -EC_Supplier_Task::svc (void) +EC_Supplier_Task::svc () { // Initialize a time value to pace the test ACE_Time_Value tv (0, this->burst_pause_); diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h index 9db3874b338..c7fbce015ee 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.h +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h @@ -61,7 +61,7 @@ public: const RtecEventComm::Event& event); /// Send a shutdown event. - void send_shutdown (void); + void send_shutdown (); /// Connect using a <supplier_admin> and publications (<qos>) /// computed by the user @@ -76,10 +76,10 @@ public: int shutdown_event_type); /// Disconnect from the EC, also deactivates the object - void disconnect (void); + void disconnect (); /// Disconnect from the EC, also deactivates the object - void shutdown (void); + void shutdown (); /// Dump the results... virtual void dump_results ( @@ -94,7 +94,7 @@ public: RtecEventComm::Event& event); // = The PushSupplier methods - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); private: /// Class we forward to. diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp index bfee692bb08..a1b93d3b052 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp @@ -23,7 +23,7 @@ public: //////////// // execution - int run (void); + int run (); ///////////////// // implementation @@ -38,7 +38,7 @@ private: ); - int next_replica (void); + int next_replica (); //////////////////// // forbidden methods @@ -488,7 +488,7 @@ int FTClientMain::pass ( return result; } -int FTClientMain::next_replica (void) +int FTClientMain::next_replica () { int result = 0; if (this->replica_pos_ < this->replica_iors_.size()) @@ -518,7 +518,7 @@ int FTClientMain::next_replica (void) } -int FTClientMain::run (void) +int FTClientMain::run () { int result = 0; diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp index 60150e30990..f20db9c3880 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp @@ -171,7 +171,7 @@ int FTAPP::FT_Creator::init (CORBA::ORB_ptr orb) return result; } -int FTAPP::FT_Creator::run (void) +int FTAPP::FT_Creator::run () { int result = 0; size_t typeCount = this->create_roles_.size(); diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.h b/TAO/orbsvcs/tests/FT_App/FT_Creator.h index 91241cb64c4..4e0c729ca97 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h +++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h @@ -44,7 +44,7 @@ namespace FTAPP //////////// // execution - int run (void); + int run (); //////////// // shut down diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp index 02e9480704c..72a0a959298 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp @@ -497,7 +497,7 @@ int FT_ReplicaFactory_i::init (CORBA::ORB_ptr orb) return result; } -int FT_ReplicaFactory_i::fini (void) +int FT_ReplicaFactory_i::fini () { if (this->ior_output_file_ != 0) { @@ -702,13 +702,13 @@ void FT_ReplicaFactory_i::delete_object ( METHOD_RETURN(FT_ReplicaFactory_i::delete_object); } -CORBA::Boolean FT_ReplicaFactory_i::is_alive (void) +CORBA::Boolean FT_ReplicaFactory_i::is_alive () { METHOD_RETURN(FT_ReplicaFactory_i::is_alive) true; } -void FT_ReplicaFactory_i::shutdown (void) +void FT_ReplicaFactory_i::shutdown () { METHOD_ENTRY(FT_FaultDetectorFactory_i::shutdown); ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_); diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h index 174083fbcfe..c08d2e9e12c 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h +++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.h @@ -78,7 +78,7 @@ public: * Prepare to exit. * @return zero for success; nonzero is process return code for failure. */ - int fini (void); + int fini (); int idle(int & result); @@ -103,7 +103,7 @@ public: // CORBA interface // See IDL for documentation - virtual void shutdown (void); + virtual void shutdown (); ///////////////////////////////////////// // CORBA interface GenericFactory methods @@ -120,7 +120,7 @@ public: ////////////////////////////////////////// // CORBA interface PullMonitorable methods - virtual CORBA::Boolean is_alive (void); + virtual CORBA::Boolean is_alive (); ///////////////////////// // Implementation methods diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp index 67ad778a036..7634a395f13 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp +++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp @@ -175,7 +175,7 @@ unsigned long FT_TestReplica_i::factory_id()const return this->factory_id_; } -::PortableServer::POA_ptr FT_TestReplica_i::_default_POA (void) +::PortableServer::POA_ptr FT_TestReplica_i::_default_POA () { return ::PortableServer::POA::_duplicate(this->poa_.in ()); } @@ -231,14 +231,14 @@ int FT_TestReplica_i::init (CORBA::ORB_var & orb, const ACE_TCHAR* file_persiste return 0; } -void FT_TestReplica_i::_remove_ref (void) +void FT_TestReplica_i::_remove_ref () { ////////////////////////////////////////////////// // WARNING: The following call invokes fini then deletes this object this->factory_->remove_replica(this->factory_id_, this); } -int FT_TestReplica_i::fini (void) +int FT_TestReplica_i::fini () { return 0; } @@ -246,7 +246,7 @@ int FT_TestReplica_i::fini (void) ///////////////////////////////////////////////////// // class FT_TestReplica_i: PullMonitorable interface -CORBA::Boolean FT_TestReplica_i::is_alive (void) +CORBA::Boolean FT_TestReplica_i::is_alive () { KEVORKIAN_RETURN(DURING_IS_ALIVE, is_alive, 0) ACE_ERROR ((LM_ERROR, @@ -262,7 +262,7 @@ CORBA::Boolean FT_TestReplica_i::is_alive (void) ///////////////////////////////////////////////////// // class FT_TestReplica_i: Updateable interface -FT::State * FT_TestReplica_i::get_update (void) +FT::State * FT_TestReplica_i::get_update () { KEVORKIAN_RETURN(DURING_GET_UPDATE, get_update, 0) long counter = load(); @@ -286,7 +286,7 @@ void FT_TestReplica_i::set_update (const FT::State & s) ///////////////////////////////////////////////////// // class FT_TestReplica_i: Checkpointable interface -::FT::State * FT_TestReplica_i::get_state (void) +::FT::State * FT_TestReplica_i::get_state () { #if defined(FT_TEST_LACKS_STATE) throw FT::NoStateAvailable (); @@ -346,14 +346,14 @@ CORBA::Long FT_TestReplica_i::increment (CORBA::Long delta) return counter; } -CORBA::Long FT_TestReplica_i::get (void) +CORBA::Long FT_TestReplica_i::get () { KEVORKIAN_DURING_RETURN(get, 0) long counter = load (); return counter; } -CORBA::Long FT_TestReplica_i::counter (void) +CORBA::Long FT_TestReplica_i::counter () { KEVORKIAN_DURING_RETURN([get]counter, 0) long counter = load (); @@ -376,7 +376,7 @@ void FT_TestReplica_i::die (FT_TEST::TestReplica::Bane when) KEVORKIAN(RIGHT_NOW, die) } -void FT_TestReplica_i::shutdown (void) +void FT_TestReplica_i::shutdown () { ACE_OS::fprintf (stdout, "%s@%s#%lu Shut down requested\n", name_.c_str(), this->factory_->location(), this->factory_id_); diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h index f32830750e2..380de17d08c 100644 --- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h +++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.h @@ -66,7 +66,7 @@ public: * Prepare to exit. * @return zero for success; nonzero is process return code for failure. */ - int fini (void); + int fini (); /** * idle time activity. @@ -87,9 +87,9 @@ public: ////////////////////////////////////////// // Override CORBA servant virtual methods - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); - virtual void _remove_ref (void); + virtual void _remove_ref (); private: /////////////////////////// @@ -98,29 +98,29 @@ private: virtual CORBA::Long increment (CORBA::Long delta); - virtual CORBA::Long get (void); + virtual CORBA::Long get (); - virtual CORBA::Long counter (void); + virtual CORBA::Long counter (); virtual void counter (CORBA::Long counter); virtual void die (FT_TEST::TestReplica::Bane when); - virtual void shutdown (void); + virtual void shutdown (); /////////////////////////// // override PullMonitorable - virtual CORBA::Boolean is_alive (void); + virtual CORBA::Boolean is_alive (); /////////////////////////// // override Updatable - virtual ::FT::State * get_update (void); + virtual ::FT::State * get_update (); virtual void set_update (const FT::State & s); - virtual ::FT::State * get_state (void); + virtual ::FT::State * get_state (); virtual void set_state (const FT::State & s); diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp index 546c0361c90..fe314e70a88 100644 --- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp +++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp @@ -340,7 +340,7 @@ const char * ReplicationManagerFaultConsumerAdapter::identity () const /** * Clean house for process shut down. */ -int ReplicationManagerFaultConsumerAdapter::fini (void) +int ReplicationManagerFaultConsumerAdapter::fini () { // Delegate to the FT_FaultConsumer. return this->p_fault_consumer_->fini (); diff --git a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h index f398412eb02..5d1aa2aa3ec 100644 --- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h +++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.h @@ -58,7 +58,7 @@ public: /** * Clean house for process shut down. */ - int fini (void); + int fini (); size_t notifications() const; diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp index 249072b8085..066d40b3fa3 100644 --- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp @@ -24,7 +24,7 @@ int StubBatchConsumer::parse_args (int argc, ACE_TCHAR * argv[]) } -::PortableServer::POA_ptr StubBatchConsumer::_default_POA (void) +::PortableServer::POA_ptr StubBatchConsumer::_default_POA () { return ::PortableServer::POA::_duplicate(this->poa_.in ()); } @@ -100,7 +100,7 @@ const char * StubBatchConsumer::identity () const /** * Clean house for process shut down. */ -void StubBatchConsumer::fini (void) +void StubBatchConsumer::fini () { this->notifier_->disconnect_consumer(this->consumer_id_); } diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h index 0c7debe7178..3745856fce7 100644 --- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h +++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.h @@ -36,7 +36,7 @@ public: */ virtual ~StubBatchConsumer (); - ::PortableServer::POA_ptr _default_POA (void); + ::PortableServer::POA_ptr _default_POA (); ::PortableServer::ObjectId objectId()const; /** @@ -64,7 +64,7 @@ public: /** * Clean house for process shut down. */ - void fini (void); + void fini (); public: diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp index 5541c294eaa..63dee650a97 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp @@ -244,7 +244,7 @@ const char * StubFaultAnalyzer::identity () const /** * Clean house for process shut down. */ -int StubFaultAnalyzer::fini (void) +int StubFaultAnalyzer::fini () { this->faultConsumer_.fini(); this->batchConsumer_.fini(); diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h index 2fafcdbbc7b..3a923c5698e 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.h @@ -64,7 +64,7 @@ public: * Prepare to exit. * @return zero for success; nonzero is process return code for failure. */ - int fini (void); + int fini (); ///////////////// // Implementation diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp index 079559f73ee..6410929038d 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp @@ -14,7 +14,7 @@ StubFaultConsumer::~StubFaultConsumer () { } -::PortableServer::POA_ptr StubFaultConsumer::_default_POA (void) +::PortableServer::POA_ptr StubFaultConsumer::_default_POA () { return ::PortableServer::POA::_duplicate(this->poa_.in ()); } @@ -215,7 +215,7 @@ const char * StubFaultConsumer::identity () const /** * Clean house for process shut down. */ -int StubFaultConsumer::fini (void) +int StubFaultConsumer::fini () { this->notifier_->disconnect_consumer(this->consumer_id_); return 0; @@ -284,7 +284,7 @@ void StubFaultConsumer::offer_change ( )); } -void StubFaultConsumer::disconnect_structured_push_consumer(void) +void StubFaultConsumer::disconnect_structured_push_consumer() { ACE_ERROR ((LM_ERROR, "StubFaultConsumer:disconnect_structured_push_consumer interpreted as quit request.\n" diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h index 4fe4d38f9b8..4ca9fcc8b1a 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.h @@ -38,7 +38,7 @@ public: virtual ~StubFaultConsumer (); - ::PortableServer::POA_ptr _default_POA (void); + ::PortableServer::POA_ptr _default_POA (); ::PortableServer::ObjectId objectId()const; /** @@ -66,7 +66,7 @@ public: /** * Clean house for process shut down. */ - int fini (void); + int fini (); size_t notifications() const; @@ -83,7 +83,7 @@ public: const CosNotification::EventTypeSeq & removed ); - virtual void disconnect_structured_push_consumer(void); + virtual void disconnect_structured_push_consumer(); //////////////////// // Forbidden methods diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp index ef170af39cf..f7eb7b0c131 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp @@ -19,7 +19,7 @@ StubFaultNotifier::~StubFaultNotifier () } -::PortableServer::POA_ptr StubFaultNotifier::_default_POA (void) +::PortableServer::POA_ptr StubFaultNotifier::_default_POA () { return ::PortableServer::POA::_duplicate(this->poa_.in ()); } @@ -104,7 +104,7 @@ int StubFaultNotifier::parse_args (int argc, ACE_TCHAR * argv[]) /** * Prepare to exit. */ -int StubFaultNotifier::fini (void) +int StubFaultNotifier::fini () { if(this->ns_name_.length () != 0) { @@ -324,7 +324,7 @@ const ACE_TCHAR * StubFaultNotifier::identity () const /** * Clean house for process shut down. */ -void StubFaultNotifier::shutdown_i (void) +void StubFaultNotifier::shutdown_i () { this->orb_->shutdown (false); } @@ -409,7 +409,7 @@ void StubFaultNotifier::disconnect_consumer ( throw CORBA::NO_IMPLEMENT(); } -CORBA::Boolean StubFaultNotifier::is_alive (void) +CORBA::Boolean StubFaultNotifier::is_alive () { return 1; } diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h index c1ded566c7f..04ed9cdc8d8 100644 --- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h +++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.h @@ -51,7 +51,7 @@ public: /** * Prepare to exit. */ - int fini (void); + int fini (); /** * Return a string to identify this object for logging/console message purposes. @@ -66,7 +66,7 @@ public: int idle(int &result); // override virtuals -::PortableServer::POA_ptr _default_POA (void); +::PortableServer::POA_ptr _default_POA (); PortableServer::ObjectId objectId()const; @@ -74,7 +74,7 @@ public: /** * Clean house for process shut down. */ - void shutdown_i (void); + void shutdown_i (); //////////////////////////////// // CORBA interface FaultNotifier @@ -108,7 +108,7 @@ public: ////////////////////////////////////////// // CORBA interface PullMonitorable methods - virtual CORBA::Boolean is_alive (void); + virtual CORBA::Boolean is_alive (); ///////////////// // Implementation diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp index e1d7fa6888f..70f4f233719 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.cpp @@ -13,13 +13,13 @@ Basic::Basic (CORBA::Object_ptr object_group, } char * -Basic::get_string (void) +Basic::get_string () { return CORBA::string_dup (this->location_.in ()); } void -Basic::remove_member (void) +Basic::remove_member () { try { @@ -56,7 +56,7 @@ Basic::remove_member (void) void -Basic::shutdown (void) +Basic::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h index 81a4eb6052f..2513de6544c 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/Basic.h @@ -24,11 +24,11 @@ public: CORBA::ORB_ptr orb, const char *loc); - virtual char * get_string (void); + virtual char * get_string (); - virtual void shutdown (void); + virtual void shutdown (); - virtual void remove_member (void); + virtual void remove_member (); private: const char* object_group_name_; diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp index 06e69c84b12..cc9e81f2434 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.cpp @@ -12,7 +12,7 @@ LB_server::LB_server (int argc, ACE_TCHAR **argv) } int -LB_server::destroy (void) +LB_server::destroy () { try { @@ -32,19 +32,19 @@ LB_server::destroy (void) } CORBA::ORB_ptr -LB_server::orb (void) +LB_server::orb () { return this->orb_.in (); } CORBA::Object_ptr -LB_server::object_group (void) +LB_server::object_group () { return this->object_group_.in (); } FT_Naming::NamingManager_ptr -LB_server::naming_manager (void) +LB_server::naming_manager () { return this->naming_manager_.in (); } @@ -94,7 +94,7 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[]) } int -LB_server::start_orb_and_poa (void) +LB_server::start_orb_and_poa () { try { diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h index be73d008cc6..5b5ac84259c 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/LB_server.h @@ -39,10 +39,10 @@ public: LB_server (int argc, ACE_TCHAR **argv); /// destroys NamingManager, ORB and POA. - int destroy (void); + int destroy (); /// start the ORB. - int start_orb_and_poa (void); + int start_orb_and_poa (); /// Get the NamingManager Interface. int init (int argc, ACE_TCHAR **argv); @@ -63,13 +63,13 @@ public: TAO_Naming_Client& name_svc (); /// for servants to register to the initialised ORB. - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); /// for servants to get the reference for object_group. - CORBA::Object_ptr object_group (void); + CORBA::Object_ptr object_group (); /// for servants to get the reference for object_group. - FT_Naming::NamingManager_ptr naming_manager (void); + FT_Naming::NamingManager_ptr naming_manager (); private: int parse_args (int, ACE_TCHAR **); diff --git a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp index dffc347a8ba..de1c62ad434 100644 --- a/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/FaultTolerant/client.cpp @@ -37,7 +37,7 @@ public: My_Test_Object (CORBA::Short id = 0); // Constructor. - ~My_Test_Object (void); + ~My_Test_Object (); // Destructor. // = Interface implementation accessor methods. @@ -45,7 +45,7 @@ public: void id (CORBA::Short id); // Sets id. - CORBA::Short id (void); + CORBA::Short id (); // Gets id. private: @@ -57,12 +57,12 @@ My_Test_Object::My_Test_Object (CORBA::Short id) { } -My_Test_Object::~My_Test_Object (void) +My_Test_Object::~My_Test_Object () { } CORBA::Short -My_Test_Object::id (void) +My_Test_Object::id () { return id_; } diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp index 4efc517a981..0ce11d8abb5 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.cpp @@ -7,13 +7,13 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (void) +Hello::get_string () { return CORBA::string_dup ("Hello there!"); } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h +++ b/TAO/orbsvcs/tests/FT_Naming/Federation/Hello.h @@ -14,9 +14,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void); + virtual char * get_string (); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp index 1270f07d131..d96026330f0 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.cpp @@ -14,13 +14,13 @@ Basic::Basic (CORBA::Object_ptr object_group, } char * -Basic::get_string (void) +Basic::get_string () { return CORBA::string_dup (this->location_.in ()); } void -Basic::remove_member (void) +Basic::remove_member () { try { @@ -53,7 +53,7 @@ Basic::remove_member (void) void -Basic::shutdown (void) +Basic::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h index cb4984a2b90..4ee1db473a8 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h +++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/Basic.h @@ -24,11 +24,11 @@ public: CORBA::ORB_ptr orb, const char *loc); - virtual char * get_string (void); + virtual char * get_string (); - virtual void shutdown (void); + virtual void shutdown (); - virtual void remove_member (void); + virtual void remove_member (); private: const char* object_group_name_; diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp index a05c3ae676d..ed8a69d0724 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.cpp @@ -12,7 +12,7 @@ LB_server::LB_server (int argc, ACE_TCHAR **argv) } int -LB_server::destroy (void) +LB_server::destroy () { try { @@ -32,19 +32,19 @@ LB_server::destroy (void) } CORBA::ORB_ptr -LB_server::orb (void) +LB_server::orb () { return this->orb_.in (); } CORBA::Object_ptr -LB_server::object_group (void) +LB_server::object_group () { return this->object_group_.in (); } FT_Naming::NamingManager_ptr -LB_server::naming_manager (void) +LB_server::naming_manager () { return this->naming_manager_.in (); } @@ -93,7 +93,7 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[]) } int -LB_server::start_orb_and_poa (void) +LB_server::start_orb_and_poa () { try { @@ -145,7 +145,7 @@ LB_server::start_orb_and_poa (void) } int -LB_server::create_object_group (void) +LB_server::create_object_group () { try { diff --git a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.h b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.h index 125072fcc40..046cf5c9d8d 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.h +++ b/TAO/orbsvcs/tests/FT_Naming/Load_Balancing/LB_server.h @@ -39,16 +39,16 @@ public: LB_server (int argc, ACE_TCHAR **argv); /// destroys NamingManager, ORB and POA. - int destroy (void); + int destroy (); /// start the ORB. - int start_orb_and_poa (void); + int start_orb_and_poa (); /// Get the NamingManager Interface. int init (int argc, ACE_TCHAR **argv); /// Create the Object Group using the Load Manager Reference. - int create_object_group (void); + int create_object_group (); /// register the servants with the object group. int register_servant (Basic *servant, const char *loc); @@ -57,13 +57,13 @@ public: TAO_Naming_Client& name_svc (); /// for servants to register to the initialised ORB. - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); /// for servants to get the reference for object_group. - CORBA::Object_ptr object_group (void); + CORBA::Object_ptr object_group (); /// for servants to get the reference for object_group. - FT_Naming::NamingManager_ptr naming_manager (void); + FT_Naming::NamingManager_ptr naming_manager (); private: int parse_args (int, ACE_TCHAR **); diff --git a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp index 036456550b7..0807eb0c6c5 100644 --- a/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/Replication/client.cpp @@ -27,7 +27,7 @@ public: My_Test_Object (CORBA::Short id = 0); // Constructor. - ~My_Test_Object (void); + ~My_Test_Object (); // Destructor. // = Interface implementation accessor methods. @@ -35,7 +35,7 @@ public: void id (CORBA::Short id); // Sets id. - CORBA::Short id (void); + CORBA::Short id (); // Gets id. private: @@ -47,12 +47,12 @@ My_Test_Object::My_Test_Object (CORBA::Short id) { } -My_Test_Object::~My_Test_Object (void) +My_Test_Object::~My_Test_Object () { } CORBA::Short -My_Test_Object::id (void) +My_Test_Object::id () { return id_; } diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp index 1270f07d131..d96026330f0 100644 --- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.cpp @@ -14,13 +14,13 @@ Basic::Basic (CORBA::Object_ptr object_group, } char * -Basic::get_string (void) +Basic::get_string () { return CORBA::string_dup (this->location_.in ()); } void -Basic::remove_member (void) +Basic::remove_member () { try { @@ -53,7 +53,7 @@ Basic::remove_member (void) void -Basic::shutdown (void) +Basic::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.h b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.h index 61554fac305..85c41d3a84f 100644 --- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.h +++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/Basic.h @@ -26,11 +26,11 @@ public: CORBA::ORB_ptr orb, const char *loc); - virtual char * get_string (void); + virtual char * get_string (); - virtual void shutdown (void); + virtual void shutdown (); - virtual void remove_member (void); + virtual void remove_member (); private: const char* object_group_name_; diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp index ca0b3a3b68e..cb19e6133e2 100644 --- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.cpp @@ -12,7 +12,7 @@ LB_server::LB_server (int argc, ACE_TCHAR **argv) } int -LB_server::destroy (void) +LB_server::destroy () { try { @@ -30,19 +30,19 @@ LB_server::destroy (void) } CORBA::ORB_ptr -LB_server::orb (void) +LB_server::orb () { return this->orb_.in (); } CORBA::Object_ptr -LB_server::object_group (void) +LB_server::object_group () { return this->object_group_.in (); } FT_Naming::NamingManager_ptr -LB_server::naming_manager (void) +LB_server::naming_manager () { return this->naming_manager_.in (); } @@ -91,7 +91,7 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[]) } int -LB_server::start_orb_and_poa (void) +LB_server::start_orb_and_poa () { try { @@ -143,7 +143,7 @@ LB_server::start_orb_and_poa (void) } int -LB_server::create_object_group (void) +LB_server::create_object_group () { try { diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.h b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.h index 125072fcc40..046cf5c9d8d 100644 --- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.h +++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/LB_server.h @@ -39,16 +39,16 @@ public: LB_server (int argc, ACE_TCHAR **argv); /// destroys NamingManager, ORB and POA. - int destroy (void); + int destroy (); /// start the ORB. - int start_orb_and_poa (void); + int start_orb_and_poa (); /// Get the NamingManager Interface. int init (int argc, ACE_TCHAR **argv); /// Create the Object Group using the Load Manager Reference. - int create_object_group (void); + int create_object_group (); /// register the servants with the object group. int register_servant (Basic *servant, const char *loc); @@ -57,13 +57,13 @@ public: TAO_Naming_Client& name_svc (); /// for servants to register to the initialised ORB. - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); /// for servants to get the reference for object_group. - CORBA::Object_ptr object_group (void); + CORBA::Object_ptr object_group (); /// for servants to get the reference for object_group. - FT_Naming::NamingManager_ptr naming_manager (void); + FT_Naming::NamingManager_ptr naming_manager (); private: int parse_args (int, ACE_TCHAR **); diff --git a/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp index b589a527aaf..f6090ac3d13 100644 --- a/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp +++ b/TAO/orbsvcs/tests/FT_Naming/stress_storable/client.cpp @@ -31,7 +31,7 @@ public: return 0; } - int svc (void) + int svc () { for (int g = 0, i = 0; i < 100; i++) { diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp index ab461eda26e..4472202635c 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.cpp @@ -6,7 +6,7 @@ #include "Server_Request_Interceptor.h" -Server_ORBInitializer::Server_ORBInitializer (void) +Server_ORBInitializer::Server_ORBInitializer () : server_interceptor_ () { } @@ -37,7 +37,7 @@ Server_ORBInitializer::post_init ( } PortableInterceptor::ServerRequestInterceptor_ptr -Server_ORBInitializer::server_interceptor (void) +Server_ORBInitializer::server_interceptor () { return PortableInterceptor::ServerRequestInterceptor::_duplicate ( diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h index 725f58fbc41..6bec1a8ad31 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_ORBInitializer.h @@ -43,7 +43,7 @@ class Server_ORBInitializer : { public: /// Constructor. - Server_ORBInitializer (void); + Server_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); @@ -51,7 +51,7 @@ public: /// Return the created server request interceptor. Only valid after /// post_init(), i.e. ORB_init(), has been called. - PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor (void); + PortableInterceptor::ServerRequestInterceptor_ptr server_interceptor (); private: /// Pointer to the server request interceptor. ORB is responsible diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp index 2ad6b91f3b9..0d0b4d96e00 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp @@ -8,7 +8,7 @@ static const CORBA::ULong expected_version = 5; -Server_Request_Interceptor::Server_Request_Interceptor (void) +Server_Request_Interceptor::Server_Request_Interceptor () : request_count_ (0) , forward_request_thrown_ (false) { @@ -16,7 +16,7 @@ Server_Request_Interceptor::Server_Request_Interceptor (void) this->obj_[1] = CORBA::Object::_nil (); } -Server_Request_Interceptor::~Server_Request_Interceptor (void) +Server_Request_Interceptor::~Server_Request_Interceptor () { } @@ -55,13 +55,13 @@ Server_Request_Interceptor::forward_references ( } char * -Server_Request_Interceptor::name (void) +Server_Request_Interceptor::name () { return CORBA::string_dup ("Server_Request_Interceptor"); } void -Server_Request_Interceptor::destroy (void) +Server_Request_Interceptor::destroy () { CORBA::release (this->obj_[0]); CORBA::release (this->obj_[1]); diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h index 403a2cba25a..050308b2b5b 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h @@ -39,10 +39,10 @@ class Server_Request_Interceptor { public: /// Constructor. - Server_Request_Interceptor (void); + Server_Request_Interceptor (); /// Destructor. - ~Server_Request_Interceptor (void); + ~Server_Request_Interceptor (); /// Set the references to which requests will be forwarded. virtual void forward_references (CORBA::Object_ptr obj1, @@ -62,9 +62,9 @@ public: */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr ri); diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp index 74f41eb6ccf..e86eaeb1744 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.cpp @@ -8,18 +8,18 @@ test_i::test_i (CORBA::Short num, { } -test_i::~test_i (void) +test_i::~test_i () { } CORBA::Short -test_i::number (void) +test_i::number () { return this->number_; } void -test_i::shutdown (void) +test_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "Server is shutting down via object %d.\n", diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h index abfc96d7ae0..d4e4dd92a2c 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h +++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test_i.h @@ -27,13 +27,13 @@ public: CORBA::ORB_ptr orb); /// Destructor. - ~test_i (void); + ~test_i (); /// Return the number assigned to this object. - virtual CORBA::Short number (void); + virtual CORBA::Short number (); /// Shutdown the ORB. - virtual void shutdown (void); + virtual void shutdown (); private: /// The number assigned to this object. diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h index fcd636e7b95..1507c02fe2a 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h @@ -28,7 +28,7 @@ public: Client_i (CORBA::ORB_ptr orb); /// Initialize the ORB etc. - void init (void); + void init (); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp index a042e02b820..edf57e5b4f4 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp @@ -113,7 +113,7 @@ Manager::init (int argc, ACE_TCHAR *argv[]) } int -Manager::make_merged_iors (void) +Manager::make_merged_iors () { // First server this->object_primary_ = @@ -146,7 +146,7 @@ Manager::make_merged_iors (void) } int -Manager::set_properties (void) +Manager::set_properties () { FT::TagFTGroupTaggedComponent ft_tag_component; @@ -188,7 +188,7 @@ Manager::set_properties (void) } int -Manager::run (void) +Manager::run () { try { @@ -205,7 +205,7 @@ Manager::run (void) } int -Manager::write_to_file (void) +Manager::write_to_file () { // CORBA::String_var iorref = @@ -227,7 +227,7 @@ Manager::write_to_file (void) } CORBA::ORB_ptr -Manager::orb (void) +Manager::orb () { return this->orb_.in (); } @@ -241,7 +241,7 @@ void run_test (Simple_Server_ptr server); void -Client_i::init (void) +Client_i::init () { // Open the file for reading. ACE_HANDLE f_handle = ACE_OS::open (ior_output_file, diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h index 3b63ccdb070..23097145d5f 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.h @@ -30,19 +30,19 @@ public: // Initialize the ORB, POA etc. /// Merges the different IORS - int make_merged_iors (void); + int make_merged_iors (); /// Sets the properties for the profiles - int set_properties (void); + int set_properties (); /// Run the ORB event loop.. - int run (void); + int run (); /// Write the merged IOR to a file - int write_to_file (void); + int write_to_file (); /// Return the pointer to the copy of our ORB - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); private: CORBA::Object_var object_primary_; CORBA::Object_var object_secondary_; diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp index d401dee65a5..0fb9f72b9fb 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp @@ -9,13 +9,13 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) { } -Simple_Server_i::Simple_Server_i (void) +Simple_Server_i::Simple_Server_i () : orb_ (0) { } void -Simple_Server_i::remote_call (void) +Simple_Server_i::remote_call () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Print out from process id (%P) hosting the servant\n"))); @@ -25,7 +25,7 @@ Simple_Server_i::remote_call (void) void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h index c916e886919..56901f7b06d 100644 --- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h +++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h @@ -27,12 +27,12 @@ public: Simple_Server_i (CORBA::ORB_ptr orb); /// ctor - Simple_Server_i (void); + Simple_Server_i (); // = The Simple_Server methods. - void remote_call (void); + void remote_call (); - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp index ae7c9760e53..341da48a700 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushConsumer.cpp @@ -25,7 +25,7 @@ PushConsumer_impl::push (const RtecEventComm::EventSet & event) void -PushConsumer_impl::disconnect_push_consumer (void) +PushConsumer_impl::disconnect_push_consumer () { PortableServer::Current_var current = resolve_init<PortableServer::Current>(orb_.in(), "POACurrent"); diff --git a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp index 0bcf5bc7894..62cb9c47e68 100644 --- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.cpp @@ -8,7 +8,7 @@ #include "orbsvcs/FtRtEvent/Utils/resolve_init.h" int -PushSupplier_impl::ReactorTask::svc (void) +PushSupplier_impl::ReactorTask::svc () { ACE_DEBUG((LM_DEBUG, "Reactor Thread started\n")); ACE_Reactor reactor (new ACE_Select_Reactor) ; diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp index 14ec5f69e5d..96b34e5cb61 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp @@ -35,7 +35,7 @@ ACE_Test_Output *ACE_Test_Output::instance_ = 0; -ACE_Test_Output::ACE_Test_Output (void) +ACE_Test_Output::ACE_Test_Output () : output_file_ (0) { #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) @@ -43,7 +43,7 @@ ACE_Test_Output::ACE_Test_Output (void) #endif /* ACE_LACKS_IOSTREAM_TOTALLY */ } -ACE_Test_Output::~ACE_Test_Output (void) +ACE_Test_Output::~ACE_Test_Output () { #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) ACE_LOG_MSG->msg_ostream (&cerr); @@ -58,7 +58,7 @@ ACE_Test_Output::~ACE_Test_Output (void) } OFSTREAM * -ACE_Test_Output::output_file (void) +ACE_Test_Output::output_file () { return this->output_file_; } @@ -154,7 +154,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) } void -ACE_Test_Output::close (void) +ACE_Test_Output::close () { #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) this->output_file_->flush (); @@ -186,19 +186,19 @@ ACE_Test_Output::instance () } const ACE_TCHAR * -ACE_Test_Output::dll_name (void) +ACE_Test_Output::dll_name () { return ACE_TEXT ("Test_Output"); } const ACE_TCHAR * -ACE_Test_Output::name (void) +ACE_Test_Output::name () { return ACE_TEXT ("ACE_Test_Output"); } void -ACE_Test_Output::close_singleton (void) +ACE_Test_Output::close_singleton () { delete ACE_Test_Output::instance_; ACE_Test_Output::instance_ = 0; diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp index b10ab7bc453..408b93022a5 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.cpp @@ -47,14 +47,14 @@ AMI_Test_i::foo (CORBA::Long_out out_l, void -AMI_Test_i::shutdown (void) +AMI_Test_i::shutdown () { this->orb_->shutdown (false); } CORBA::Long -AMI_Test_i::yadda (void) +AMI_Test_i::yadda () { ACE_DEBUG ((LM_DEBUG, "%N:%l:(%P:%t):AMI_Test_i::(get_)yadda\n")); diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h index 68eca82c1d7..4e4947176dc 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h +++ b/TAO/orbsvcs/tests/HTIOP/AMI/ami_test_i.h @@ -31,9 +31,9 @@ public: CORBA::Long in_l, const char* in_str); - void shutdown (void); + void shutdown (); - CORBA::Long yadda (void); + CORBA::Long yadda (); void yadda (CORBA::Long yadda); diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp index c824b918e68..35c4f4213e6 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp @@ -134,7 +134,7 @@ public: "Callback method <get_yadda_excep> called:\n")); }; - void set_yadda (void) + void set_yadda () { ACE_DEBUG ((LM_DEBUG, "Callback method <set_yadda> called:\n")); @@ -268,7 +268,7 @@ Client::Client (A::AMI_Test_ptr server, } int -Client::svc (void) +Client::svc () { try { diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp index 1f516996caa..99fb12bc762 100644 --- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp @@ -118,7 +118,7 @@ public: "Callback method <get_yadda_excep> called:\n")); }; - void set_yadda (void) + void set_yadda () { ACE_DEBUG ((LM_DEBUG, "Callback method <set_yadda> called:\n")); diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp index 14ec5f69e5d..96b34e5cb61 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp @@ -35,7 +35,7 @@ ACE_Test_Output *ACE_Test_Output::instance_ = 0; -ACE_Test_Output::ACE_Test_Output (void) +ACE_Test_Output::ACE_Test_Output () : output_file_ (0) { #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) @@ -43,7 +43,7 @@ ACE_Test_Output::ACE_Test_Output (void) #endif /* ACE_LACKS_IOSTREAM_TOTALLY */ } -ACE_Test_Output::~ACE_Test_Output (void) +ACE_Test_Output::~ACE_Test_Output () { #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) ACE_LOG_MSG->msg_ostream (&cerr); @@ -58,7 +58,7 @@ ACE_Test_Output::~ACE_Test_Output (void) } OFSTREAM * -ACE_Test_Output::output_file (void) +ACE_Test_Output::output_file () { return this->output_file_; } @@ -154,7 +154,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) } void -ACE_Test_Output::close (void) +ACE_Test_Output::close () { #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) this->output_file_->flush (); @@ -186,19 +186,19 @@ ACE_Test_Output::instance () } const ACE_TCHAR * -ACE_Test_Output::dll_name (void) +ACE_Test_Output::dll_name () { return ACE_TEXT ("Test_Output"); } const ACE_TCHAR * -ACE_Test_Output::name (void) +ACE_Test_Output::name () { return ACE_TEXT ("ACE_Test_Output"); } void -ACE_Test_Output::close_singleton (void) +ACE_Test_Output::close_singleton () { delete ACE_Test_Output::instance_; ACE_Test_Output::instance_ = 0; diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp index 59accd8e387..4d25836c6c1 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp @@ -6,7 +6,7 @@ const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); -void do_nothing (void) +void do_nothing () { } diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp index 1c26209df03..3bf577a904a 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.cpp @@ -11,14 +11,14 @@ void -Callback_i::shutdown (void) +Callback_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); this->orb_->shutdown (false); } void -Callback_i::callback_method (void) +Callback_i::callback_method () { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Callback method called\n")); @@ -48,7 +48,7 @@ Simple_Server_i::callback_object (Callback_ptr callback } int -Simple_Server_i::call_client (void) +Simple_Server_i::call_client () { if (this->flag_) { @@ -78,7 +78,7 @@ Simple_Server_i::call_client (void) void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h index f7a40ffbf10..8444d669abe 100644 --- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h +++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/test_i.h @@ -28,10 +28,10 @@ public: Callback_i (CORBA::ORB_ptr orb); /// Safe way to shutdown - void shutdown (void); + void shutdown (); /// The callback method - void callback_method (void); + void callback_method (); private: /// The orb @@ -56,9 +56,9 @@ public: void callback_object (Callback_ptr callback); - void shutdown (void); + void shutdown (); - int call_client (void); + int call_client (); private: /// The ORB diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp index 731abb310fe..0583dea775e 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.cpp @@ -7,14 +7,14 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (void) +Hello::get_string () { ACE_DEBUG ((LM_DEBUG, "in get_string\n")); return CORBA::string_dup ("Hello there!"); } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); ACE_DEBUG ((LM_DEBUG,"in shutdown\n")); diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h index 2d7cfb2e5e0..09da0fd735c 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h +++ b/TAO/orbsvcs/tests/HTIOP/Hello/Hello.h @@ -19,9 +19,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void); + virtual char * get_string (); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp index 14ec5f69e5d..96b34e5cb61 100644 --- a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp +++ b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp @@ -35,7 +35,7 @@ ACE_Test_Output *ACE_Test_Output::instance_ = 0; -ACE_Test_Output::ACE_Test_Output (void) +ACE_Test_Output::ACE_Test_Output () : output_file_ (0) { #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) @@ -43,7 +43,7 @@ ACE_Test_Output::ACE_Test_Output (void) #endif /* ACE_LACKS_IOSTREAM_TOTALLY */ } -ACE_Test_Output::~ACE_Test_Output (void) +ACE_Test_Output::~ACE_Test_Output () { #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) ACE_LOG_MSG->msg_ostream (&cerr); @@ -58,7 +58,7 @@ ACE_Test_Output::~ACE_Test_Output (void) } OFSTREAM * -ACE_Test_Output::output_file (void) +ACE_Test_Output::output_file () { return this->output_file_; } @@ -154,7 +154,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append) } void -ACE_Test_Output::close (void) +ACE_Test_Output::close () { #if !defined (ACE_LACKS_IOSTREAM_TOTALLY) this->output_file_->flush (); @@ -186,19 +186,19 @@ ACE_Test_Output::instance () } const ACE_TCHAR * -ACE_Test_Output::dll_name (void) +ACE_Test_Output::dll_name () { return ACE_TEXT ("Test_Output"); } const ACE_TCHAR * -ACE_Test_Output::name (void) +ACE_Test_Output::name () { return ACE_TEXT ("ACE_Test_Output"); } void -ACE_Test_Output::close_singleton (void) +ACE_Test_Output::close_singleton () { delete ACE_Test_Output::instance_; ACE_Test_Output::instance_ = 0; diff --git a/TAO/orbsvcs/tests/HTIOP/test_config.h b/TAO/orbsvcs/tests/HTIOP/test_config.h index d44559b8963..010fff62047 100644 --- a/TAO/orbsvcs/tests/HTIOP/test_config.h +++ b/TAO/orbsvcs/tests/HTIOP/test_config.h @@ -150,15 +150,15 @@ size_t const ACE_MAX_THREADS = 4; class ACE_Test_Output { public: - ACE_Test_Output (void); - ~ACE_Test_Output (void); - static ACE_Test_Output *instance (void); + ACE_Test_Output (); + ~ACE_Test_Output (); + static ACE_Test_Output *instance (); int set_output (const ACE_TCHAR *filename, int append = 0); - OFSTREAM *output_file (void); - void close (void); - const ACE_TCHAR *dll_name (void); - const ACE_TCHAR *name (void); - static void close_singleton (void); + OFSTREAM *output_file (); + void close (); + const ACE_TCHAR *dll_name (); + const ACE_TCHAR *name (); + static void close_singleton (); private: static ACE_Test_Output *instance_; diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp index 364b5a4c409..c0b21e9e150 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp @@ -1,12 +1,12 @@ #include "MCast_Server_i.h" -MCast_Server_i::MCast_Server_i (void) +MCast_Server_i::MCast_Server_i () { //Constructor. } CORBA::Boolean -MCast_Server_i::connect_server (void) +MCast_Server_i::connect_server () { return 0; } diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h index 231b7154fee..a0f009f4ea3 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h +++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h @@ -9,7 +9,7 @@ public: // Simple method just to see that the client contacted the // server. If does contact, a '0' is returned. - CORBA::Boolean connect_server (void); + CORBA::Boolean connect_server (); }; #endif /* MCAST_SERVER_I_H */ diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp index c8a5cdb19f3..61976741c9a 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp @@ -2,12 +2,12 @@ #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" -ior_mcast_Client_i::ior_mcast_Client_i (void) +ior_mcast_Client_i::ior_mcast_Client_i () { // Constructor } -ior_mcast_Client_i::~ior_mcast_Client_i (void) +ior_mcast_Client_i::~ior_mcast_Client_i () { } diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h index 129dd3d0354..53eb659812e 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h +++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.h @@ -16,10 +16,10 @@ class ior_mcast_Client_i public: // = COnstructor and destructor. - ior_mcast_Client_i (void); - ~ior_mcast_Client_i (void); + ior_mcast_Client_i (); + ~ior_mcast_Client_i (); - int run (void); + int run (); // Execute the client example code. int init (int& argc, ACE_TCHAR *argv[]); diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp index fe851c004e9..96e0f2cda8a 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp +++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp @@ -10,7 +10,7 @@ #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" -Server_i::Server_i (void) +Server_i::Server_i () : argc_ (0), argv_ (0), orb_ (), @@ -20,7 +20,7 @@ Server_i::Server_i (void) { } -Server_i::~Server_i (void) +Server_i::~Server_i () { delete this->ior_multicast_; } diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.h b/TAO/orbsvcs/tests/IOR_MCast/server_i.h index b7e381a6189..09f58c7b721 100644 --- a/TAO/orbsvcs/tests/IOR_MCast/server_i.h +++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.h @@ -14,8 +14,8 @@ class Server_i public: // = Constructor and destructor. - Server_i (void); - ~Server_i (void); + Server_i (); + ~Server_i (); int init (int &argc, ACE_TCHAR **argv); // Initialize the server multicast. diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp index 6ef8f1f9542..d6c91c8e1a2 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.cpp @@ -9,20 +9,20 @@ Test_i::Test_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate(orb)) } CORBA::Short -Test_i::get_server_num (void) +Test_i::get_server_num () { return 1; } void -Test_i::terminate (void) +Test_i::terminate () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server received terminate and going to exit\n")); exit (0); } void -Test_i::shutdown (void) +Test_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server received shutdown and going to exit\n")); orb_->shutdown (); diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h index 65826facc02..558200f8429 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/Test_i.h @@ -13,11 +13,11 @@ class Test_i : public virtual POA_Test { public: Test_i (CORBA::ORB_ptr orb); - virtual CORBA::Short get_server_num (void); + virtual CORBA::Short get_server_num (); - virtual void terminate (void); + virtual void terminate (); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; }; diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp index 45a56ca1902..d07865512f6 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_4152_Regression/server.cpp @@ -16,7 +16,7 @@ class ORB_Runner : public ACE_Task_Base { public: explicit ORB_Runner (CORBA::ORB_ptr orb) : orb_(CORBA::ORB::_duplicate(orb)) {} - int svc (void) + int svc () { this->orb_->run (); return 0; @@ -49,7 +49,7 @@ createPOAs(ACE_CString &base) } void -activatePOAs (void) +activatePOAs () { PortableServer::POAManager_var mgr = root_poa->the_POAManager (); mgr->activate (); diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp index 7ac20a171bc..126f3aa8207 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.cpp @@ -5,16 +5,16 @@ bug_689_regression_i::bug_689_regression_i (CORBA::ORB_ptr orb) { } -bug_689_regression_i::~bug_689_regression_i (void) +bug_689_regression_i::~bug_689_regression_i () { } void -bug_689_regression_i::shutdown (void) +bug_689_regression_i::shutdown () { this->orb_->shutdown (false); } -void bug_689_regression_i::noop (void) +void bug_689_regression_i::noop () { } diff --git a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h index 700e4bac6d3..a03bbf4ae0c 100644 --- a/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/Bug_689_Regression/bug_689_regression_i.h @@ -7,11 +7,11 @@ class bug_689_regression_i: public POA_bug_689_regression { public: bug_689_regression_i (CORBA::ORB_ptr orb); - ~bug_689_regression_i (void); + ~bug_689_regression_i (); - virtual void shutdown (void); + virtual void shutdown (); - virtual void noop (void); + virtual void noop (); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp index 82931fecd4a..01466a89e1a 100644 --- a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.cpp @@ -21,14 +21,14 @@ public: { } - virtual CORBA::Long get (void) + virtual CORBA::Long get () { ++n_; return n_; } }; -Server_i::Server_i (void) +Server_i::Server_i () : server_name_() , second_name_() { @@ -157,7 +157,7 @@ Server_i::init (int argc, ACE_TCHAR** argv) } int -Server_i::run (void) +Server_i::run () { try { diff --git a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.h b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.h index 8f1b13af35b..52f0b223f14 100644 --- a/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/MT_stress/server_i.h @@ -11,12 +11,12 @@ class Server_i { public: - Server_i (void); - ~Server_i (void); + Server_i (); + ~Server_i (); int init (int argc, ACE_TCHAR **argv); - int run (void); + int run (); private: int parse_args (int argc, ACE_TCHAR* argv[]); diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp index 3fa4c48d90d..f745ab49a69 100644 --- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Client.cpp @@ -17,7 +17,7 @@ PortableInterceptor::Current_var pic; PortableInterceptor::SlotId slot_id; const IOP::ServiceId service_id = 0xdeadbeef; -int get_offset (void) +int get_offset () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, mon, ofs_lock, 0); int r = ofs; @@ -33,7 +33,7 @@ public: Worker (Messenger_ptr m) : messenger(Messenger::_duplicate (m)) {} - int svc (void) + int svc () { int offset = get_offset (); CORBA::String_var message = CORBA::string_dup( "Hello!" ); @@ -74,12 +74,12 @@ class Client_Req_Int public virtual ::CORBA::LocalObject { public: - virtual char * name (void) + virtual char * name () { return CORBA::string_dup ("Client_Req_Int"); } - virtual void destroy (void) + virtual void destroy () { } diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.cpp index c1a7320f7d7..016356a7212 100644 --- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.cpp @@ -18,7 +18,7 @@ Test_i::Test_i (Terminator &terminator) } // Implementation skeleton destructor -Test_i::~Test_i (void) +Test_i::~Test_i () { } diff --git a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.h index c84ce4087c6..95366a3b870 100644 --- a/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/PICurrent/Test_i.h @@ -19,7 +19,7 @@ public: Test_i (Terminator &terminator); //Destructor - virtual ~Test_i (void); + virtual ~Test_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp index d8074e356af..0f72129c222 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/ORB_Task.cpp @@ -12,7 +12,7 @@ ORB_Task::ORB_Task (CORBA::ORB_ptr orb) } int -ORB_Task::svc (void) +ORB_Task::svc () { try { diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp index 147819b1617..60d7cf51eb5 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/client.cpp @@ -18,7 +18,7 @@ class Client_Task : public ACE_Task_Base caught_object_not_exist_ (false) {} - virtual int svc (void) + virtual int svc () { ACE_Time_Value start = ACE_OS::gettimeofday (); ACE_Time_Value elapsed; diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp index 6a76a9bc053..90f4fe3953e 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.cpp @@ -2,37 +2,37 @@ #include "ace/OS_NS_time.h" // Implementation skeleton constructor -Test_Dummy_i::Test_Dummy_i (void) +Test_Dummy_i::Test_Dummy_i () { } // Implementation skeleton destructor -Test_Dummy_i::~Test_Dummy_i (void) +Test_Dummy_i::~Test_Dummy_i () { } -char * Test_Dummy_i::getMessage (void) +char * Test_Dummy_i::getMessage () { // Add your implementation here return CORBA::string_dup("Test::Dummy---->Hello World"); } -Test_Time_i::Test_Time_i (void) +Test_Time_i::Test_Time_i () { } // Implementation skeleton destructor -Test_Time_i::~Test_Time_i (void) +Test_Time_i::~Test_Time_i () { } -::CORBA::Long Test_Time_i::current_time (void) +::CORBA::Long Test_Time_i::current_time () { ACE_DEBUG ((LM_DEBUG, "(%P|%t)Test_Time_i::current_time called\n")); return CORBA::Long (ACE_OS::time (0)); } -void Test_Time_i::shutdown (void) +void Test_Time_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "%C\n", diff --git a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h index 536c7fe81a8..96ac6c0c134 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/ReconnectServer/test_i.h @@ -12,12 +12,12 @@ class Test_Dummy_i { public: // Constructor - Test_Dummy_i (void); + Test_Dummy_i (); // Destructor - virtual ~Test_Dummy_i (void); + virtual ~Test_Dummy_i (); - virtual char * getMessage (void); + virtual char * getMessage (); }; class Test_Time_i @@ -25,14 +25,14 @@ class Test_Time_i { public: // Constructor - Test_Time_i (void); + Test_Time_i (); // Destructor - virtual ~Test_Time_i (void); + virtual ~Test_Time_i (); - virtual ::CORBA::Long current_time (void); + virtual ::CORBA::Long current_time (); - virtual void shutdown (void); + virtual void shutdown (); }; #endif /* IMR_RECONNECTSERVER_H */ diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp index adc92c4336a..e07dd513d64 100644 --- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.cpp @@ -2,37 +2,37 @@ #include "ace/OS_NS_time.h" // Implementation skeleton constructor -Test_Dummy_i::Test_Dummy_i (void) +Test_Dummy_i::Test_Dummy_i () { } // Implementation skeleton destructor -Test_Dummy_i::~Test_Dummy_i (void) +Test_Dummy_i::~Test_Dummy_i () { } -char * Test_Dummy_i::getMessage (void) +char * Test_Dummy_i::getMessage () { // Add your implementation here return CORBA::string_dup("Test::Dummy---->Hello World"); } -Test_Time_i::Test_Time_i (void) +Test_Time_i::Test_Time_i () { } // Implementation skeleton destructor -Test_Time_i::~Test_Time_i (void) +Test_Time_i::~Test_Time_i () { } -::CORBA::Long Test_Time_i::current_time (void) +::CORBA::Long Test_Time_i::current_time () { ACE_DEBUG ((LM_DEBUG, "(%P|%t)Test_Time_i::current_time called\n")); return CORBA::Long (ACE_OS::time (0)); } -void Test_Time_i::shutdown (void) +void Test_Time_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "%s\n", diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h index 53cef409396..30f78bed6e1 100644 --- a/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/RestartIMR/test_i.h @@ -13,12 +13,12 @@ class Test_Dummy_i { public: // Constructor - Test_Dummy_i (void); + Test_Dummy_i (); // Destructor - virtual ~Test_Dummy_i (void); + virtual ~Test_Dummy_i (); - virtual char * getMessage (void); + virtual char * getMessage (); }; class Test_Time_i @@ -26,14 +26,14 @@ class Test_Time_i { public: // Constructor - Test_Time_i (void); + Test_Time_i (); // Destructor - virtual ~Test_Time_i (void); + virtual ~Test_Time_i (); - virtual ::CORBA::Long current_time (void); + virtual ::CORBA::Long current_time (); - virtual void shutdown (void); + virtual void shutdown (); }; diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp index cbbdf490f3e..0dd19725ef2 100644 --- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.cpp @@ -21,7 +21,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb, Terminator &terminator) } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } @@ -47,7 +47,7 @@ Messenger_i::abort (CORBA::Short delay_secs) } void -Messenger_i::shutdown (void) +Messenger_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h index b9735f7c344..a27199fc3a3 100644 --- a/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/RestartServer/Messenger_i.h @@ -19,7 +19,7 @@ public: Messenger_i (CORBA::ORB_ptr orb, Terminator &terminator); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, @@ -28,7 +28,7 @@ public: virtual void abort (CORBA::Short delay_secs); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to shutdown the application. diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp index 1fb635fa185..e9af2b8fcab 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp @@ -6,7 +6,7 @@ // Constructor. -Airplane_Client_i::Airplane_Client_i (void) +Airplane_Client_i::Airplane_Client_i () : argc_ (0), argv_ (0), server_key_ (ACE::strnew (ACE_TEXT("key0"))), @@ -19,7 +19,7 @@ Airplane_Client_i::Airplane_Client_i (void) // Parses the command line arguments and returns an error status. int -Airplane_Client_i::parse_args (void) +Airplane_Client_i::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dn:k:")); int c; @@ -87,7 +87,7 @@ Airplane_Client_i::run () return this->get_planes (this->loop_count_); } -Airplane_Client_i::~Airplane_Client_i (void) +Airplane_Client_i::~Airplane_Client_i () { // Free resources CORBA::release (this->server_); diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h index 38262d362fd..7978e2c9329 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h @@ -29,8 +29,8 @@ class Airplane_Client_i { public: // = Constructor and destructor. - Airplane_Client_i (void); - ~Airplane_Client_i (void); + Airplane_Client_i (); + ~Airplane_Client_i (); /// Execute client example code. int run (); @@ -40,7 +40,7 @@ public: private: /// Parses the arguments passed on the command line. - int parse_args (void); + int parse_args (); /// Ask the Paper Airplane Server for <count> planes. int get_planes (size_t count); diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp index 5a258383764..a624bc710de 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp @@ -13,7 +13,7 @@ Airplane_i::Airplane_i () // Destructor -Airplane_i::~Airplane_i (void) +Airplane_i::~Airplane_i () { // Nothing } @@ -22,7 +22,7 @@ Airplane_i::~Airplane_i (void) // Returns a random plane and page number char * -Airplane_i::get_plane (void) +Airplane_i::get_plane () { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Airplane_i::get_plane\n")); diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h index 7856da64539..aaa7b985bda 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h @@ -42,10 +42,10 @@ public: Airplane_i (); /// Destructor - ~Airplane_i (void); + ~Airplane_i (); /// Returns a random plane. - virtual char *get_plane (void); + virtual char *get_plane (); }; #endif /* AIRPLANE_I_H */ diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp index 30041bb9188..7b76fea438c 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp @@ -14,7 +14,7 @@ // The server name of the Aiprlane Server const char SERVER_NAME[] = "airplane_server"; -Airplane_Server_i::Airplane_Server_i (void) +Airplane_Server_i::Airplane_Server_i () : argc_ (0), argv_ (0), orb_ (), @@ -30,7 +30,7 @@ Airplane_Server_i::Airplane_Server_i (void) } int -Airplane_Server_i::parse_args (void) +Airplane_Server_i::parse_args () { ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:s:p:")); int c; @@ -186,7 +186,7 @@ Airplane_Server_i::init (int argc, ACE_TCHAR** argv) } int -Airplane_Server_i::run (void) +Airplane_Server_i::run () { try { @@ -213,7 +213,7 @@ Airplane_Server_i::run (void) return 0; } -Airplane_Server_i::~Airplane_Server_i (void) +Airplane_Server_i::~Airplane_Server_i () { delete this->server_impl_; } diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h index d3c15ad3e94..d0bca514509 100644 --- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.h @@ -28,20 +28,20 @@ class Airplane_Server_i { public: /// Default constructor - Airplane_Server_i (void); + Airplane_Server_i (); /// Destructor - ~Airplane_Server_i (void); + ~Airplane_Server_i (); /// Initialize the Server state - parsing arguments and waiting int init (int argc, ACE_TCHAR **argv); /// Run the orb - int run (void); + int run (); private: /// Parses the commandline arguments. - int parse_args (void); + int parse_args (); /// Number of command line arguments. int argc_; diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp index dd57ca7633d..d2b1849e3ac 100644 --- a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.cpp @@ -15,13 +15,13 @@ Test_i::~Test_i () } void -Test_i::arm (void) +Test_i::arm () { this->armed_ = true; } void -Test_i::trigger (void) +Test_i::trigger () { if (this->armed_) { diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h index 4012e77da02..bc8e00c029a 100644 --- a/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/double_start/Test_i.h @@ -18,9 +18,9 @@ public: //Destructor virtual ~Test_i (); - virtual void arm (void); + virtual void arm (); - virtual void trigger (void); + virtual void trigger (); int exit_code () const; diff --git a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp index 9112930c37a..64238368882 100644 --- a/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/double_start/client.cpp @@ -78,7 +78,7 @@ set_timeout_policy (CORBA::Object_ptr obj, const ACE_Time_Value& to) } void -do_restart_test (void) +do_restart_test () { CORBA::Object_var obj = orb->string_to_object (ior); ACE_ASSERT (!CORBA::is_nil(obj.in ())); diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp index f21f9e4d9af..b8b27e8c9a6 100644 --- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.cpp @@ -26,7 +26,7 @@ Test_i::~Test_i () } CORBA::Short -Test_i::get_server_num (void) +Test_i::get_server_num () { return this->server_num_; } diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h index c5ba93916d3..c106fa0e3e0 100644 --- a/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/Test_i.h @@ -23,7 +23,7 @@ public: //Destructor virtual ~Test_i (); - virtual CORBA::Short get_server_num (void); + virtual CORBA::Short get_server_num (); private: void reset (PortableServer::POAManager_var &mgr, bool pause); diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp index d460ac4f087..e58eb515e65 100644 --- a/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/kill_server/server.cpp @@ -47,7 +47,7 @@ createPOAs(ACE_CString &base) } void -activatePOAs(void) +activatePOAs() { PortableServer::POAManager_var mgr = root_poa->the_POAManager (); mgr->activate (); diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp index a8f4c8691e3..f80fc476126 100644 --- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.cpp @@ -3,13 +3,13 @@ #include "Test_i.h" CORBA::Short -Test_i::get_server_num (void) +Test_i::get_server_num () { return 1; } void -Test_i::terminate (void) +Test_i::terminate () { exit (0); } diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h index 984bc38669f..b5ae6dc04cf 100644 --- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/Test_i.h @@ -12,9 +12,9 @@ class Test_i : public virtual POA_Test { public: - virtual CORBA::Short get_server_num (void); + virtual CORBA::Short get_server_num (); - virtual void terminate (void); + virtual void terminate (); }; #endif /* TEST_I_H_ */ diff --git a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp index 293ae2579d8..9c2027df62c 100644 --- a/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/kill_slow_server/server.cpp @@ -16,7 +16,7 @@ class ORB_Runner : public ACE_Task_Base { public: ORB_Runner (CORBA::ORB_var orb) : orb_(orb) {} - int svc (void) + int svc () { this->orb_->run (); return 0; @@ -51,7 +51,7 @@ createPOAs(ACE_CString &base) } void -activatePOAs (void) +activatePOAs () { PortableServer::POAManager_var mgr = root_poa->the_POAManager (); mgr->activate (); diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp index 72c61382265..4a44f3048b1 100644 --- a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.cpp @@ -4,7 +4,7 @@ #include "Test_i.h" CORBA::Long -Test_i::server_pid (void) +Test_i::server_pid () { ACE_DEBUG ((LM_DEBUG, "(%P) server pid called\n")); return ACE_OS::getpid (); diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h index 77af1927e0d..58cc9f0a2ec 100644 --- a/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/Test_i.h @@ -12,7 +12,7 @@ class Test_i : public virtual POA_Test { public: - virtual CORBA::Long server_pid (void); + virtual CORBA::Long server_pid (); }; #endif /* TEST_I_H_ */ diff --git a/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp b/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp index 68068af2900..dc946f2142c 100644 --- a/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/link_poas/server.cpp @@ -40,7 +40,7 @@ createPOAs (ACE_CString &base) } void -activatePOAs(void) +activatePOAs() { PortableServer::POAManager_var mgr = root_poa->the_POAManager (); mgr->activate (); diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp index 7269ac7ff9a..35ca8593ce2 100644 --- a/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/client.cpp @@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) } void -do_test (void) +do_test () { CORBA::Object_var obj = orb->string_to_object (ior); Test_var test = Test::_narrow( obj.in () ); diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp index 460050bc9ec..ccd4fe70e9b 100644 --- a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.cpp @@ -3,7 +3,7 @@ #include "test_i.h" #include "ace/Log_Msg.h" -Test_i::Test_i (void) +Test_i::Test_i () { } @@ -12,7 +12,7 @@ Test_i::~Test_i () } void -Test_i::contact (void) +Test_i::contact () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Server contacted\n"))); diff --git a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h index fdf55c85fd1..725882cf677 100644 --- a/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/manual_start/test_i.h @@ -13,12 +13,12 @@ class Test_i : public virtual POA_Test { public: //Constructor - Test_i (void); + Test_i (); //Destructor - virtual ~Test_i (void); + virtual ~Test_i (); - virtual void contact (void); + virtual void contact (); private: }; diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp index b755dbd223c..600d36516af 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp @@ -6,7 +6,7 @@ // Constructor. -Nestea_Client_i::Nestea_Client_i (void) +Nestea_Client_i::Nestea_Client_i () : argc_ (0) , argv_ (0) , server_key_ (ACE::strnew (ACE_TEXT("key0"))) @@ -19,7 +19,7 @@ Nestea_Client_i::Nestea_Client_i (void) // Parses the command line arguments and returns an error status. int -Nestea_Client_i::parse_args (void) +Nestea_Client_i::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dsn:k:")); int c; @@ -83,7 +83,7 @@ Nestea_Client_i::run () return 0; } -Nestea_Client_i::~Nestea_Client_i (void) +Nestea_Client_i::~Nestea_Client_i () { // Free resources CORBA::release (this->server_); diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h index 31c39f7fa7e..589ce0e3290 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.h @@ -29,8 +29,8 @@ class Nestea_Client_i { public: // = Constructor and destructor. - Nestea_Client_i (void); - ~Nestea_Client_i (void); + Nestea_Client_i (); + ~Nestea_Client_i (); /// Execute client example code. int run (); @@ -40,7 +40,7 @@ public: private: /// Parses the arguments passed on the command line. - int parse_args (void); + int parse_args (); /// # of arguments on the command line. int argc_; diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp index bfc07642af8..f2e7dddaf24 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp @@ -22,7 +22,7 @@ Nestea_i::Nestea_i (CORBA::ORB_ptr orb, const ACE_TCHAR *filename) } -Nestea_i::~Nestea_i (void) +Nestea_i::~Nestea_i () { delete [] this->data_filename_; } @@ -62,7 +62,7 @@ Nestea_i::crush (CORBA::Long cans) // Returns the number of cans in the bookshelf. CORBA::Long -Nestea_i::bookshelf_size (void) +Nestea_i::bookshelf_size () { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Nestea_i::bookshelf_size\n")); @@ -73,7 +73,7 @@ Nestea_i::bookshelf_size (void) // Returns comments about your collection. char * -Nestea_i::get_praise (void) +Nestea_i::get_praise () { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Nestea_i::get_praise\n")); @@ -91,7 +91,7 @@ Nestea_i::get_praise (void) } void -Nestea_i::shutdown (void) +Nestea_i::shutdown () { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, "Nestea_i::shutdown\n")); @@ -102,7 +102,7 @@ Nestea_i::shutdown (void) // Saves bookshelf data to a file. int -Nestea_i::save_data (void) +Nestea_i::save_data () { ACE_FILE_IO file; ACE_FILE_Connector connector; @@ -128,7 +128,7 @@ Nestea_i::save_data (void) // Loads bookshelf data from a file. int -Nestea_i::load_data (void) +Nestea_i::load_data () { ACE_FILE_IO file; ACE_FILE_Connector connector; diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h index 3d3dcb1cad5..2c713a6e7d3 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.h @@ -39,7 +39,7 @@ public: Nestea_i (CORBA::ORB_ptr orb, const ACE_TCHAR *filename = ACE_TEXT("nestea.dat")); /// Destructor - virtual ~Nestea_i (void); + virtual ~Nestea_i (); /// Add <cans> number of cans to the bookshelf. virtual void drink (CORBA::Long cans); @@ -48,18 +48,18 @@ public: virtual void crush (CORBA::Long cans); /// Returns the number of cans in the bookshelf. - virtual CORBA::Long bookshelf_size (void); + virtual CORBA::Long bookshelf_size (); /// Returns comments about your collection. - virtual char *get_praise (void); + virtual char *get_praise (); - virtual void shutdown(void); + virtual void shutdown(); private: /// Saves bookshelf data to a file. - int save_data (void); + int save_data (); /// Loads bookshelf data from a file. - int load_data (void); + int load_data (); /// The name of the file to store the data in. ACE_TCHAR *data_filename_; diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp index 5499a7b070d..e53975115f0 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp @@ -31,13 +31,13 @@ Nestea_Server_i::Nestea_Server_i (const char * /*filename*/) // Nothing } -Nestea_Server_i::~Nestea_Server_i (void) +Nestea_Server_i::~Nestea_Server_i () { delete this->server_impl_; } int -Nestea_Server_i::parse_args (void) +Nestea_Server_i::parse_args () { ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:")); int c; @@ -192,7 +192,7 @@ Nestea_Server_i::init (int argc, ACE_TCHAR** argv) } int -Nestea_Server_i::run (void) +Nestea_Server_i::run () { int status = 0; diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h index 523234cfb51..6101c21333a 100644 --- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.h @@ -32,17 +32,17 @@ public: Nestea_Server_i (const char *filename = "nestea.dat"); /// Destructor - ~Nestea_Server_i (void); + ~Nestea_Server_i (); /// Initialize the Server state - parsing arguments and waiting int init (int argc, ACE_TCHAR **argv); /// Run the orb - int run (void); + int run (); private: /// Parses the commandline arguments. - int parse_args (void); + int parse_args (); /// Number of command line arguments. int argc_; diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp index 069f2f15399..ee6d0e6ea32 100644 --- a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.cpp @@ -3,7 +3,7 @@ #include "Test_i.h" #include "ace/OS_NS_unistd.h" -Test_i::Test_i (void) +Test_i::Test_i () : count_ (0) { } @@ -13,14 +13,14 @@ Test_i::~Test_i () } void -Test_i::foo (void) +Test_i::foo () { ACE_DEBUG ((LM_DEBUG,"foo called\n")); ++this->count_; } CORBA::Short -Test_i::get_call_count (void) +Test_i::get_call_count () { CORBA::Short r = this->count_; this->count_ = 0; diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h index 0745ee56fd7..bb117cfc247 100644 --- a/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/oneway/Test_i.h @@ -15,14 +15,14 @@ class Test_i : public virtual POA_Test { public: //Constructor - Test_i (void); + Test_i (); //Destructor virtual ~Test_i (); - virtual void foo (void); + virtual void foo (); - virtual CORBA::Short get_call_count (void); + virtual CORBA::Short get_call_count (); private: CORBA::Short count_; diff --git a/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp b/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp index 954d2d8c587..e62303e7d49 100644 --- a/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/oneway/server.cpp @@ -37,7 +37,7 @@ createPOAs(ACE_CString &base) } void -activatePOAs(void) +activatePOAs() { PortableServer::POAManager_var mgr = root_poa->the_POAManager (); mgr->activate (); diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp index 283eaaf36c0..d8031c07815 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.cpp @@ -11,7 +11,7 @@ Ping_Death_Request_Interceptor::Ping_Death_Request_Interceptor (int *counter) { } -Ping_Death_Request_Interceptor::~Ping_Death_Request_Interceptor (void) +Ping_Death_Request_Interceptor::~Ping_Death_Request_Interceptor () { } @@ -22,13 +22,13 @@ Ping_Death_Request_Interceptor::set_poa (PortableServer::POA_ptr poa) } char * -Ping_Death_Request_Interceptor::name (void) +Ping_Death_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Ping_Death_Request_Interceptor::destroy (void) +Ping_Death_Request_Interceptor::destroy () { } diff --git a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h index 913e58f89c1..9b1644338b2 100644 --- a/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h +++ b/TAO/orbsvcs/tests/ImplRepo/ping_interrupt/server_interceptor.h @@ -31,9 +31,9 @@ public: void set_poa (PortableServer::POA_ptr poa); // Canonical name of the interceptor. - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp index e2b30ccbff4..619b9f46068 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp +++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp @@ -21,7 +21,7 @@ public: } virtual ~test_i () { } - virtual CORBA::Long get (void) + virtual CORBA::Long get () { ++n_; CORBA::Object_var obj = orb_->resolve_initial_references("POACurrent"); @@ -38,7 +38,7 @@ public: // The server name of the Aiprlane Server static const char DEFAULT_SERVER_NAME[] = "TestObject"; -Server_i::Server_i (void) +Server_i::Server_i () : server_name_(DEFAULT_SERVER_NAME) , count_(1) { @@ -163,7 +163,7 @@ Server_i::init (int argc, ACE_TCHAR** argv) } int -Server_i::run (void) +Server_i::run () { try { diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h index 1fbf4d27f2b..e7c6e2f8793 100644 --- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h +++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.h @@ -10,12 +10,12 @@ class Server_i { public: - Server_i (void); - ~Server_i (void); + Server_i (); + ~Server_i (); int init (int argc, ACE_TCHAR **argv); - int run (void); + int run (); private: int parse_args (int argc, ACE_TCHAR* argv[]); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp index dfc404651af..c524f06b15c 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp @@ -2,7 +2,7 @@ #include "ifr_dii_client.h" #include "ace/Get_Opt.h" -IFR_DII_Client::IFR_DII_Client (void) +IFR_DII_Client::IFR_DII_Client () : namespace_name (CORBA::string_dup ("warehouse")), interface_name (CORBA::string_dup ("inventory")), op_name (CORBA::string_dup ("getCDinfo")), @@ -12,7 +12,7 @@ IFR_DII_Client::IFR_DII_Client (void) { } -IFR_DII_Client::~IFR_DII_Client (void) +IFR_DII_Client::~IFR_DII_Client () { } @@ -45,7 +45,7 @@ IFR_DII_Client::init (int argc, } int -IFR_DII_Client::run (void) +IFR_DII_Client::run () { int result = 0; @@ -110,7 +110,7 @@ IFR_DII_Client::parse_args (int argc, ACE_TCHAR *argv[]) } int -IFR_DII_Client::find_interface_def (void) +IFR_DII_Client::find_interface_def () { this->target_def_ = this->target_->_get_interface (); @@ -126,7 +126,7 @@ IFR_DII_Client::find_interface_def (void) } int -IFR_DII_Client::lookup_interface_def (void) +IFR_DII_Client::lookup_interface_def () { CORBA::Object_var obj = this->orb_->resolve_initial_references ("InterfaceRepository"); @@ -197,7 +197,7 @@ IFR_DII_Client::lookup_interface_def (void) } void -IFR_DII_Client::get_operation_def (void) +IFR_DII_Client::get_operation_def () { // What operation(s) does this interface contain? CORBA::ContainedSeq_var operations = @@ -224,7 +224,7 @@ IFR_DII_Client::get_operation_def (void) } void -IFR_DII_Client::create_dii_request (void) +IFR_DII_Client::create_dii_request () { this->req_ = this->target_->_request (this->op_name.in ()); @@ -289,7 +289,7 @@ IFR_DII_Client::create_dii_request (void) } void -IFR_DII_Client::invoke_and_display (void) +IFR_DII_Client::invoke_and_display () { this->req_->invoke (); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h index 1431163ea66..818a82772f4 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h +++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.h @@ -13,14 +13,14 @@ class IFR_DII_Client { public: - IFR_DII_Client (void); - ~IFR_DII_Client (void); + IFR_DII_Client (); + ~IFR_DII_Client (); int init (int argc, ACE_TCHAR *argv[]); // Initialize the client. - int run (void); + int run (); // Run the client. private: @@ -28,20 +28,20 @@ private: ACE_TCHAR *argv[]); // Process the command line arguments. - int find_interface_def (void); + int find_interface_def (); // Query the object reference to get its InterfaceDef in the IFR. - int lookup_interface_def (void); + int lookup_interface_def (); // Look up the InterfaceDef by name in the IFR. - void get_operation_def (void); + void get_operation_def (); // Find the desired operation in the interface definition. - void create_dii_request (void); + void create_dii_request (); // Query the interface definition to get the info needed // to construct a CORBA::Request. - void invoke_and_display (void); + void invoke_and_display (); // Do the invocation and display the results. CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp index d32c97df594..88641ac4c85 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.cpp @@ -29,12 +29,12 @@ // Implementation skeleton constructor -Test_interfaceOne_i::Test_interfaceOne_i (void) +Test_interfaceOne_i::Test_interfaceOne_i () { } // Implementation skeleton destructor -Test_interfaceOne_i::~Test_interfaceOne_i (void) +Test_interfaceOne_i::~Test_interfaceOne_i () { } diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h index 84cfb593ad6..47e30ff6a5b 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h +++ b/TAO/orbsvcs/tests/InterfaceRepo/Bug_3495_Regression/TestImpl.h @@ -15,10 +15,10 @@ class Test_interfaceOne_i { public: // Constructor - Test_interfaceOne_i (void); + Test_interfaceOne_i (); // Destructor - virtual ~Test_interfaceOne_i (void); + virtual ~Test_interfaceOne_i (); virtual void getstruct (::Test::structOne_out tester); }; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp index 7de7b2026d0..9aa4b4cd794 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp @@ -241,12 +241,12 @@ const char *HOME_FINDER_EXCEP_NAMES[][1] = {"whups"} }; -IDL3_Client::IDL3_Client (void) +IDL3_Client::IDL3_Client () : debug_ (false) { } -IDL3_Client::~IDL3_Client (void) +IDL3_Client::~IDL3_Client () { } @@ -285,7 +285,7 @@ IDL3_Client::init (int argc, } int -IDL3_Client::run (void) +IDL3_Client::run () { int status = this->component_test (); @@ -345,7 +345,7 @@ IDL3_Client::parse_args (int argc, } int -IDL3_Client::component_test (void) +IDL3_Client::component_test () { CORBA::Contained_var result = this->repo_->lookup_id (COMPONENT_ID); @@ -461,7 +461,7 @@ IDL3_Client::component_test (void) } int -IDL3_Client::home_test (void) +IDL3_Client::home_test () { CORBA::Contained_var result = this->repo_->lookup_id (HOME_ID); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h index 01a16d4b4ac..8b460c190de 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h +++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.h @@ -28,25 +28,25 @@ class IDL3_Client { public: /// Constructor - IDL3_Client (void); + IDL3_Client (); /// Destructor - ~IDL3_Client (void); + ~IDL3_Client (); /// Initialize the ORB and get the IFR object reference. int init (int argc, ACE_TCHAR *argv[]); /// Execute test code. - int run (void); + int run (); private: /// Process the command line arguments. int parse_args (int argc, ACE_TCHAR *argv[]); - int component_test (void); - int home_test (void); + int component_test (); + int home_test (); // Also tests eventtype. int valuetype_test (const char *repo_id, diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp index fa074920bd1..11686ef9ded 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.cpp @@ -10,20 +10,20 @@ GoodDay::GoodDay (CORBA::ORB_ptr orb) } char * -GoodDay::get_string (void) +GoodDay::get_string () { return CORBA::string_dup ("Hello there!"); } void -GoodDay::shutdown (void) +GoodDay::shutdown () { this->orb_->shutdown (false); } ::Test::GoodDay::RoughWeek * -GoodDay::this_week (void) +GoodDay::this_week () { // Not actually used. return 0; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h index 0425c501516..35bb1c981f4 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Self_Recursive_IDL_Test/GoodDay.h @@ -18,11 +18,11 @@ public: GoodDay (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void); + virtual char * get_string (); - virtual void shutdown (void); + virtual void shutdown (); - virtual ::Test::GoodDay::RoughWeek * this_week (void); + virtual ::Test::GoodDay::RoughWeek * this_week (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp index f518158d272..d5ed2f7df0d 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp @@ -7,7 +7,7 @@ #include "ace/Get_Opt.h" #include "ace/SString.h" -Admin_Client::Admin_Client (void) +Admin_Client::Admin_Client () : debug_ (0), all_tests_ (1), which_test_ (0), @@ -27,7 +27,7 @@ Admin_Client::Admin_Client (void) this->test_array_[10] = &Admin_Client::module_test; } -Admin_Client::~Admin_Client (void) +Admin_Client::~Admin_Client () { } @@ -93,7 +93,7 @@ Admin_Client::init (int argc, ACE_TCHAR *argv[]) } int -Admin_Client::run (void) +Admin_Client::run () { try { @@ -178,7 +178,7 @@ Admin_Client::parse_args (int argc, ACE_TCHAR *argv[]) } void -Admin_Client::array_test (void) +Admin_Client::array_test () { if (this->debug_) { @@ -310,7 +310,7 @@ Admin_Client::array_test (void) } void -Admin_Client::enum_test (void) +Admin_Client::enum_test () { if (this->debug_) { @@ -577,7 +577,7 @@ Admin_Client::enum_test (void) } void -Admin_Client::alias_test (void) +Admin_Client::alias_test () { if (this->debug_) { @@ -819,7 +819,7 @@ Admin_Client::alias_test (void) } void -Admin_Client::native_test (void) +Admin_Client::native_test () { if (this->debug_) { @@ -894,7 +894,7 @@ Admin_Client::native_test (void) } void -Admin_Client::struct_test (void) +Admin_Client::struct_test () { if (this->debug_) { @@ -1289,7 +1289,7 @@ Admin_Client::struct_test (void) } void -Admin_Client::union_test (void) +Admin_Client::union_test () { if (this->debug_) { @@ -1493,7 +1493,7 @@ Admin_Client::union_test (void) } void -Admin_Client::exception_test (void) +Admin_Client::exception_test () { if (this->debug_) { @@ -1937,7 +1937,7 @@ Admin_Client::exception_test (void) } void -Admin_Client::constant_test (void) +Admin_Client::constant_test () { if (this->debug_) { @@ -2117,7 +2117,7 @@ Admin_Client::constant_test (void) } void -Admin_Client::interface_test (void) +Admin_Client::interface_test () { if (this->debug_) { @@ -2535,7 +2535,7 @@ Admin_Client::interface_test (void) } void -Admin_Client::move_test (void) +Admin_Client::move_test () { if (this->debug_) { @@ -2916,7 +2916,7 @@ Admin_Client::move_test (void) } void -Admin_Client::module_test (void) +Admin_Client::module_test () { if (this->debug_) { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h index d482201fe22..0e55e5a76a4 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h @@ -33,38 +33,38 @@ class Admin_Client { public: /// Constructor - Admin_Client (void); + Admin_Client (); /// Destructor - ~Admin_Client (void); + ~Admin_Client (); /// Initialize the ORB and get the IFR object reference. int init (int argc, ACE_TCHAR *argv[]); /// Execute test code. - int run (void); + int run (); private: /// The various IFR tests. - void array_test (void); - void enum_test (void); - void alias_test (void); - void native_test (void); - void struct_test (void); - void union_test (void); - void exception_test (void); - void constant_test (void); - void interface_test (void); - void move_test (void); - void module_test (void); + void array_test (); + void enum_test (); + void alias_test (); + void native_test (); + void struct_test (); + void union_test (); + void exception_test (); + void constant_test (); + void interface_test (); + void move_test (); + void module_test (); /// Process the command line arguments. int parse_args (int argc, ACE_TCHAR *argv[]); /// Array of pointers to the test functions. - void (Admin_Client::*test_array_[NUMBER_OF_TESTS])(void); + void (Admin_Client::*test_array_[NUMBER_OF_TESTS])(); /// Array of test names used in selection of one test. static const char *test_names_[]; diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp index b9353a4913c..bbe381aecc4 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp @@ -8,14 +8,14 @@ const CORBA::ULong DEFAULT_NUMCALLS = 20000; -Latency_Query_Client::Latency_Query_Client (void) +Latency_Query_Client::Latency_Query_Client () : debug_ (false), do_dump_history_ (0), iterations_ (DEFAULT_NUMCALLS) { } -Latency_Query_Client::~Latency_Query_Client (void) +Latency_Query_Client::~Latency_Query_Client () { } @@ -74,7 +74,7 @@ Latency_Query_Client::init (int argc, } int -Latency_Query_Client::run (void) +Latency_Query_Client::run () { // CORBA::DefinitionKind dk; CORBA::AttributeMode am; @@ -184,7 +184,7 @@ Latency_Query_Client::parse_args (int argc, } int -Latency_Query_Client::populate_ifr (void) +Latency_Query_Client::populate_ifr () { CORBA::Contained_var irobj = this->repo_->lookup_id ("IDL:dummy/attr:1.0"); diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h index 9debce05530..26eb07c7b76 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h +++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h @@ -28,24 +28,24 @@ class Latency_Query_Client { public: /// Constructor - Latency_Query_Client (void); + Latency_Query_Client (); /// Destructor - ~Latency_Query_Client (void); + ~Latency_Query_Client (); /// Initialize the ORB and get the IFR object reference. int init (int argc, ACE_TCHAR *argv[]); /// Execute test code. - int run (void); + int run (); private: /// Process the command line arguments. int parse_args (int argc, ACE_TCHAR *argv[]); /// Put in something to query about. - int populate_ifr (void); + int populate_ifr (); private: /// Toggle debugging output. diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp index d954dbd5a98..7c97cfe3fe3 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp @@ -3,13 +3,13 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_string.h" -Ptest::Ptest (void) +Ptest::Ptest () : debug_ (0), query_ (0) { } -Ptest::~Ptest (void) +Ptest::~Ptest () { } @@ -58,7 +58,7 @@ Ptest::init (int argc, ACE_TCHAR *argv[]) } int -Ptest::shutdown (void) +Ptest::shutdown () { try { @@ -77,7 +77,7 @@ Ptest::shutdown (void) } int -Ptest::run (void) +Ptest::run () { try { @@ -130,7 +130,7 @@ Ptest::parse_args (int argc, } void -Ptest::populate (void) +Ptest::populate () { if (this->debug_) { @@ -170,7 +170,7 @@ Ptest::populate (void) } int -Ptest::query (void) +Ptest::query () { if (this->debug_) { diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h index 5f6c61df0fb..fbc3a0ce3b3 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h +++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h @@ -33,25 +33,25 @@ class Ptest { public: /// Constructor - Ptest (void); + Ptest (); /// Destructor - ~Ptest (void); + ~Ptest (); /// Initialize the ORB and get the IFR object reference. int init (int argc, ACE_TCHAR *argv[]); /// Execute test code. - int run (void); + int run (); /// Cleanup - int shutdown (void); + int shutdown (); private: /// The two IFR tests. - void populate (void); - int query (void); + void populate (); + int query (); /// Process the command line arguments. int parse_args (int argc, diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp index adc5d7eab45..275395b5360 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp @@ -22,11 +22,11 @@ #include "ace/streams.h" // Constructor -NContextExt_Client_i::NContextExt_Client_i (void) +NContextExt_Client_i::NContextExt_Client_i () { } -NContextExt_Client_i::~NContextExt_Client_i (void) +NContextExt_Client_i::~NContextExt_Client_i () { } @@ -34,7 +34,7 @@ NContextExt_Client_i::~NContextExt_Client_i (void) // Parses the command line arguments and returns an // error status int -NContextExt_Client_i::parse_args (void) +NContextExt_Client_i::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dvs")); int c; @@ -138,7 +138,7 @@ NContextExt_Client_i::get_name () } int -NContextExt_Client_i::run (void) +NContextExt_Client_i::run () { try { diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h index 02f2196c4a5..fa55980befd 100644 --- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h +++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h @@ -28,18 +28,18 @@ class NContextExt_Client_i { public: // = COnstructor and destructor. - NContextExt_Client_i (void); - ~NContextExt_Client_i (void); + NContextExt_Client_i (); + ~NContextExt_Client_i (); /// Execute the client example code. - int run (void); + int run (); /// Initialize the client communication endpoint with the server. int init (int argc, ACE_TCHAR *argv[]); private: /// Parses the arguments passed on the command line. - int parse_args (void); + int parse_args (); /** * Prints the values of the original name, strigified name and @@ -55,7 +55,7 @@ class NContextExt_Client_i CORBA::String_var url_string); /// Generates a random name - char * get_name (void); + char * get_name (); /// # of arguments on the command line. int argc_; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp index ea50ccb7ab0..51994b7550a 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.cpp @@ -13,13 +13,13 @@ Basic::Basic (CORBA::Object_ptr object_group, } char * -Basic::get_string (void) +Basic::get_string () { return CORBA::string_dup (this->location_.in ()); } void -Basic::remove_member (void) +Basic::remove_member () { try { @@ -50,7 +50,7 @@ Basic::remove_member (void) } void -Basic::shutdown (void) +Basic::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h index 105a8bcc551..a374f5f1219 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Basic.h @@ -24,11 +24,11 @@ public: CORBA::ORB_ptr orb, const char *loc); - virtual char * get_string (void); + virtual char * get_string (); - virtual void shutdown (void); + virtual void shutdown (); - virtual void remove_member (void); + virtual void remove_member (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp index 56445e5a102..0c789aa539d 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp @@ -12,7 +12,7 @@ LB_server::LB_server (int argc, ACE_TCHAR **argv) } int -LB_server::destroy (void) +LB_server::destroy () { try { @@ -32,19 +32,19 @@ LB_server::destroy (void) } CORBA::ORB_ptr -LB_server::orb (void) +LB_server::orb () { return this->orb_.in (); } CORBA::Object_ptr -LB_server::object_group (void) +LB_server::object_group () { return this->object_group_.in (); } CosLoadBalancing::LoadManager_ptr -LB_server::load_manager (void) +LB_server::load_manager () { return this->lm_.in (); } @@ -93,7 +93,7 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[]) } int -LB_server::start_orb_and_poa (void) +LB_server::start_orb_and_poa () { try { @@ -136,7 +136,7 @@ LB_server::start_orb_and_poa (void) } int -LB_server::create_object_group (void) +LB_server::create_object_group () { try { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h index f7a77cfc2d5..d32275ff80b 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.h @@ -37,28 +37,28 @@ public: LB_server (int argc, ACE_TCHAR **argv); /// destroys LoadManager, ORB and POA. - int destroy (void); + int destroy (); /// start the ORB. - int start_orb_and_poa (void); + int start_orb_and_poa (); /// Get the LoadManager Interface. int init (int argc, ACE_TCHAR **argv); /// Create the Object Group using the Load Manager Reference. - int create_object_group (void); + int create_object_group (); /// register the servants with the object group. int register_servant (Basic *servant, const char *loc); /// for servants to register to the initialised ORB. - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); /// for servants to get the reference for object_group. - CORBA::Object_ptr object_group (void); + CORBA::Object_ptr object_group (); /// for servants to get the reference for object_group. - CosLoadBalancing::LoadManager_ptr load_manager (void); + CosLoadBalancing::LoadManager_ptr load_manager (); private: int parse_args (int, ACE_TCHAR **); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp index c0e4eea6316..51da18217a0 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.cpp @@ -25,7 +25,7 @@ Basic::Basic (CORBA::Object_ptr object_group, /// Default _non_existent: always returns false. CORBA::Boolean -Basic::_non_existent (void) +Basic::_non_existent () { if (pong_delay > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T Basic::_non_existent server %d sleep %d seconds ... \n", @@ -40,13 +40,13 @@ Basic::_non_existent (void) } char * -Basic::get_string (void) +Basic::get_string () { return CORBA::string_dup (this->location_.in ()); } void -Basic::remove_member (void) +Basic::remove_member () { try { @@ -77,13 +77,13 @@ Basic::remove_member (void) } void -Basic::shutdown (void) +Basic::shutdown () { this->orb_->shutdown (false); } void -Basic::exit (void) +Basic::exit () { ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T - Basic::exit server %d exit \n", this->server_id_)); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h index 0d239e82e8f..178eb26eb27 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/Basic.h @@ -27,15 +27,15 @@ public: int server_id); /// Default _non_existent: always returns false. - virtual CORBA::Boolean _non_existent (void); + virtual CORBA::Boolean _non_existent (); - virtual char * get_string (void); + virtual char * get_string (); - virtual void shutdown (void); + virtual void shutdown (); - virtual void remove_member (void); + virtual void remove_member (); - virtual void exit (void); + virtual void exit (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp index 1734d796f93..79c354dcaab 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.cpp @@ -18,7 +18,7 @@ LB_server::LB_server (int& argc, ACE_TCHAR **& argv) } int -LB_server::destroy (void) +LB_server::destroy () { try { @@ -39,19 +39,19 @@ LB_server::destroy (void) } CORBA::ORB_ptr -LB_server::orb (void) +LB_server::orb () { return this->orb_.in (); } CORBA::Object_ptr -LB_server::object_group (void) +LB_server::object_group () { return this->object_group_.in (); } CosLoadBalancing::LoadManager_ptr -LB_server::load_manager (void) +LB_server::load_manager () { return this->lm_.in (); } @@ -75,7 +75,7 @@ LB_server::write_ior_to_file (const char *ior) } int -LB_server::start_orb_and_poa (void) +LB_server::start_orb_and_poa () { try { @@ -118,7 +118,7 @@ LB_server::start_orb_and_poa (void) } int -LB_server::create_object_group (void) +LB_server::create_object_group () { try { @@ -158,7 +158,7 @@ LB_server::create_object_group (void) int -LB_server::get_object_group (void) +LB_server::get_object_group () { try { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.h index 8449b9b62f2..af53a1ad918 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_App_Ctrl/LB_server.h @@ -36,29 +36,29 @@ public: LB_server (int& argc, ACE_TCHAR **& argv); /// destroys LoadManager, ORB and POA. - int destroy (void); + int destroy (); /// start the ORB. - int start_orb_and_poa (void); + int start_orb_and_poa (); /// Get the LoadManager Interface. //int init (int& argc, ACE_TCHAR **& argv); /// Create the Object Group using the Load Manager Reference. - int create_object_group (void); - int get_object_group (void); + int create_object_group (); + int get_object_group (); /// register the servants with the object group. int register_servant (Basic *servant, const char *loc); /// for servants to register to the initialised ORB. - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); /// for servants to get the reference for object_group. - CORBA::Object_ptr object_group (void); + CORBA::Object_ptr object_group (); /// for servants to get the reference for object_group. - CosLoadBalancing::LoadManager_ptr load_manager (void); + CosLoadBalancing::LoadManager_ptr load_manager (); private: /// Load Manager diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp index 5a9c2c5027b..97764011a8b 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.cpp @@ -21,13 +21,13 @@ LB_Factory_Server::LB_Factory_Server (int argc, ACE_TCHAR ** argv) } CORBA::ORB_ptr -LB_Factory_Server::orb (void) +LB_Factory_Server::orb () { return this->orb_.in (); } int -LB_Factory_Server::run (void) +LB_Factory_Server::run () { try { @@ -48,7 +48,7 @@ LB_Factory_Server::run (void) int -LB_Factory_Server::destroy (void) +LB_Factory_Server::destroy () { try { @@ -123,7 +123,7 @@ LB_Factory_Server::parse_args (int& argc, ACE_TCHAR **& argv) } int -LB_Factory_Server::init (void) +LB_Factory_Server::init () { try { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.h index 4e93acb9ec7..c7219b39212 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_Factory_Server.h @@ -32,18 +32,18 @@ public: LB_Factory_Server (int argc, ACE_TCHAR ** argv); /// destroys LoadManager, ORB and POA. - int destroy (void); + int destroy (); int parse_args (int& argc, ACE_TCHAR **& argv); /// start the ORB. - int init (void); + int init (); /// Run the ORB. - int run (void); + int run (); /// for servants to register to the initialised ORB. - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); private: /// Create the Object Group using the Load Manager Reference. diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp index 53262b5b65e..2f09a265b7d 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.cpp @@ -22,13 +22,13 @@ LB_server::LB_server (int argc, ACE_TCHAR ** argv) } CORBA::ORB_ptr -LB_server::orb (void) +LB_server::orb () { return this->orb_.in (); } int -LB_server::run (void) +LB_server::run () { try { @@ -49,7 +49,7 @@ LB_server::run (void) int -LB_server::destroy (void) +LB_server::destroy () { try { @@ -123,7 +123,7 @@ LB_server::parse_args (int& argc, ACE_TCHAR **& argv) } int -LB_server::init (void) +LB_server::init () { try { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.h index b2223eab9e9..90cf96be1d7 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/LB_server.h @@ -32,18 +32,18 @@ public: LB_server (int argc, ACE_TCHAR ** argv); /// destroys LoadManager, ORB and POA. - int destroy (void); + int destroy (); int parse_args (int& argc, ACE_TCHAR **& argv); /// start the ORB. - int init (void); + int init (); /// Run the ORB. - int run (void); + int run (); /// for servants to register to the initialised ORB. - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); private: /// Create the Object Group using the Load Manager Reference. diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp index b5ce33978ac..b598ec18fe5 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.cpp @@ -14,7 +14,7 @@ Simple::Simple (int server_id) /// Default _non_existent: always returns false. CORBA::Boolean -Simple::_non_existent (void) +Simple::_non_existent () { if (pong_delay > 0) ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T Simple::_non_existent server %d sleep %d seconds ... \n", @@ -29,7 +29,7 @@ Simple::_non_existent (void) } char * -Simple::get_string (void) +Simple::get_string () { switch (this->server_id_) { @@ -49,7 +49,7 @@ Simple::get_string (void) } void -Simple::exit (void) +Simple::exit () { ACE_DEBUG ((LM_DEBUG, "(%P|%t)%T - Simple::exit server %d exit \n", this->server_id_)); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h index e97dfbec054..1af11ebbaaf 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/DeadMemberDetection_Inf_Ctrl/Simple.h @@ -18,11 +18,11 @@ public: /// Constructor /// Default _non_existent: always returns false. - virtual CORBA::Boolean _non_existent (void); + virtual CORBA::Boolean _non_existent (); - virtual char * get_string (void); + virtual char * get_string (); - virtual void exit (void); + virtual void exit (); private: int server_id_; diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp index 135e228f1ef..b7b1dbf445d 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.cpp @@ -3,7 +3,7 @@ #include "TestC.h" -Factory::Factory (void) +Factory::Factory () { this->fcid_ = 0; } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h index 0d226e1e2b5..f02fb0a9ce8 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Factory.h @@ -16,7 +16,7 @@ class Factory { public: /// Constructor - Factory (void); + Factory (); /// creates a Test::Simple servant reference. /// This reference is then passed as a FactoryInfos property /// when the LoadManager creates the object group. diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp index 56cc9b4a95f..da30715eae6 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp @@ -13,13 +13,13 @@ LB_server::LB_server (int argc, ACE_TCHAR **argv) } CORBA::ORB_ptr -LB_server::orb (void) +LB_server::orb () { return this->orb_.in (); } int -LB_server::run (void) +LB_server::run () { try { @@ -39,7 +39,7 @@ LB_server::run (void) int -LB_server::destroy (void) +LB_server::destroy () { try { @@ -103,7 +103,7 @@ LB_server::parse_args (int argc, ACE_TCHAR *argv[]) int -LB_server::start_orb_and_poa (void) +LB_server::start_orb_and_poa () { try { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h index daab36a02e1..adc888a32b7 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.h @@ -34,19 +34,19 @@ public: LB_server (int argc, ACE_TCHAR **argv); /// destroys LoadManager, ORB and POA. - int destroy (void); + int destroy (); /// start the ORB. - int start_orb_and_poa (void); + int start_orb_and_poa (); /// Create the Object Group using the Load Manager Reference. int create_object_group (const char *loc_1, const char *loc_2); /// Run the ORB. - int run (void); + int run (); /// for servants to register to the initialised ORB. - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); private: int write_ior_to_file (const char *); diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp index 50d02c2d857..a6d08240431 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.cpp @@ -1,11 +1,11 @@ #include "Simple.h" -Simple::Simple (void) +Simple::Simple () { } char * -Simple::get_string (void) +Simple::get_string () { return CORBA::string_dup ("TAO Load Balancing Works!"); } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h index 018f734ebe2..764af2787b1 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Simple.h @@ -13,10 +13,10 @@ class Simple : public virtual POA_Test::Simple { public: - Simple (void); + Simple (); /// Constructor - virtual char * get_string (void); + virtual char * get_string (); }; #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp index 17c16dba3cd..b6694a46317 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.cpp @@ -15,19 +15,19 @@ Basic::Basic (CORBA::Object_ptr object_group, } CORBA::Short -Basic::number (void) +Basic::number () { return this->number_; } char * -Basic::get_string (void) +Basic::get_string () { return CORBA::string_dup (this->location_); } void -Basic::remove_member (void) +Basic::remove_member () { try { @@ -58,7 +58,7 @@ Basic::remove_member (void) } void -Basic::shutdown (void) +Basic::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h index 361c5a9e9c3..84035597727 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Basic.h @@ -23,13 +23,13 @@ public: CORBA::Short num, const char *loc); - virtual char * get_string (void); + virtual char * get_string (); - virtual void shutdown (void); + virtual void shutdown (); - virtual void remove_member (void); + virtual void remove_member (); - virtual CORBA::Short number (void); + virtual CORBA::Short number (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp index 59db1435e5e..3e3ec866d9f 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.cpp @@ -12,7 +12,7 @@ LB_server::LB_server (int argc, ACE_TCHAR **argv) } int -LB_server::destroy (void) +LB_server::destroy () { try { @@ -34,31 +34,31 @@ LB_server::destroy (void) } CORBA::ORB_ptr -LB_server::orb (void) +LB_server::orb () { return this->orb_.in (); } CORBA::Object_ptr -LB_server::get_basic_object_group (void) +LB_server::get_basic_object_group () { return this->basic_object_group_.in (); } CORBA::Object_ptr -LB_server::get_simple_object_group (void) +LB_server::get_simple_object_group () { return this->simple_object_group_.in (); } CosLoadBalancing::LoadManager_ptr -LB_server::load_manager (void) +LB_server::load_manager () { return this->lm_.in (); } int -LB_server::start_orb_and_poa (void) +LB_server::start_orb_and_poa () { try { @@ -101,7 +101,7 @@ LB_server::start_orb_and_poa (void) } int -LB_server::create_basic_object_group (void) +LB_server::create_basic_object_group () { try { @@ -138,7 +138,7 @@ LB_server::create_basic_object_group (void) } int -LB_server::create_simple_object_group (void) +LB_server::create_simple_object_group () { try { @@ -175,7 +175,7 @@ LB_server::create_simple_object_group (void) } int -LB_server::remove_basic_member (void) +LB_server::remove_basic_member () { try { @@ -201,7 +201,7 @@ LB_server::remove_basic_member (void) } int -LB_server::remove_simple_member (void) +LB_server::remove_simple_member () { try { diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h index ada83c1af24..3d1b6ff8831 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/LB_server.h @@ -37,25 +37,25 @@ public: LB_server (int argc, ACE_TCHAR **argv); /// destroys LoadManager, ORB and POA. - int destroy (void); + int destroy (); /// start the ORB. - int start_orb_and_poa (void); + int start_orb_and_poa (); /// Get the LoadManager Interface. int init (int argc, ACE_TCHAR **argv); /// Create the basic Object Group using the Load Manager Reference. - int create_basic_object_group (void); + int create_basic_object_group (); /// Create the simple Object Group using the Load Manager Reference. - int create_simple_object_group (void); + int create_simple_object_group (); /// remove the basic member from the object group - int remove_basic_member (void); + int remove_basic_member (); /// remove the simple member from the object group - int remove_simple_member (void); + int remove_simple_member (); /// register the basic servants with the object group. int register_basic_servant (Basic *servant, const char *loc); @@ -64,16 +64,16 @@ public: int register_simple_servant (Simple *servant, const char *loc); /// for servants to register to the initialised ORB. - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); /// for servants to get the reference for object_group. - CORBA::Object_ptr get_basic_object_group (void); + CORBA::Object_ptr get_basic_object_group (); /// for servants to get the reference for object_group. - CORBA::Object_ptr get_simple_object_group (void); + CORBA::Object_ptr get_simple_object_group (); /// for servants to get the reference for object_group. - CosLoadBalancing::LoadManager_ptr load_manager (void); + CosLoadBalancing::LoadManager_ptr load_manager (); private: /// Load Manager diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp index 8de7c1e58d5..5b769625289 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.cpp @@ -15,19 +15,19 @@ Simple::Simple (CORBA::Object_ptr object_group, } CORBA::Short -Simple::number (void) +Simple::number () { return this->number_; } char * -Simple::get_string (void) +Simple::get_string () { return CORBA::string_dup (this->location_); } void -Simple::remove_member (void) +Simple::remove_member () { try { @@ -58,7 +58,7 @@ Simple::remove_member (void) } void -Simple::shutdown (void) +Simple::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h index 42a1e609843..e993d5aaf49 100644 --- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h +++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/Simple.h @@ -25,13 +25,13 @@ public: CORBA::Short num, const char *loc); - virtual char * get_string (void); + virtual char * get_string (); - virtual void shutdown (void); + virtual void shutdown (); - virtual void remove_member (void); + virtual void remove_member (); - virtual CORBA::Short number (void); + virtual CORBA::Short number (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp index de1ef2e5ce5..371e7cdc3e9 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp @@ -11,12 +11,12 @@ const char* BasicLog_Test::basic_log_factory_name_= "BasicLogFactory"; const char* BasicLog_Test::naming_service_name_ = "NameService"; -BasicLog_Test::BasicLog_Test(void) +BasicLog_Test::BasicLog_Test() : argc_ (0), argv_(0), logServiceIor_ (0) { } -BasicLog_Test::~BasicLog_Test (void) +BasicLog_Test::~BasicLog_Test () { this->destroy_log (); } @@ -58,7 +58,7 @@ BasicLog_Test::init (int argc, ACE_TCHAR *argv[]) } int -BasicLog_Test::init_factory (void) +BasicLog_Test::init_factory () { // Assumpting INS for finding LogServie @@ -350,7 +350,7 @@ BasicLog_Test::test_adminState() int -BasicLog_Test::test_logSize (void) +BasicLog_Test::test_logSize () { try { @@ -499,7 +499,7 @@ BasicLog_Test::parse_args (int argc, ACE_TCHAR *argv[]) } void -BasicLog_Test::resolve_naming_service (void) +BasicLog_Test::resolve_naming_service () { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (naming_service_name_); @@ -513,7 +513,7 @@ BasicLog_Test::resolve_naming_service (void) } void -BasicLog_Test::resolve_basic_factory (void) +BasicLog_Test::resolve_basic_factory () { CosNaming::Name name (1); name.length (1); @@ -545,7 +545,7 @@ BasicLog_Test::destroy_log() } int -BasicLog_Test::test_log_destroy (void) +BasicLog_Test::test_log_destroy () { ACE_DEBUG ((LM_ERROR, "Testing destroy log\n")); this->basicLog_->destroy (); @@ -576,7 +576,7 @@ BasicLog_Test::test_log_destroy (void) } int -BasicLog_Test::test_week_mask (void) +BasicLog_Test::test_week_mask () { DsLogAdmin::WeekMask masks; masks.length (1); @@ -637,7 +637,7 @@ return 0; } int -BasicLog_Test::test_capacity_alarm_threshold (void) +BasicLog_Test::test_capacity_alarm_threshold () { //basicLog_->set_log_full_action(DsLogAdmin::halt); diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h index 9765e04e5d6..b3988e5bb1a 100644 --- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h +++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.h @@ -27,10 +27,10 @@ class BasicLog_Test enum { MAX_LOG_SIZE = 8192 }; - BasicLog_Test(void); + BasicLog_Test(); // constructor - ~BasicLog_Test(void); + ~BasicLog_Test(); // destructor int init(int argc, ACE_TCHAR *argv[]); @@ -105,7 +105,7 @@ private: BasicLog_Test& operator=(const BasicLog_Test&); int - init_factory (void); + init_factory (); int parse_args(int argc, ACE_TCHAR *argv[]); @@ -115,11 +115,11 @@ private: // writes enough records to fill the log. Default write enough to fill log. Hopefully, not infinite. void - resolve_basic_factory (void); + resolve_basic_factory (); // resolve log factory void - resolve_naming_service (void); + resolve_naming_service (); // resolve nameing service void diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp index 85d1014ec3e..bdccf156346 100644 --- a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp +++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.cpp @@ -12,7 +12,7 @@ UIPMC_Object_Impl::UIPMC_Object_Impl (CORBA::ULong payload, { } -UIPMC_Object_Impl::~UIPMC_Object_Impl (void) +UIPMC_Object_Impl::~UIPMC_Object_Impl () { if (this->received_.current_size () == 0) { @@ -100,13 +100,13 @@ Hello_Impl::Hello_Impl (CORBA::ORB_ptr orb, } Test::UIPMC_Object_ptr -Hello_Impl::get_object (void) +Hello_Impl::get_object () { return Test::UIPMC_Object::_duplicate (this->obj_.in ()); } void -Hello_Impl::shutdown (void) +Hello_Impl::shutdown () { try { diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h index 68dc7ab118a..89d2eebfb04 100644 --- a/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h +++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/Hello_Impl.h @@ -13,7 +13,7 @@ class UIPMC_Object_Impl : public virtual POA_Test::UIPMC_Object public: UIPMC_Object_Impl (CORBA::ULong payload, CORBA::ULong clients, CORBA::ULong calls); - ~UIPMC_Object_Impl (void); + ~UIPMC_Object_Impl (); // The skeleton methods virtual void process (Test::Octets const &payload); @@ -39,9 +39,9 @@ public: Hello_Impl (CORBA::ORB_ptr orb, Test::UIPMC_Object_ptr obj); // The skeleton methods - virtual Test::UIPMC_Object_ptr get_object (void); + virtual Test::UIPMC_Object_ptr get_object (); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp b/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp index 4a97333f149..d7f46225d09 100644 --- a/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp +++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/client.cpp @@ -94,7 +94,7 @@ public: { } - virtual int svc (void) + virtual int svc () { try { diff --git a/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp b/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp index 49cfc29a1ef..513604224ca 100644 --- a/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp +++ b/TAO/orbsvcs/tests/Miop/McastFragmentation/server.cpp @@ -71,7 +71,7 @@ public: { } - virtual int svc (void) + virtual int svc () { try { diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp index 8d15f0c9314..4a5f894ec02 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp +++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.cpp @@ -48,7 +48,7 @@ McastHello::send_large_octet_array (const Test::Octets &payload) } void -McastHello::shutdown (void) +McastHello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h index 45c93518e93..e16c30e1430 100644 --- a/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h +++ b/TAO/orbsvcs/tests/Miop/McastHello/McastHello.h @@ -17,7 +17,7 @@ public: // = The skeleton methods virtual void send_forty_two (CORBA::Long forty_two); - virtual void shutdown (void); + virtual void shutdown (); /// Return whether all test requests have been received successfully. CORBA::Boolean get_status (); diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp index 2ef95fa4f05..3d39cb5e541 100644 --- a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp +++ b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.cpp @@ -49,7 +49,7 @@ McastHello::send_large_octet_array (const Test::Octets &payload) } void -McastHello::shutdown (void) +McastHello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h index 45c93518e93..e16c30e1430 100644 --- a/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h +++ b/TAO/orbsvcs/tests/Miop/McastLocal/McastHello.h @@ -17,7 +17,7 @@ public: // = The skeleton methods virtual void send_forty_two (CORBA::Long forty_two); - virtual void shutdown (void); + virtual void shutdown (); /// Return whether all test requests have been received successfully. CORBA::Boolean get_status (); diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp index 2e60841de9b..fd6cac0709f 100644 --- a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp +++ b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.cpp @@ -49,7 +49,7 @@ McastHello::send_large_octet_array (const Test::Octets &payload) } void -McastHello::shutdown (void) +McastHello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h index 45c93518e93..e16c30e1430 100644 --- a/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h +++ b/TAO/orbsvcs/tests/Miop/McastZIOP/McastHello.h @@ -17,7 +17,7 @@ public: // = The skeleton methods virtual void send_forty_two (CORBA::Long forty_two); - virtual void shutdown (void); + virtual void shutdown (); /// Return whether all test requests have been received successfully. CORBA::Boolean get_status (); diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp index a57ff18c887..e7126e43696 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp @@ -6,7 +6,7 @@ /***************************************************************************/ -AdminProperties_Task::AdminProperties_Task (void) +AdminProperties_Task::AdminProperties_Task () : supplier_ (0) , client_ (0) { @@ -26,7 +26,7 @@ AdminProperties_Task::init (int argc, ACE_TCHAR *argv[]) } int -AdminProperties_Task::svc (void) +AdminProperties_Task::svc () { // operations: CosNotification::StructuredEvent event; @@ -120,7 +120,7 @@ AdminProperties_StructuredPushConsumer::push_structured_event (const CosNotifica /***************************************************************************/ -AdminProperties::AdminProperties (void) +AdminProperties::AdminProperties () : max_queue_length_ (10), max_consumers_ (3), max_suppliers_ (3), @@ -134,7 +134,7 @@ AdminProperties::AdminProperties (void) { } -AdminProperties::~AdminProperties (void) +AdminProperties::~AdminProperties () { } @@ -255,7 +255,7 @@ AdminProperties::create_channel(bool reject) } void -AdminProperties::run_test (void) +AdminProperties::run_test () { bool reject = true; this->create_channel(reject); @@ -343,7 +343,7 @@ AdminProperties::test_max_queue_length (bool reject) } void -AdminProperties::test_max_clients (void) +AdminProperties::test_max_clients () { this->create_suppliers (); @@ -360,7 +360,7 @@ AdminProperties::test_max_clients (void) } void -AdminProperties::create_suppliers (void) +AdminProperties::create_suppliers () { // Create the requested number of suppliers. // @@ CosNotifyChannelAdmin::AdminID adminid; @@ -396,7 +396,7 @@ AdminProperties::create_suppliers (void) } void -AdminProperties::create_consumers (void) +AdminProperties::create_consumers () { // Create the requested number of suppliers. // @@ CosNotifyChannelAdmin::AdminID adminid; diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h index 576b48e80ba..43f27debf0e 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h +++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.h @@ -49,7 +49,7 @@ class AdminProperties_Task : public ACE_Task_Base { public: /// Constructor. - AdminProperties_Task (void); + AdminProperties_Task (); /// Init this object. void init (TAO_Notify_Tests_StructuredPushSupplier *supplier, AdminProperties* client); @@ -86,23 +86,23 @@ class AdminProperties : public Notify_Test_Client friend class AdminProperties_Task; public: - AdminProperties (void); - ~AdminProperties (void); + AdminProperties (); + ~AdminProperties (); int parse_args (int argc, ACE_TCHAR *argv[]) ; // Initialization. /// Run the test. - void run_test (void); + void run_test (); private: - void create_suppliers (void); - void create_consumers (void); + void create_suppliers (); + void create_consumers (); void create_channel(bool reject); /// Test MaxSuppliers and MaxConsumers - void test_max_clients (void); + void test_max_clients (); /// Test MaxQueueLength properties void test_max_queue_length (bool reject); diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp index f5390872c18..746340a1671 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp @@ -37,7 +37,7 @@ CD_IMPLEMENT_ENTITY(SequencePushSupplier) //***************************************************************************************************** -ConnectDisconnect::ConnectDisconnect (void) +ConnectDisconnect::ConnectDisconnect () :any_consumer_ (0), structured_consumer_ (0), sequence_consumer_ (0), @@ -62,7 +62,7 @@ ConnectDisconnect::~ConnectDisconnect () } void -ConnectDisconnect::on_entity_destroyed (void) +ConnectDisconnect::on_entity_destroyed () { this->result_count_++; @@ -177,7 +177,7 @@ ConnectDisconnect::parse_args(int argc, ACE_TCHAR *argv[]) } void -ConnectDisconnect::create_EC (void) +ConnectDisconnect::create_EC () { CosNotifyChannelAdmin::ChannelID id; @@ -189,7 +189,7 @@ ConnectDisconnect::create_EC (void) } void -ConnectDisconnect::run_test (void) +ConnectDisconnect::run_test () { for (int iterations = 0; iterations < count_; ++iterations) { @@ -273,13 +273,13 @@ ConnectDisconnect::run_test (void) } void -ConnectDisconnect::end_test (void) +ConnectDisconnect::end_test () { consumer_done( 0 ); } int -ConnectDisconnect::check_results (void) +ConnectDisconnect::check_results () { ACE_DEBUG ((LM_DEBUG, "result_count_ = %d", this->result_count_.value ())); ACE_DEBUG ((LM_DEBUG, " expected_count_ = %d\n", this->expected_count_)); diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h index e06d200aac4..a681455b6ff 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h +++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h @@ -63,11 +63,11 @@ class ConnectDisconnect : public Notify_Test_Client { public: // Initialization and termination code. - ConnectDisconnect (void); + ConnectDisconnect (); virtual ~ConnectDisconnect (); /// Keeps track of how many objects were destroyed. - void on_entity_destroyed (void); + void on_entity_destroyed (); int parse_args (int argc, ACE_TCHAR *argv[]); @@ -77,17 +77,17 @@ public: ACE_TCHAR *argv []); /// Run the test. - void run_test (void); + void run_test (); /// End the test. - void end_test (void); + void end_test (); /// Check if we got the expected results. - int check_results (void); + int check_results (); protected: /// Create EC. - void create_EC (void); + void create_EC (); /// The one channel that we create using the factory. CosNotifyChannelAdmin::EventChannel_var ec_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp index a4471ffefbb..7885ea0f7f2 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp @@ -36,17 +36,17 @@ Event_StructuredPushSupplier::Event_StructuredPushSupplier ( { } -Event_StructuredPushSupplier::~Event_StructuredPushSupplier (void) +Event_StructuredPushSupplier::~Event_StructuredPushSupplier () { } /***************************************************************************/ -Events::Events (void) +Events::Events () : use_default_admin_ (0), event_count_ (5) { } -Events::~Events (void) +Events::~Events () { } @@ -159,7 +159,7 @@ Events::parse_args (int argc, } void -Events::create_EC (void) +Events::create_EC () { CosNotifyChannelAdmin::ChannelID id; @@ -190,7 +190,7 @@ Events::create_EC (void) } void -Events::on_event_received (void) +Events::on_event_received () { ++this->result_count_; @@ -206,7 +206,7 @@ Events::on_event_received (void) } void -Events::run_test (void) +Events::run_test () { // operations: CosNotification::StructuredEvent event; @@ -257,13 +257,13 @@ Events::run_test (void) } void -Events::end_test (void) +Events::end_test () { consumer_done( 0 ); } int -Events::check_results (void) +Events::check_results () { // Destroy the channel. this->ec_->destroy (); diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.h b/TAO/orbsvcs/tests/Notify/Basic/Events.h index 3710f290e09..7c00500116c 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Events.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Events.h @@ -49,7 +49,7 @@ public: Event_StructuredPushSupplier (Events * test_client); /// Destructor. - virtual ~Event_StructuredPushSupplier (void); + virtual ~Event_StructuredPushSupplier (); protected: Events* test_client_; @@ -61,8 +61,8 @@ class Events : public Notify_Test_Client { public: // Initialization and termination code. - Events (void); - virtual ~Events (void); + Events (); + virtual ~Events (); int parse_args (int argc, ACE_TCHAR *argv[]) ; @@ -72,20 +72,20 @@ public: ACE_TCHAR *argv []); /// Called when an event is received. - void on_event_received (void); + void on_event_received (); /// Run the test. - void run_test (void); + void run_test (); /// End the test. - void end_test (void); + void end_test (); /// check if we got the expected results. - int check_results (void); + int check_results (); protected: /// Create EC - void create_EC (void); + void create_EC (); /// Number of events received so far. ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp index 7d2504daf97..82617521dc8 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.cpp @@ -5,12 +5,12 @@ #include "orbsvcs/CosNotifyFilterExtC.h" -ExtendedFilter::ExtendedFilter (void) +ExtendedFilter::ExtendedFilter () : event_count_ (5) { } -ExtendedFilter::~ExtendedFilter (void) +ExtendedFilter::~ExtendedFilter () { } @@ -45,7 +45,7 @@ ExtendedFilter::init (int argc, ACE_TCHAR* argv []) } void -ExtendedFilter::run_test (void) +ExtendedFilter::run_test () { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, " Obtaining FilterAdmin interface from ConsumerAdmin\n")); @@ -216,7 +216,7 @@ ExtendedFilter::print_filters (CosNotifyFilter::FilterAdmin_ptr filter_admin) void -ExtendedFilter::create_EC (void) +ExtendedFilter::create_EC () { CosNotifyChannelAdmin::ChannelID id, id2; diff --git a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.h b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.h index 05339ce6467..52551e9aa90 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.h +++ b/TAO/orbsvcs/tests/Notify/Basic/ExtendedFilter.h @@ -27,19 +27,19 @@ class ExtendedFilter : public Notify_Test_Client { public: // Initialization and termination code - ExtendedFilter (void); - virtual ~ExtendedFilter (void); + ExtendedFilter (); + virtual ~ExtendedFilter (); /// initialization. int init (int argc, ACE_TCHAR *argv []); /// Run the test. - void run_test (void); + void run_test (); protected: /// Create EC - void create_EC (void); + void create_EC (); /// Run some tests to check the filters. void run_filter_test (CosNotifyFilter::FilterAdmin_ptr); diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp index e10e796bc8f..4b5bc4bcdb2 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp @@ -4,12 +4,12 @@ #include "Filter.h" -Filter::Filter (void) +Filter::Filter () : event_count_ (5) { } -Filter::~Filter (void) +Filter::~Filter () { } @@ -44,7 +44,7 @@ Filter::init (int argc, ACE_TCHAR* argv []) } void -Filter::run_test (void) +Filter::run_test () { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, " Obtaining FilterAdmin interface from ConsumerAdmin\n")); @@ -170,7 +170,7 @@ Filter::print_filters (CosNotifyFilter::FilterAdmin_ptr filter_admin) void -Filter::create_EC (void) +Filter::create_EC () { CosNotifyChannelAdmin::ChannelID id; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.h b/TAO/orbsvcs/tests/Notify/Basic/Filter.h index 2948da0f785..64cf8ba3e83 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Filter.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.h @@ -28,19 +28,19 @@ class Filter : public Notify_Test_Client { public: // Initialization and termination code - Filter (void); - virtual ~Filter (void); + Filter (); + virtual ~Filter (); /// initialization. int init (int argc, ACE_TCHAR *argv []); /// Run the test. - void run_test (void); + void run_test (); protected: /// Create EC - void create_EC (void); + void create_EC (); /// Run some tests to check the filters. void run_filter_test (CosNotifyFilter::FilterAdmin_ptr); diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp index 7eded75b6ef..1aa20040659 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp @@ -5,7 +5,7 @@ #include "orbsvcs/CosNotifyCommC.h" #include "IdAssignment.h" -IdAssignment::IdAssignment (void) +IdAssignment::IdAssignment () : iter_ (3), ec_count_ (3), consumer_admin_count_ (3), @@ -13,7 +13,7 @@ IdAssignment::IdAssignment (void) { } -IdAssignment::~IdAssignment (void) +IdAssignment::~IdAssignment () { } @@ -110,7 +110,7 @@ IdAssignment::init (int argc, } CosNotifyChannelAdmin::ChannelID -IdAssignment::create_ec (void) +IdAssignment::create_ec () { CosNotifyChannelAdmin::ChannelID id; CosNotification::QoSProperties initial_qos; @@ -364,7 +364,7 @@ IdAssignment::destroy_supplier_admin ( } void -IdAssignment::run_test(void) +IdAssignment::run_test() { CosNotifyChannelAdmin::ChannelID* ec_id = 0; ACE_NEW (ec_id, diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h index 329d4d2388c..4f55c09ecce 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h +++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.h @@ -18,17 +18,17 @@ class IdAssignment { public: - IdAssignment (void); - ~IdAssignment (void); + IdAssignment (); + ~IdAssignment (); int parse_args (int argc, ACE_TCHAR *argv[]); void init (int argc, ACE_TCHAR *argv[]); - void run_test (void); + void run_test (); private: - CosNotifyChannelAdmin::ChannelID create_ec (void); + CosNotifyChannelAdmin::ChannelID create_ec (); void destroy_ec (CosNotifyChannelAdmin::ChannelID id); CosNotifyChannelAdmin::AdminID create_supplier_admin ( diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp index 246a7d81f20..35efeb81fee 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp @@ -7,12 +7,12 @@ #include "LifeCycle.h" -LifeCycle::LifeCycle (void) +LifeCycle::LifeCycle () : count_ (10) { } -LifeCycle::~LifeCycle (void) +LifeCycle::~LifeCycle () { } @@ -93,7 +93,7 @@ LifeCycle::init (int argc, ACE_TCHAR *argv[]) } void -LifeCycle::run_test(void) +LifeCycle::run_test() { for (int i = 0; i < this->count_; ++i) { @@ -112,7 +112,7 @@ LifeCycle::run_test(void) } void -LifeCycle::create_ec (void) +LifeCycle::create_ec () { CosNotifyChannelAdmin::ChannelID id; CosNotification::QoSProperties initial_qos; @@ -134,7 +134,7 @@ LifeCycle::create_ec (void) } void -LifeCycle::create_supplier_admin (void) +LifeCycle::create_supplier_admin () { CosNotifyChannelAdmin::AdminID adminid; CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = @@ -156,7 +156,7 @@ LifeCycle::create_supplier_admin (void) } void -LifeCycle::create_consumer_admin (void) +LifeCycle::create_consumer_admin () { CosNotifyChannelAdmin::AdminID adminid; CosNotifyChannelAdmin::InterFilterGroupOperator ifgop = @@ -177,7 +177,7 @@ LifeCycle::create_consumer_admin (void) } void -LifeCycle::destroy_supplier_admin (void) +LifeCycle::destroy_supplier_admin () { this->supplier_admin_->destroy (); @@ -187,7 +187,7 @@ LifeCycle::destroy_supplier_admin (void) } void -LifeCycle::destroy_consumer_admin (void) +LifeCycle::destroy_consumer_admin () { this->consumer_admin_->destroy (); @@ -197,7 +197,7 @@ LifeCycle::destroy_consumer_admin (void) } void -LifeCycle::destroy_ec (void) +LifeCycle::destroy_ec () { this->ec_->destroy (); diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h index 6f036393c1f..1b3e1272dc4 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h +++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.h @@ -16,22 +16,22 @@ class LifeCycle { public: - LifeCycle (void); - ~LifeCycle (void); + LifeCycle (); + ~LifeCycle (); void init (int argc, ACE_TCHAR *argv[]); - void run_test (void); + void run_test (); int parse_args (int argc, ACE_TCHAR *argv[]); private: - void create_ec (void); - void create_supplier_admin (void); - void create_consumer_admin (void); - void destroy_ec (void); - void destroy_supplier_admin (void); - void destroy_consumer_admin (void); + void create_ec (); + void create_supplier_admin (); + void create_consumer_admin (); + void destroy_ec (); + void destroy_supplier_admin (); + void destroy_consumer_admin (); CosNotifyChannelAdmin::EventChannelFactory_var notify_factory_; CosNotifyChannelAdmin::EventChannel_var ec_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp index f772230f01b..c44e33bd117 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp @@ -50,7 +50,7 @@ MultiTypes_SequencePushConsumer::push_structured_events (const CosNotification:: /***************************************************************************/ -MultiTypes::MultiTypes (void) +MultiTypes::MultiTypes () :any_consumer_ (0), structured_consumer_ (0), sequence_consumer_ (0), @@ -197,7 +197,7 @@ MultiTypes::parse_args(int, ACE_TCHAR **) } void -MultiTypes::create_EC (void) +MultiTypes::create_EC () { CosNotifyChannelAdmin::ChannelID id; @@ -209,7 +209,7 @@ MultiTypes::create_EC (void) } void -MultiTypes::run_test (void) +MultiTypes::run_test () { // Send an Any, all consumers should receive it. CORBA::Any any; @@ -309,13 +309,13 @@ MultiTypes::wait_for_all_consumers (int expected_count_per_consumer) } void -MultiTypes::end_test (void) +MultiTypes::end_test () { consumer_done( 0 ); } int -MultiTypes::check_results (void) +MultiTypes::check_results () { // Destroy the channel. this->ec_->destroy (); diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h index 2ab66ed4b94..42bf14f16ec 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h +++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h @@ -79,7 +79,7 @@ class MultiTypes : public Notify_Test_Client { public: // Initialization and termination code. - MultiTypes (void); + MultiTypes (); virtual ~MultiTypes (); void on_received_event (MultiTypes_PushConsumer* consumer); @@ -94,20 +94,20 @@ public: ACE_TCHAR *argv []); /// Run the test. - void run_test (void); + void run_test (); /// End the test. - void end_test (void); + void end_test (); /// Check if we got the expected results. - int check_results (void); + int check_results (); protected: // Wait to receive events. void wait_for_all_consumers (int expected_count_per_consumer); /// Create EC. - void create_EC (void); + void create_EC (); /// The one channel that we create using the factory. CosNotifyChannelAdmin::EventChannel_var ec_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp index 942d4dcdaf3..95c018b7b91 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp @@ -36,19 +36,19 @@ SequencePushSupplier::SequencePushSupplier ( { } -SequencePushSupplier::~SequencePushSupplier (void) +SequencePushSupplier::~SequencePushSupplier () { } /***************************************************************************/ -Sequence::Sequence (void) +Sequence::Sequence () : event_count_ (15), supplier_batch_size_ (5), consumer_batch_size_ (3), pacing_ (2), order_policy_ (CosNotification::PriorityOrder), events_received_ (0), consumer_delay_ (1) { } -Sequence::~Sequence (void) +Sequence::~Sequence () { } @@ -188,7 +188,7 @@ Sequence::parse_args (int argc, } void -Sequence::create_EC (void) +Sequence::create_EC () { CosNotifyChannelAdmin::ChannelID id; @@ -199,7 +199,7 @@ Sequence::create_EC (void) } void -Sequence::on_event_received (void) +Sequence::on_event_received () { if (TAO_debug_level) ACE_DEBUG ((LM_DEBUG, @@ -213,7 +213,7 @@ Sequence::on_event_received (void) } void -Sequence::run_test (void) +Sequence::run_test () { // operations: CosNotification::StructuredEvent event; @@ -292,13 +292,13 @@ Sequence::run_test (void) } void -Sequence::end_test (void) +Sequence::end_test () { consumer_done( 0 ); } int -Sequence::check_results (void) +Sequence::check_results () { // Destroy the channel. this->ec_->destroy (); diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h index ebff1041c48..564cce98dba 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h @@ -47,7 +47,7 @@ public: SequencePushSupplier (Sequence * test_client); /// Destructor. - virtual ~SequencePushSupplier (void); + virtual ~SequencePushSupplier (); protected: Sequence* test_client_; @@ -59,8 +59,8 @@ class Sequence : public Notify_Test_Client { public: // Initialization and termination code. - Sequence (void); - virtual ~Sequence (void); + Sequence (); + virtual ~Sequence (); int parse_args (int argc, ACE_TCHAR *argv[]) ; @@ -70,20 +70,20 @@ public: ACE_TCHAR *argv []); /// Called when an event is received. - void on_event_received (void); + void on_event_received (); /// Run the test. - void run_test (void); + void run_test (); /// End the test. - void end_test (void); + void end_test (); /// check if we got the expected results. - int check_results (void); + int check_results (); protected: /// Create EC - void create_EC (void); + void create_EC (); /// Number of events to send int event_count_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp index add5a5317b6..eae8c77fbb8 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp @@ -32,18 +32,18 @@ Event_AnyPushSupplier::Event_AnyPushSupplier (Simple_Test* test_client) { } -Event_AnyPushSupplier::~Event_AnyPushSupplier (void) +Event_AnyPushSupplier::~Event_AnyPushSupplier () { } //*************************************************************************** -Simple_Test::Simple_Test (void) +Simple_Test::Simple_Test () : event_count_ (5) { } -Simple_Test::~Simple_Test (void) +Simple_Test::~Simple_Test () { } @@ -135,7 +135,7 @@ Simple_Test::parse_args (int argc, } void -Simple_Test::create_EC (void) +Simple_Test::create_EC () { CosNotifyChannelAdmin::ChannelID id; @@ -147,7 +147,7 @@ Simple_Test::create_EC (void) } void -Simple_Test::on_event_received (void) +Simple_Test::on_event_received () { ++this->result_count_; @@ -163,7 +163,7 @@ Simple_Test::on_event_received (void) } void -Simple_Test::run_test (void) +Simple_Test::run_test () { CORBA::Any data; @@ -176,13 +176,13 @@ Simple_Test::run_test (void) } void -Simple_Test::end_test (void) +Simple_Test::end_test () { consumer_done( 0 ); } int -Simple_Test::check_results (void) +Simple_Test::check_results () { // Destroy the channel this->ec_->destroy (); diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h index ad78485c81d..0a63e19b23b 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h @@ -50,7 +50,7 @@ public: Event_AnyPushSupplier (Simple_Test * test_client); /// Destructor. - virtual ~Event_AnyPushSupplier (void); + virtual ~Event_AnyPushSupplier (); protected: Simple_Test* test_client_; @@ -62,8 +62,8 @@ class Simple_Test : public Notify_Test_Client { public: // Initialization and termination code - Simple_Test (void); - virtual ~Simple_Test (void); + Simple_Test (); + virtual ~Simple_Test (); int parse_args (int argc, ACE_TCHAR *argv[]) ; @@ -73,20 +73,20 @@ public: ACE_TCHAR *argv []); /// Called when an event is received. - void on_event_received (void); + void on_event_received (); /// Run the test. - void run_test (void); + void run_test (); /// End the test. - void end_test (void); + void end_test (); /// check if we got the expected results. - int check_results (void); + int check_results (); protected: /// Create EC - void create_EC (void); + void create_EC (); /// Number of events received so far. ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> result_count_; diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp index 612deae2d2f..cbe9439b9b7 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp @@ -44,7 +44,7 @@ Updates_StructuredPushSupplier::subscription_change ( /***************************************************************************/ -Updates::Updates (void) +Updates::Updates () : added_count_ (0), removed_count_ (0) { } @@ -96,7 +96,7 @@ Updates::init (int argc, } void -Updates::create_EC (void) +Updates::create_EC () { CosNotifyChannelAdmin::ChannelID id; @@ -161,7 +161,7 @@ Updates::wait_for_updates (int expected_added, int expected_removed) } void -Updates::reset_counts (void) +Updates::reset_counts () { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); this->added_count_ = 0; @@ -169,7 +169,7 @@ Updates::reset_counts (void) } void -Updates::run_test (void) +Updates::run_test () { this->test_subscription_change (); @@ -182,7 +182,7 @@ Updates::run_test (void) } void -Updates::test_subscription_change (void) +Updates::test_subscription_change () { { // reset counts. @@ -300,7 +300,7 @@ Updates::test_subscription_change (void) } void -Updates::test_offer_change (void) +Updates::test_offer_change () { { // reset counts. diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h index a75cf37d52f..821a4b5453c 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h +++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h @@ -66,14 +66,14 @@ class Updates : public Notify_Test_Client { public: // Initialization and termination code - Updates (void); + Updates (); virtual ~Updates (); /// initialization. int init (int argc, ACE_TCHAR *argv []); /// Run the test. - void run_test (void); + void run_test (); /// print_event_types void print_event_types (const CosNotification::EventTypeSeq &types); @@ -86,19 +86,19 @@ public: protected: /// Create EC - void create_EC (void); + void create_EC (); /// Helper to add types. void add_type (CosNotification::EventTypeSeq& type_seq, const char* type); // test subscription_change - void test_subscription_change (void); + void test_subscription_change (); // test offer_change - void test_offer_change (void); + void test_offer_change (); /// Reset the counts. - void reset_counts (void); + void reset_counts (); /// Lock to serialize internal state. TAO_SYNCH_MUTEX lock_; diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp index 775a6705faf..80642923154 100644 --- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp @@ -38,12 +38,12 @@ public: { } - void go (void) + void go () { started_ = true; } - void done (void) + void done () { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp index 30bc187985d..78d30d45a73 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_1385_Regression/Structured_Supplier.cpp @@ -37,12 +37,12 @@ public: { } - void go (void) + void go () { started_ = true; } - void done (void) + void done () { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp index 6a7051d8fe1..6c6fe50abf2 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_2415_Regression/Supplier.cpp @@ -38,12 +38,12 @@ public: { } - void go (void) + void go () { started_ = true; } - void done (void) + void done () { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp index 704b8e90969..de467fb135a 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_2561_Regression/Supplier.cpp @@ -39,12 +39,12 @@ public: { } - void go (void) + void go () { started_ = true; } - void done (void) + void done () { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp index 67fcbe3c0f5..83261e62705 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp +++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.cpp @@ -85,7 +85,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[]) int -DllOrb::fini (void) +DllOrb::fini () { try { @@ -127,7 +127,7 @@ DllOrb::fini (void) return 0; } -int DllOrb::svc (void) +int DllOrb::svc () { ACE_DEBUG ((LM_INFO, ACE_TEXT ("svc mp_barrier->wait() ...\n"))); ma_barrier_->wait(); diff --git a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h index a4900e8b420..5689963e201 100644 --- a/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h +++ b/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/DllOrb.h @@ -12,8 +12,8 @@ class bug_3252_Export DllOrb: public ACE_Task_Base { public: - DllOrb (void); - virtual ~DllOrb (void); + DllOrb (); + virtual ~DllOrb (); CORBA::ORB_ptr orb () const { return CORBA::ORB::_duplicate(mv_orb_.in()); } diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp index f4a34751c7e..20465eccd26 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp @@ -51,12 +51,12 @@ public: { } - void go (void) + void go () { started_ = true; } - void done (void) + void done () { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp index 804b17a6b9e..2b91c8ab7e8 100644 --- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp @@ -42,12 +42,12 @@ public: { } - void go (void) + void go () { started_ = true; } - void done (void) + void done () { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp index 2224260849d..8bcdf19c2e8 100644 --- a/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp +++ b/TAO/orbsvcs/tests/Notify/MC/test_monitor.cpp @@ -38,7 +38,7 @@ public: private: void brain_dump (const char * context); void stat_dump (const char * statName); - void consumer_stats_check (void); + void consumer_stats_check (); private: ACE_CString base_; CosNotification::NotificationServiceMonitorControl_var nsm_; diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp index 911bb91a96d..da526b3a038 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp @@ -104,7 +104,7 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin, } static void -disconnect_consumers (void) +disconnect_consumers () { for (unsigned int i = 0; i < consumer_count; i++) { diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp index 24b80db3734..02e67aa9e60 100644 --- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp @@ -39,12 +39,12 @@ public: { } - void go (void) + void go () { started_ = true; } - void done (void) + void done () { started_ = false; } @@ -169,7 +169,7 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin, } static void -disconnect_suppliers (void) +disconnect_suppliers () { for (unsigned int i = 0; i < supplier_count; ++i) { diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp index 5e27ddae75e..305da5fe9b7 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp @@ -29,12 +29,12 @@ public: { } - void go (void) + void go () { started_ = true; } - void done (void) + void done () { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp index 5819d40c438..f1e9fae8521 100644 --- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp @@ -28,12 +28,12 @@ public: { } - void go (void) + void go () { started_ = true; } - void done (void) + void done () { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp index 34b575fe3b8..afb7e2e08ad 100644 --- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.cpp @@ -20,7 +20,7 @@ int EVENTS_EXPECTED_TO_RECEIVE = 9*4; // 2 consumers get the same events from 2 ACE_Atomic_Op <TAO_SYNCH_MUTEX, int> g_result_count = 0; -FilterClient::FilterClient (void) +FilterClient::FilterClient () :consumer_1 (0), consumer_2 (0), supplier_1 (0), @@ -213,7 +213,7 @@ FilterClient::run_consumer () } void -FilterClient::done (void) +FilterClient::done () { this->done_ = 1; } @@ -609,7 +609,7 @@ Filter_StructuredPushConsumer::Filter_StructuredPushConsumer (FilterClient* filt { } -Filter_StructuredPushConsumer::~Filter_StructuredPushConsumer (void) +Filter_StructuredPushConsumer::~Filter_StructuredPushConsumer () { } diff --git a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h index 14947118533..ea18634280e 100644 --- a/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h +++ b/TAO/orbsvcs/tests/Notify/Persistent_Filter/Filter.h @@ -38,7 +38,7 @@ class FilterClient { public: /// Constructor - FilterClient (void); + FilterClient (); /// Destructor ~FilterClient (); @@ -52,7 +52,7 @@ class FilterClient void run_consumer (); /// Consumer calls done, We're done. - void done (void); + void done (); protected: int parse_args (int argc, @@ -191,7 +191,7 @@ protected: // = Methods /// Destructor - virtual ~Filter_StructuredPushConsumer (void); + virtual ~Filter_StructuredPushConsumer (); // = NotifyPublish method virtual void offer_change ( diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp index 1fc535fc299..13f19d81ebe 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.cpp @@ -4,7 +4,7 @@ #include "../lib/LookupManager.h" #include "RT_Priority_Mapping.h" -TAO_Notify_Tests_RT_Application_Command::TAO_Notify_Tests_RT_Application_Command (void) +TAO_Notify_Tests_RT_Application_Command::TAO_Notify_Tests_RT_Application_Command () { } @@ -13,7 +13,7 @@ TAO_Notify_Tests_RT_Application_Command::~TAO_Notify_Tests_RT_Application_Comman } void -TAO_Notify_Tests_RT_Application_Command::handle_init (void) +TAO_Notify_Tests_RT_Application_Command::handle_init () { // Call the Base class. TAO_Notify_Tests_Application_Command::handle_init (); diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h index eaa28d78de7..41a0e128742 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Application_Command.h @@ -26,12 +26,12 @@ class TAO_RT_NOTIFY_TEST_Export TAO_Notify_Tests_RT_Application_Command : public { public: /// Constructor - TAO_Notify_Tests_RT_Application_Command (void); + TAO_Notify_Tests_RT_Application_Command (); /// Destructor ~TAO_Notify_Tests_RT_Application_Command (); - virtual void handle_init (void); + virtual void handle_init (); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp index 9672f19024d..c314ac0cb78 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp @@ -5,7 +5,7 @@ #include "../lib/LookupManager.h" #include "../lib/Name.h" -TAO_Notify_Tests_RT_POA_Command::TAO_Notify_Tests_RT_POA_Command (void) +TAO_Notify_Tests_RT_POA_Command::TAO_Notify_Tests_RT_POA_Command () :priority_model_ (RTCORBA::CLIENT_PROPAGATED) , server_priority_ (0) , thread_pool_static_threads_ (0) @@ -18,13 +18,13 @@ TAO_Notify_Tests_RT_POA_Command::~TAO_Notify_Tests_RT_POA_Command () } const char* -TAO_Notify_Tests_RT_POA_Command::get_name (void) +TAO_Notify_Tests_RT_POA_Command::get_name () { return TAO_Notify_Tests_RT_POA_Command::name (); } const char* -TAO_Notify_Tests_RT_POA_Command::name (void) +TAO_Notify_Tests_RT_POA_Command::name () { return TAO_Notify_Tests_Name::poa_command; } @@ -174,7 +174,7 @@ TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter) } void -TAO_Notify_Tests_RT_POA_Command::execute_i (void) +TAO_Notify_Tests_RT_POA_Command::execute_i () { if (this->command_ == CREATE) { diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h index 19188d711f6..110c1cbf2c6 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h @@ -30,7 +30,7 @@ class TAO_RT_NOTIFY_TEST_Export TAO_Notify_Tests_RT_POA_Command : public TAO_Not { public: /// Constructor - TAO_Notify_Tests_RT_POA_Command (void); + TAO_Notify_Tests_RT_POA_Command (); /// Destructor ~TAO_Notify_Tests_RT_POA_Command (); @@ -40,11 +40,11 @@ public: virtual void init (ACE_Arg_Shifter& arg_shifter); /// Execute the command. - virtual void execute_i (void); + virtual void execute_i (); /// Get the command name. - virtual const char* get_name (void); - static const char* name (void); + virtual const char* get_name (); + static const char* name (); protected: /// Create the POA with the params parsed. diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp index 4545dc048f5..05512d1b4d5 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.cpp @@ -3,7 +3,7 @@ #include "../lib/LookupManager.h" -TAO_Notify_Tests_RT_Priority_Mapping::~TAO_Notify_Tests_RT_Priority_Mapping (void) +TAO_Notify_Tests_RT_Priority_Mapping::~TAO_Notify_Tests_RT_Priority_Mapping () { } diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h index a8e7f5f2b2a..552a017a100 100644 --- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h +++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_Priority_Mapping.h @@ -27,7 +27,7 @@ class TAO_RT_NOTIFY_TEST_Export TAO_Notify_Tests_RT_Priority_Mapping : public TA { public: /// The destructor - virtual ~TAO_Notify_Tests_RT_Priority_Mapping (void); + virtual ~TAO_Notify_Tests_RT_Priority_Mapping (); /// Init the Mapping manager. void init (CORBA::ORB_ptr orb); diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp index b6583729658..4ac6284aa81 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp @@ -679,7 +679,7 @@ ReconnectionCallback_i::reconnect (CORBA::Object_ptr reconnection) } CORBA::Boolean -ReconnectionCallback_i::is_alive (void) +ReconnectionCallback_i::is_alive () { return true; } @@ -694,7 +694,7 @@ ReconnectionCallback_i::~ReconnectionCallback_i () void -ReconnectionCallback_i::fini (void) +ReconnectionCallback_i::fini () { if (this->id_is_valid_) { @@ -1108,7 +1108,7 @@ Consumer_Main::reconnect ( int -Consumer_Main::resolve_naming_service (void) +Consumer_Main::resolve_naming_service () { // ignore redundant calls if (CORBA::is_nil (this->naming_context_.in ())) @@ -1124,7 +1124,7 @@ Consumer_Main::resolve_naming_service (void) } int -Consumer_Main::find_notify_factory (void) +Consumer_Main::find_notify_factory () { int status = this->resolve_naming_service (); if (status) @@ -1143,7 +1143,7 @@ Consumer_Main::find_notify_factory (void) } int -Consumer_Main::resolve_notify_factory (void) +Consumer_Main::resolve_notify_factory () { CORBA::Object_var factory_obj = this->orb_->resolve_initial_references (NOTIFY_FACTORY_NAME); @@ -1155,7 +1155,7 @@ Consumer_Main::resolve_notify_factory (void) } void -Consumer_Main::init_event_channel (void) +Consumer_Main::init_event_channel () { bool ok = false; if (this->reconnecting_) @@ -1275,7 +1275,7 @@ Consumer_Main::init_event_channel (void) CosNotifyChannelAdmin::AdminID default_admin_id = static_cast<CosNotifyChannelAdmin::AdminID>(-1); void -Consumer_Main::init_consumer_admin (void) +Consumer_Main::init_consumer_admin () { bool ok = false; if (this->reconnecting_) @@ -1388,7 +1388,7 @@ Consumer_Main::init_consumer_admin (void) } } void -Consumer_Main::init_structured_proxy_supplier (void) +Consumer_Main::init_structured_proxy_supplier () { bool ok = false; CosNotifyChannelAdmin::ProxySupplier_var proxy; @@ -1478,7 +1478,7 @@ Consumer_Main::init_structured_proxy_supplier (void) } void -Consumer_Main::init_sequence_proxy_supplier (void) +Consumer_Main::init_sequence_proxy_supplier () { bool ok = false; CosNotifyChannelAdmin::ProxySupplier_var proxy; @@ -1580,7 +1580,7 @@ Consumer_Main::set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy) } void -Consumer_Main::init_any_proxy_supplier (void) +Consumer_Main::init_any_proxy_supplier () { bool ok = false; CosNotifyChannelAdmin::ProxySupplier_var proxy; @@ -1676,7 +1676,7 @@ Consumer_Main::init_any_proxy_supplier (void) this->any_push_consumer_.set_connected(true); } -int Consumer_Main::fini (void) +int Consumer_Main::fini () { this->reconnection_callback_.fini (); @@ -1711,7 +1711,7 @@ int Consumer_Main::fini (void) } -int Consumer_Main::run (void) +int Consumer_Main::run () { int result = 0; diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h index 46491df04be..39589a2c2fc 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.h @@ -139,13 +139,13 @@ public: PortableServer::POA_ptr poa, CosNotifyChannelAdmin::EventChannelFactory_ptr ecf_); - void fini (void); + void fini (); size_t reconnect_count () const; virtual void reconnect (CORBA::Object_ptr reconnection); - virtual CORBA::Boolean is_alive (void); + virtual CORBA::Boolean is_alive (); private: Consumer_Main & consumer_main_; @@ -165,8 +165,8 @@ class Consumer_Main int parse_single_arg (int argc, ACE_TCHAR *argv[]); int init (int argc, ACE_TCHAR *argv[]); - int run (void); - int fini (void); + int run (); + int fini (); void usage (FILE * log) const; void reconnect ( @@ -174,19 +174,19 @@ class Consumer_Main private: /// Find naming service. - int resolve_naming_service (void); + int resolve_naming_service (); /// Resolve the Notify factory from the Naming service. - int find_notify_factory (void); + int find_notify_factory (); /// Resolve the Notify factory using resolve_initial_reference ("NotifyEventChannelFactory") - int resolve_notify_factory (void); + int resolve_notify_factory (); - void init_event_channel (void); - void init_consumer_admin (void); - void init_structured_proxy_supplier (void); - void init_sequence_proxy_supplier (void); - void init_any_proxy_supplier (void); + void init_event_channel (); + void init_consumer_admin (); + void init_structured_proxy_supplier (); + void init_sequence_proxy_supplier (); + void init_any_proxy_supplier (); void set_proxy_qos (CosNotifyChannelAdmin::ProxySupplier_ptr proxy); diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp index c94aaef6509..1e58c719da2 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp @@ -118,7 +118,7 @@ ReconnectionCallback_i::reconnect (CORBA::Object_ptr reconnection) } CORBA::Boolean -ReconnectionCallback_i::is_alive (void) +ReconnectionCallback_i::is_alive () { return true; } @@ -132,7 +132,7 @@ ReconnectionCallback_i::~ReconnectionCallback_i () void -ReconnectionCallback_i::fini (void) +ReconnectionCallback_i::fini () { if (this->id_is_valid_) { @@ -502,7 +502,7 @@ Supplier_Main::reconnect ( int -Supplier_Main::resolve_naming_service (void) +Supplier_Main::resolve_naming_service () { // ignore redundant calls if (CORBA::is_nil (this->naming_context_.in ())) @@ -518,7 +518,7 @@ Supplier_Main::resolve_naming_service (void) } int -Supplier_Main::find_notify_factory (void) +Supplier_Main::find_notify_factory () { int status = this->resolve_naming_service (); if (status) @@ -537,7 +537,7 @@ Supplier_Main::find_notify_factory (void) } int -Supplier_Main::resolve_notify_factory (void) +Supplier_Main::resolve_notify_factory () { CORBA::Object_var factory_obj = this->orb_->resolve_initial_references (NOTIFY_FACTORY_NAME); @@ -549,7 +549,7 @@ Supplier_Main::resolve_notify_factory (void) } void -Supplier_Main::init_event_channel (void) +Supplier_Main::init_event_channel () { bool ok = false; if (this->reconnecting_) @@ -669,7 +669,7 @@ Supplier_Main::init_event_channel (void) CosNotifyChannelAdmin::AdminID default_admin_id = static_cast<CosNotifyChannelAdmin::AdminID>(-1); void -Supplier_Main::init_supplier_admin (void) +Supplier_Main::init_supplier_admin () { bool ok = false; if (this->reconnecting_ && this->sa_id_ != default_admin_id) @@ -734,7 +734,7 @@ Supplier_Main::init_supplier_admin (void) } void -Supplier_Main::init_structured_proxy_consumer (void) +Supplier_Main::init_structured_proxy_consumer () { bool ok = false; CosNotifyChannelAdmin::ProxyConsumer_var proxy; @@ -810,7 +810,7 @@ Supplier_Main::init_structured_proxy_consumer (void) } void -Supplier_Main::init_sequence_proxy_consumer (void) +Supplier_Main::init_sequence_proxy_consumer () { bool ok = false; CosNotifyChannelAdmin::ProxyConsumer_var proxy; @@ -886,7 +886,7 @@ Supplier_Main::init_sequence_proxy_consumer (void) } void -Supplier_Main::init_any_proxy_consumer (void) +Supplier_Main::init_any_proxy_consumer () { bool ok = false; CosNotifyChannelAdmin::ProxyConsumer_var proxy; @@ -961,7 +961,7 @@ Supplier_Main::init_any_proxy_consumer (void) any_push_supplier_ref_.in ()); } -int Supplier_Main::fini (void) +int Supplier_Main::fini () { if (this->disconnect_on_exit_) { @@ -1012,7 +1012,7 @@ int Supplier_Main::fini (void) return 0; } -void Supplier_Main::send_structured_event (void) +void Supplier_Main::send_structured_event () { CosNotification::StructuredEvent event; @@ -1058,7 +1058,7 @@ void Supplier_Main::send_structured_event (void) this->structured_proxy_push_consumer_->push_structured_event (event); } -void Supplier_Main::send_sequence_event (void) +void Supplier_Main::send_sequence_event () { CosNotification::EventBatch event_batch(1); event_batch.length (1); @@ -1106,7 +1106,7 @@ void Supplier_Main::send_sequence_event (void) this->sequence_proxy_push_consumer_->push_structured_events (event_batch); } -void Supplier_Main::send_any_event (void) +void Supplier_Main::send_any_event () { CORBA::Any event; event <<= CORBA::ULong (this->serial_number_); @@ -1122,7 +1122,7 @@ void Supplier_Main::send_any_event (void) this->any_proxy_push_consumer_->push (event); } -int Supplier_Main::run (void) +int Supplier_Main::run () { int result = 0; bool paused = false; diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h index fa0a3988c89..c1d529325e8 100644 --- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h +++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.h @@ -26,7 +26,7 @@ class StructuredPushSupplier_i : public virtual POA_CosNotifyComm::StructuredPus const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed); - virtual void disconnect_structured_push_supplier (void); + virtual void disconnect_structured_push_supplier (); }; class SequencePushSupplier_i : public virtual POA_CosNotifyComm::SequencePushSupplier @@ -35,7 +35,7 @@ class SequencePushSupplier_i : public virtual POA_CosNotifyComm::SequencePushSup const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed); - virtual void disconnect_sequence_push_supplier (void); + virtual void disconnect_sequence_push_supplier (); }; class AnyPushSupplier_i : public virtual POA_CosNotifyComm::PushSupplier @@ -44,7 +44,7 @@ class AnyPushSupplier_i : public virtual POA_CosNotifyComm::PushSupplier const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed); - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); }; class ReconnectionCallback_i : public virtual POA_NotifyExt::ReconnectionCallback @@ -58,13 +58,13 @@ public: PortableServer::POA_ptr poa, CosNotifyChannelAdmin::EventChannelFactory_ptr ecf_); - void fini (void); + void fini (); size_t reconnect_count () const; virtual void reconnect (CORBA::Object_ptr reconnection); - virtual CORBA::Boolean is_alive (void); + virtual CORBA::Boolean is_alive (); private: Supplier_Main & supplier_main_; @@ -84,8 +84,8 @@ class Supplier_Main int parse_single_arg (int argc, ACE_TCHAR *argv[]); int init (int argc, ACE_TCHAR *argv[]); - int run (void); - int fini (void); + int run (); + int fini (); void usage (FILE * log) const; void reconnect ( @@ -93,24 +93,24 @@ class Supplier_Main private: /// Find naming service. - int resolve_naming_service (void); + int resolve_naming_service (); /// Resolve the Notify factory from the Naming service. - int find_notify_factory (void); + int find_notify_factory (); /// Resolve the Notify factory using resolve_initial_reference ("NotifyEventChannelFactory") - int resolve_notify_factory (void); + int resolve_notify_factory (); - void init_event_channel (void); - void init_supplier_admin (void); - void init_structured_proxy_consumer (void); - void init_sequence_proxy_consumer (void); - void init_any_proxy_consumer (void); + void init_event_channel (); + void init_supplier_admin (); + void init_structured_proxy_consumer (); + void init_sequence_proxy_consumer (); + void init_any_proxy_consumer (); /// send events. - void send_structured_event (void); - void send_sequence_event (void); - void send_any_event (void); + void send_structured_event (); + void send_sequence_event (); + void send_any_event (); void save_ids(); bool load_ids(); diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp index 574b52a02dd..e4a5a526401 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Supplier.cpp @@ -38,12 +38,12 @@ public: { } - void go (void) + void go () { started_ = true; } - void done (void) + void done () { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp index fd89827869b..1c243044ec6 100644 --- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp @@ -40,12 +40,12 @@ public: { } - void go (void) + void go () { started_ = true; } - void done (void) + void done () { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp index a954f64c908..c7dd4fc303b 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp @@ -29,12 +29,12 @@ public: { } - void go (void) + void go () { started_ = true; } - void done (void) + void done () { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp index c3099b60ae0..551a8146bd2 100644 --- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp @@ -30,12 +30,12 @@ public: { } - void go (void) + void go () { started_ = true; } - void done (void) + void done () { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp index d0866878b38..483a288dcf5 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp @@ -5,7 +5,7 @@ #include "tao/RTCORBA/Thread_Pool.h" #include "tao/PortableServer/Root_POA.h" -TAO_Notify_Tests_RT_Test_Filter::TAO_Notify_Tests_RT_Test_Filter (void) +TAO_Notify_Tests_RT_Test_Filter::TAO_Notify_Tests_RT_Test_Filter () : expected_pool_id_ (0) , expected_lane_id_ (0) { @@ -16,7 +16,7 @@ TAO_Notify_Tests_RT_Test_Filter::~TAO_Notify_Tests_RT_Test_Filter () } char* -TAO_Notify_Tests_RT_Test_Filter::constraint_grammar (void) +TAO_Notify_Tests_RT_Test_Filter::constraint_grammar () { return CORBA::string_dup ("ETCL"); } @@ -82,18 +82,18 @@ TAO_Notify_Tests_RT_Test_Filter::get_constraints (const CosNotifyFilter::Constra } CosNotifyFilter::ConstraintInfoSeq * -TAO_Notify_Tests_RT_Test_Filter::get_all_constraints (void) +TAO_Notify_Tests_RT_Test_Filter::get_all_constraints () { return 0; } void -TAO_Notify_Tests_RT_Test_Filter::remove_all_constraints (void) +TAO_Notify_Tests_RT_Test_Filter::remove_all_constraints () { } void -TAO_Notify_Tests_RT_Test_Filter::destroy (void) +TAO_Notify_Tests_RT_Test_Filter::destroy () { ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, ace_mon, this->lock_, CORBA::INTERNAL ()); @@ -229,7 +229,7 @@ TAO_Notify_Tests_RT_Test_Filter::detach_callback ( } CosNotifyFilter::CallbackIDSeq * -TAO_Notify_Tests_RT_Test_Filter::get_callbacks (void) +TAO_Notify_Tests_RT_Test_Filter::get_callbacks () { throw CORBA::NO_IMPLEMENT (); } diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h index dba718ad1d0..20a45a7890b 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.h @@ -32,13 +32,13 @@ class TAO_RT_Test_Filter_Export TAO_Notify_Tests_RT_Test_Filter { public: /// Constructor - TAO_Notify_Tests_RT_Test_Filter (void); + TAO_Notify_Tests_RT_Test_Filter (); /// Destructor ~TAO_Notify_Tests_RT_Test_Filter (); protected: - virtual char * constraint_grammar (void); + virtual char * constraint_grammar (); virtual CosNotifyFilter::ConstraintInfoSeq * add_constraints (const CosNotifyFilter::ConstraintExpSeq & constraint_list); @@ -47,11 +47,11 @@ protected: virtual CosNotifyFilter::ConstraintInfoSeq * get_constraints (const CosNotifyFilter::ConstraintIDSeq & id_list); - virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (void); + virtual CosNotifyFilter::ConstraintInfoSeq * get_all_constraints (); - virtual void remove_all_constraints (void); + virtual void remove_all_constraints (); - virtual void destroy (void); + virtual void destroy (); virtual CORBA::Boolean match (const CORBA::Any & filterable_data); @@ -63,7 +63,7 @@ protected: virtual void detach_callback (CosNotifyFilter::CallbackID callback); - virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (void); + virtual CosNotifyFilter::CallbackIDSeq * get_callbacks (); protected: /// Lock to serialize access to data members. diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp index b5299870f68..56f8f4899d0 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.cpp @@ -5,7 +5,7 @@ #include "tao/debug.h" #include "ace/OS_NS_string.h" -TAO_Notify_Tests_RT_Test_FilterFactory::TAO_Notify_Tests_RT_Test_FilterFactory (void) +TAO_Notify_Tests_RT_Test_FilterFactory::TAO_Notify_Tests_RT_Test_FilterFactory () { } @@ -28,7 +28,7 @@ TAO_Notify_Tests_RT_Test_FilterFactory::create (PortableServer::POA_ptr filter_p } void -TAO_Notify_Tests_RT_Test_FilterFactory::destroy (void) +TAO_Notify_Tests_RT_Test_FilterFactory::destroy () { if (CORBA::is_nil(this->filter_poa_.in ())) return; @@ -96,7 +96,7 @@ TAO_Notify_Tests_RT_Test_FilterFactory::get_filter (const TAO_Notify_Object::ID& } void -TAO_Notify_Tests_RT_Test_FilterFactory::release (void) +TAO_Notify_Tests_RT_Test_FilterFactory::release () { delete this; //@@ inform factory diff --git a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h index 67545801b90..84f14e864ef 100644 --- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h +++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_FilterFactory.h @@ -34,7 +34,7 @@ class TAO_RT_Test_Filter_Export TAO_Notify_Tests_RT_Test_FilterFactory { public: /// Constructor - TAO_Notify_Tests_RT_Test_FilterFactory (void); + TAO_Notify_Tests_RT_Test_FilterFactory (); /// Destructor ~TAO_Notify_Tests_RT_Test_FilterFactory (); @@ -42,7 +42,7 @@ public: ///= TAO_Notify_Tests_FilterFactory methods. virtual CosNotifyFilter::FilterFactory_ptr create (PortableServer::POA_ptr filter_poa); - virtual void destroy (void); + virtual void destroy (); ///= CosNotifyFilter::FilterFactory methods @@ -57,7 +57,7 @@ public: protected: /// Release this object. - virtual void release (void); + virtual void release (); /// The POA in which to activate the Filters. PortableServer::POA_var filter_poa_; diff --git a/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp index fc060a2ffbd..5a8e6fe258d 100644 --- a/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/Timeout/Structured_Supplier.cpp @@ -32,12 +32,12 @@ public: { } - void go (void) + void go () { started_ = true; } - void done (void) + void done () { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp index b8c8f6c45bb..be12aa0b2b0 100644 --- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp +++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp @@ -22,7 +22,7 @@ class TestSupplier : public POA_CosNotifyComm::StructuredPushSupplier { - virtual void disconnect_structured_push_supplier(void) + virtual void disconnect_structured_push_supplier() { } @@ -35,7 +35,7 @@ class TestSupplier class TestConsumer : public POA_CosNotifyComm::StructuredPushConsumer { - virtual void disconnect_structured_push_consumer(void) + virtual void disconnect_structured_push_consumer() { } diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp index 4f92d781e16..164aa7a40cd 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp @@ -6,7 +6,7 @@ #include "Name.h" #include "ace/Barrier.h" -TAO_Notify_Tests_Activation_Manager::TAO_Notify_Tests_Activation_Manager (void) +TAO_Notify_Tests_Activation_Manager::TAO_Notify_Tests_Activation_Manager () : barrier_ (0) , active_suppliers_ (0) , active_consumers_ (0) @@ -67,7 +67,7 @@ TAO_Notify_Tests_Activation_Manager::done (TAO_Notify_Tests_Periodic_Consumer* / } void -TAO_Notify_Tests_Activation_Manager::wait_for_completion (void) +TAO_Notify_Tests_Activation_Manager::wait_for_completion () { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); @@ -76,13 +76,13 @@ TAO_Notify_Tests_Activation_Manager::wait_for_completion (void) } int -TAO_Notify_Tests_Activation_Manager::supplier_count (void) +TAO_Notify_Tests_Activation_Manager::supplier_count () { return ACE_Utils::truncate_cast<int> (this->supplier_map_.current_size ()); } int -TAO_Notify_Tests_Activation_Manager::consumer_count (void) +TAO_Notify_Tests_Activation_Manager::consumer_count () { return ACE_Utils::truncate_cast<int> (this->consumer_map_.current_size ()); } @@ -144,7 +144,7 @@ TAO_Notify_Tests_Activation_Manager::resolve (TAO_Notify_Tests_Periodic_Consumer } int -TAO_Notify_Tests_Activation_Manager::activate_suppliers (void) +TAO_Notify_Tests_Activation_Manager::activate_suppliers () { TAO_Notify_Tests_PeriodicSupplier_Iterator iter(this->supplier_map_); @@ -218,7 +218,7 @@ TAO_Notify_Tests_Activation_Manager::dump_stats (int dump_samples) } void -TAO_Notify_Tests_Activation_Manager::write_ior (void) +TAO_Notify_Tests_Activation_Manager::write_ior () { PortableServer::ServantBase_var servant_var (this); @@ -242,7 +242,7 @@ TAO_Notify_Tests_Activation_Manager::write_ior (void) } void -TAO_Notify_Tests_Activation_Manager::wait_for_start_signal (void) +TAO_Notify_Tests_Activation_Manager::wait_for_start_signal () { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); @@ -251,7 +251,7 @@ TAO_Notify_Tests_Activation_Manager::wait_for_start_signal (void) } void -TAO_Notify_Tests_Activation_Manager::start (void) +TAO_Notify_Tests_Activation_Manager::start () { ACE_GUARD (TAO_SYNCH_MUTEX, mon, this->lock_); @@ -261,7 +261,7 @@ TAO_Notify_Tests_Activation_Manager::start (void) } void -TAO_Notify_Tests_Activation_Manager::signal_peer (void) +TAO_Notify_Tests_Activation_Manager::signal_peer () { CORBA::ORB_var orb; LOOKUP_MANAGER->resolve (orb); diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h index ad1133a038a..65010114bbf 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h +++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h @@ -44,13 +44,13 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Activation_Manager : public TAO_No public: /// Constructor - TAO_Notify_Tests_Activation_Manager (void); + TAO_Notify_Tests_Activation_Manager (); /// Destructor virtual ~TAO_Notify_Tests_Activation_Manager (); /// Interface impl. - virtual void start (void); + virtual void start (); /// Register Supplier void _register (TAO_Notify_Tests_Periodic_Supplier* supplier, const char* obj_name); @@ -64,16 +64,16 @@ public: void resolve (TAO_Notify_Tests_Periodic_Consumer*& consumer, const char* obj_name); // Activate the tasks for each supplier. - int activate_suppliers (void); + int activate_suppliers (); // Supplier Count - int supplier_count (void); + int supplier_count (); // Consumer Count - int consumer_count (void); + int consumer_count (); /// Wait till active suppliers and consumers are done. - void wait_for_completion (void); + void wait_for_completion (); /// TAO_Notify_Tests_Task_Callback methods virtual void done (TAO_Notify_Tests_Periodic_Supplier* supplier); @@ -88,9 +88,9 @@ public: // Returns 1 if the file could be opened for read. int ior_input_file (const ACE_TCHAR *file_name); - void write_ior (void); - void wait_for_start_signal (void); - void signal_peer (void); + void write_ior (); + void wait_for_start_signal (); + void signal_peer (); protected: /// Lock to serialize internal state. diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp index 071e9000daf..8e462cdb5a2 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp @@ -8,7 +8,7 @@ #include "Driver_Base.h" #include "Priority_Mapping.h" -TAO_Notify_Tests_Application_Command::TAO_Notify_Tests_Application_Command (void) +TAO_Notify_Tests_Application_Command::TAO_Notify_Tests_Application_Command () : dump_samples_ (0) { } @@ -18,13 +18,13 @@ TAO_Notify_Tests_Application_Command::~TAO_Notify_Tests_Application_Command () } const char* -TAO_Notify_Tests_Application_Command::get_name (void) +TAO_Notify_Tests_Application_Command::get_name () { return TAO_Notify_Tests_Application_Command::name (); } const char* -TAO_Notify_Tests_Application_Command::name (void) +TAO_Notify_Tests_Application_Command::name () { return TAO_Notify_Tests_Name::application_command; } @@ -89,7 +89,7 @@ TAO_Notify_Tests_Application_Command::init (ACE_Arg_Shifter& arg_shifter) } void -TAO_Notify_Tests_Application_Command::handle_init (void) +TAO_Notify_Tests_Application_Command::handle_init () { /// Fetch the root poa. PortableServer::POA_var root_poa; @@ -107,7 +107,7 @@ TAO_Notify_Tests_Application_Command::handle_init (void) } void -TAO_Notify_Tests_Application_Command::handle_wait_for_completion (void) +TAO_Notify_Tests_Application_Command::handle_wait_for_completion () { ACE_DEBUG ((LM_DEBUG, "(%P, %t) Waiting for suppliers and consumers to finish...\n")); @@ -118,7 +118,7 @@ TAO_Notify_Tests_Application_Command::handle_wait_for_completion (void) } void -TAO_Notify_Tests_Application_Command::handle_shutdown (void) +TAO_Notify_Tests_Application_Command::handle_shutdown () { ACE_DEBUG ((LM_DEBUG, "(%P, %t)Shutting down the Application...\n")); @@ -129,7 +129,7 @@ TAO_Notify_Tests_Application_Command::handle_shutdown (void) } void -TAO_Notify_Tests_Application_Command::handle_dump_stats (void) +TAO_Notify_Tests_Application_Command::handle_dump_stats () { ACE_DEBUG ((LM_DEBUG, "(%P, %t)Dumpimg stats...\n")); @@ -140,7 +140,7 @@ TAO_Notify_Tests_Application_Command::handle_dump_stats (void) } void -TAO_Notify_Tests_Application_Command::handle_run (void) +TAO_Notify_Tests_Application_Command::handle_run () { // Run the Consumers @@ -156,7 +156,7 @@ TAO_Notify_Tests_Application_Command::handle_run (void) } void -TAO_Notify_Tests_Application_Command::handle_signal_peer (void) +TAO_Notify_Tests_Application_Command::handle_signal_peer () { TAO_Notify_Tests_Activation_Manager* act_mgr = 0; LOOKUP_MANAGER->resolve (act_mgr); @@ -165,7 +165,7 @@ TAO_Notify_Tests_Application_Command::handle_signal_peer (void) } void -TAO_Notify_Tests_Application_Command::handle_wait_to_start (void) +TAO_Notify_Tests_Application_Command::handle_wait_to_start () { TAO_Notify_Tests_Activation_Manager* act_mgr = 0; LOOKUP_MANAGER->resolve (act_mgr); @@ -176,7 +176,7 @@ TAO_Notify_Tests_Application_Command::handle_wait_to_start (void) } void -TAO_Notify_Tests_Application_Command::execute_i (void) +TAO_Notify_Tests_Application_Command::execute_i () { if (this->command_ == INIT) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h index 7304c92558e..1f7ecaefee3 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h @@ -29,7 +29,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Application_Command : public TAO_N { public: /// Constructor - TAO_Notify_Tests_Application_Command (void); + TAO_Notify_Tests_Application_Command (); /// Destructor ~TAO_Notify_Tests_Application_Command (); @@ -38,11 +38,11 @@ public: virtual void init (ACE_Arg_Shifter& arg_shifter); /// Execute the command. - virtual void execute_i (void); + virtual void execute_i (); /// Get the command name. - virtual const char* get_name (void); - static const char* name (void); + virtual const char* get_name (); + static const char* name (); protected: #ifdef HPUX_11 @@ -65,13 +65,13 @@ protected: int dump_samples_; ///= Handlers - virtual void handle_init (void); - void handle_run (void); - void handle_wait_for_completion (void); - void handle_shutdown (void); - void handle_dump_stats (void); - void handle_signal_peer (void); - void handle_wait_to_start (void); + virtual void handle_init (); + void handle_run (); + void handle_wait_for_completion (); + void handle_shutdown (); + void handle_dump_stats (); + void handle_signal_peer (); + void handle_wait_to_start (); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp index 4b7de8fcb56..c90be14789c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp @@ -6,7 +6,7 @@ #include "ace/Log_Msg.h" -TAO_Notify_Tests_Command::TAO_Notify_Tests_Command (void) +TAO_Notify_Tests_Command::TAO_Notify_Tests_Command () :next_ (0), command_ (INVALID) { } @@ -28,7 +28,7 @@ TAO_Notify_Tests_Command::next (TAO_Notify_Tests_Command* command) } void -TAO_Notify_Tests_Command::execute (void) +TAO_Notify_Tests_Command::execute () { if (this->command_ == INVALID) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.h b/TAO/orbsvcs/tests/Notify/lib/Command.h index 7321fa1a190..a338e2a9587 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command.h @@ -36,7 +36,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Command friend class TAO_Notify_Tests_Command_Builder; public: /// Constructor - TAO_Notify_Tests_Command (void); + TAO_Notify_Tests_Command (); /// Destructor virtual ~TAO_Notify_Tests_Command (); @@ -51,7 +51,7 @@ public: virtual const char* get_name (void)= 0; ///= Each derived type must also implement the following signature: - // static const char* name (void); + // static const char* name (); protected: /// Next command after this one. diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp index 9b76abd6578..1f5f3629983 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp @@ -6,7 +6,7 @@ #include "Name.h" -TAO_Notify_Tests_Command_Builder::TAO_Notify_Tests_Command_Builder (void) +TAO_Notify_Tests_Command_Builder::TAO_Notify_Tests_Command_Builder () : start_command_ (0), last_command_ (0) { @@ -57,7 +57,7 @@ TAO_Notify_Tests_Command_Builder::init (int argc, ACE_TCHAR *argv[]) } int -TAO_Notify_Tests_Command_Builder::fini (void) +TAO_Notify_Tests_Command_Builder::fini () { return 0; } @@ -72,7 +72,7 @@ TAO_Notify_Tests_Command_Builder::_register (ACE_CString command_factory_name, T } void -TAO_Notify_Tests_Command_Builder::execute (void) +TAO_Notify_Tests_Command_Builder::execute () { if (this->start_command_) this->start_command_->execute (); diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp index b9e7c2e70c3..2d391ce2495 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.cpp @@ -2,7 +2,7 @@ #include "Command_Factory.h" -TAO_Notify_Tests_Command_Factory::TAO_Notify_Tests_Command_Factory (void) +TAO_Notify_Tests_Command_Factory::TAO_Notify_Tests_Command_Factory () { } diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h index 8a9238ac437..9e3af149a3a 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory.h @@ -26,7 +26,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Command_Factory { public: /// Constructor - TAO_Notify_Tests_Command_Factory (void); + TAO_Notify_Tests_Command_Factory (); /// Destructor virtual ~TAO_Notify_Tests_Command_Factory (); diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp index f4b2ebdf7b7..ba80b5e4382 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.cpp @@ -10,7 +10,7 @@ #include "Name.h" template <class COMMAND> -TAO_Notify_Tests_Command_Factory_T<COMMAND>::TAO_Notify_Tests_Command_Factory_T (void) +TAO_Notify_Tests_Command_Factory_T<COMMAND>::TAO_Notify_Tests_Command_Factory_T () { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Creating command factory for %s\n", COMMAND::name())); @@ -36,13 +36,13 @@ TAO_Notify_Tests_Command_Factory_T<COMMAND>::init (int /*argc*/, ACE_TCHAR/*argv } template <class COMMAND> int -TAO_Notify_Tests_Command_Factory_T<COMMAND>::fini (void) +TAO_Notify_Tests_Command_Factory_T<COMMAND>::fini () { return 0; } template <class COMMAND> TAO_Notify_Tests_Command* -TAO_Notify_Tests_Command_Factory_T<COMMAND>::create (void) +TAO_Notify_Tests_Command_Factory_T<COMMAND>::create () { return new COMMAND (); } diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h index 6c2c7fd18e0..4cc0689e70c 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Command_Factory_T.h @@ -34,7 +34,7 @@ class TAO_Notify_Tests_Command_Factory_T : public TAO_Notify_Tests_Command_Facto { public: /// Constructor - TAO_Notify_Tests_Command_Factory_T (void); + TAO_Notify_Tests_Command_Factory_T (); /// Destructor ~TAO_Notify_Tests_Command_Factory_T (); @@ -44,7 +44,7 @@ public: virtual int fini (); /// Create the <COMMAND> command. - TAO_Notify_Tests_Command* create (void); + TAO_Notify_Tests_Command* create (); }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp index 7aa1dac3b08..2e8163b495d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp @@ -5,7 +5,7 @@ #include "Name.h" #include "Options_Parser.h" -TAO_Notify_Tests_ConsumerAdmin_Command::TAO_Notify_Tests_ConsumerAdmin_Command (void) +TAO_Notify_Tests_ConsumerAdmin_Command::TAO_Notify_Tests_ConsumerAdmin_Command () :ifgop_ (CosNotifyChannelAdmin::OR_OP), id_ (0) { } @@ -15,19 +15,19 @@ TAO_Notify_Tests_ConsumerAdmin_Command::~TAO_Notify_Tests_ConsumerAdmin_Command } const char* -TAO_Notify_Tests_ConsumerAdmin_Command::get_name (void) +TAO_Notify_Tests_ConsumerAdmin_Command::get_name () { return TAO_Notify_Tests_ConsumerAdmin_Command::name (); } const char* -TAO_Notify_Tests_ConsumerAdmin_Command::name (void) +TAO_Notify_Tests_ConsumerAdmin_Command::name () { return TAO_Notify_Tests_Name::consumer_admin_command; } void -TAO_Notify_Tests_ConsumerAdmin_Command::handle_create (void) +TAO_Notify_Tests_ConsumerAdmin_Command::handle_create () { CosNotifyChannelAdmin::EventChannel_var ec; @@ -43,7 +43,7 @@ TAO_Notify_Tests_ConsumerAdmin_Command::handle_create (void) void -TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions (void) +TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions () { CosNotifyChannelAdmin::ConsumerAdmin_var admin; @@ -69,7 +69,7 @@ TAO_Notify_Tests_ConsumerAdmin_Command::handle_subscriptions (void) } void -TAO_Notify_Tests_ConsumerAdmin_Command::handle_set_qos (void) +TAO_Notify_Tests_ConsumerAdmin_Command::handle_set_qos () { CosNotifyChannelAdmin::ConsumerAdmin_var admin; @@ -79,7 +79,7 @@ TAO_Notify_Tests_ConsumerAdmin_Command::handle_set_qos (void) } void -TAO_Notify_Tests_ConsumerAdmin_Command::handle_status (void) +TAO_Notify_Tests_ConsumerAdmin_Command::handle_status () { //@@ TODO: } @@ -144,7 +144,7 @@ TAO_Notify_Tests_ConsumerAdmin_Command::init (ACE_Arg_Shifter& arg_shifter) } void -TAO_Notify_Tests_ConsumerAdmin_Command::execute_i (void) +TAO_Notify_Tests_ConsumerAdmin_Command::execute_i () { if (this->command_ == CREATE) { diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h index 221c3eceafb..7b9a8b7cf82 100644 --- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h @@ -28,7 +28,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_ConsumerAdmin_Command : public TA { public: /// Constructor - TAO_Notify_Tests_ConsumerAdmin_Command (void); + TAO_Notify_Tests_ConsumerAdmin_Command (); /// Destructor ~TAO_Notify_Tests_ConsumerAdmin_Command (); @@ -37,11 +37,11 @@ public: virtual void init (ACE_Arg_Shifter& arg_shifter); /// Execute the command. - virtual void execute_i (void); + virtual void execute_i (); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const char* get_name (); + static const char* name (); protected: /// = Data Members @@ -74,10 +74,10 @@ protected: CosNotification::EventTypeSeq removed_; /// = Handlers - void handle_create (void); - void handle_subscriptions (void); - void handle_status (void); - void handle_set_qos (void); + void handle_create (); + void handle_subscriptions (); + void handle_status (); + void handle_set_qos (); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp index ab4ea2c7edf..b9ef48ef248 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.cpp @@ -5,7 +5,7 @@ template <class Consumer_Traits> -TAO_Notify_Tests_Consumer_T<Consumer_Traits>::TAO_Notify_Tests_Consumer_T (void) +TAO_Notify_Tests_Consumer_T<Consumer_Traits>::TAO_Notify_Tests_Consumer_T () { } @@ -15,7 +15,7 @@ TAO_Notify_Tests_Consumer_T<Consumer_Traits>::~TAO_Notify_Tests_Consumer_T () } template <class Consumer_Traits> typename TAO_Notify_Tests_Consumer_T<Consumer_Traits>::Proxy_Traits_PTR -TAO_Notify_Tests_Consumer_T<Consumer_Traits>::get_proxy_supplier (void) +TAO_Notify_Tests_Consumer_T<Consumer_Traits>::get_proxy_supplier () { return this->get_proxy (); } diff --git a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h index 76a8e27df7f..e9cedf5d4db 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Consumer_T.h @@ -50,13 +50,13 @@ class TAO_Notify_Tests_Consumer_T : public TAO_Notify_Tests_Peer_T <Consumer_Tra public: /// Constructor - TAO_Notify_Tests_Consumer_T (void); + TAO_Notify_Tests_Consumer_T (); /// Destructor ~TAO_Notify_Tests_Consumer_T (); /// For backward compatibility. use <get_proxy> instead. - Proxy_Traits_PTR get_proxy_supplier (void); + Proxy_Traits_PTR get_proxy_supplier (); /// Send subscription_change virtual void subscription_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed); diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp index 4c356f12e5d..5dec5dda194 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.cpp @@ -3,7 +3,7 @@ #include "LookupManager.h" -TAO_Notify_Tests_Direct_Consumer::TAO_Notify_Tests_Direct_Consumer (void) +TAO_Notify_Tests_Direct_Consumer::TAO_Notify_Tests_Direct_Consumer () { } @@ -12,7 +12,7 @@ TAO_Notify_Tests_Direct_Consumer::~TAO_Notify_Tests_Direct_Consumer () } void -TAO_Notify_Tests_Direct_Consumer::connect (void) +TAO_Notify_Tests_Direct_Consumer::connect () { // Get the POA PortableServer::POA_var poa; diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h index 23817fc250b..c6e06c0eacf 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Consumer.h @@ -26,13 +26,13 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Direct_Consumer : public TAO_Notif { public: /// Constructor - TAO_Notify_Tests_Direct_Consumer (void); + TAO_Notify_Tests_Direct_Consumer (); /// Destructor ~TAO_Notify_Tests_Direct_Consumer (); /// Connect using options parsed and set initial QoS. - virtual void connect (void); + virtual void connect (); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp index d45f244a88b..2751578c16e 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.cpp @@ -17,7 +17,7 @@ TAO_Notify_Tests_Direct_Supplier::~TAO_Notify_Tests_Direct_Supplier () } void -TAO_Notify_Tests_Direct_Supplier::connect (void) +TAO_Notify_Tests_Direct_Supplier::connect () { // Get the POA PortableServer::POA_var poa; diff --git a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h index b06ea5f9afc..695c9357a91 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/Direct_Supplier.h @@ -32,7 +32,7 @@ public: ~TAO_Notify_Tests_Direct_Supplier (); /// Connect using options parsed and set initial QoS. - virtual void connect (void); + virtual void connect (); // Send one event. Bypass sending to the Notify and send directly to taget consumer. virtual void send_event (const CosNotification::StructuredEvent& event); diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp index 32d9d5675a8..faf2586eb94 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp @@ -72,7 +72,7 @@ TAO_Notify_Tests_Worker::command_builder (TAO_Notify_Tests_Command_Builder* cmd_ } int -TAO_Notify_Tests_Worker::svc (void) +TAO_Notify_Tests_Worker::svc () { #if 0 ACE_hthread_t current; @@ -107,7 +107,7 @@ TAO_Notify_Tests_Worker::svc (void) /*****************************************************************/ -TAO_Notify_Tests_ORB_Run_Worker::TAO_Notify_Tests_ORB_Run_Worker (void) +TAO_Notify_Tests_ORB_Run_Worker::TAO_Notify_Tests_ORB_Run_Worker () { } @@ -124,7 +124,7 @@ TAO_Notify_Tests_ORB_Run_Worker::run_period (ACE_Time_Value run_period) } int -TAO_Notify_Tests_ORB_Run_Worker::svc (void) +TAO_Notify_Tests_ORB_Run_Worker::svc () { #if 0 // ACE_Thread::getprio() fails on systems that do not support thread @@ -160,7 +160,7 @@ TAO_Notify_Tests_ORB_Run_Worker::svc (void) /*****************************************************************/ -TAO_Notify_Tests_Driver::TAO_Notify_Tests_Driver (void) +TAO_Notify_Tests_Driver::TAO_Notify_Tests_Driver () :cmd_builder_ (0), activation_manager_ (0), run_period_ (0,0), skip_priority_levels_check_ (0) { this->activation_manager_ = new TAO_Notify_Tests_Activation_Manager (); @@ -260,7 +260,7 @@ TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[]) } void -TAO_Notify_Tests_Driver::run (void) +TAO_Notify_Tests_Driver::run () { // Task activation flags. long flags = @@ -308,7 +308,7 @@ TAO_Notify_Tests_Driver::run (void) } void -TAO_Notify_Tests_Driver::shutdown (void) +TAO_Notify_Tests_Driver::shutdown () { this->orb_->shutdown (); } diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h index babb998dd5a..a5401c3cfe5 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Driver.h +++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h @@ -33,7 +33,7 @@ class TAO_Notify_Tests_Activation_Manager; class TAO_Notify_Tests_Worker : public ACE_Task_Base { public: - TAO_Notify_Tests_Worker (void); + TAO_Notify_Tests_Worker (); // ctor /// Set the command builder. @@ -42,7 +42,7 @@ public: virtual int svc (); // The thread entry point. - void shutdown (void); + void shutdown (); private: /// The command builder @@ -58,7 +58,7 @@ private: class TAO_Notify_Tests_ORB_Run_Worker : public ACE_Task_Base { public: - TAO_Notify_Tests_ORB_Run_Worker (void); + TAO_Notify_Tests_ORB_Run_Worker (); // ctor void orb (CORBA::ORB_ptr orb); @@ -87,7 +87,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Driver : public TAO_Notify_Tests_D { public: /// Constructor - TAO_Notify_Tests_Driver (void); + TAO_Notify_Tests_Driver (); /// Destructor ~TAO_Notify_Tests_Driver (); @@ -96,10 +96,10 @@ public: int init (int argc, ACE_TCHAR *argv[]); /// Execute the commands. - void run (void); + void run (); /// Shutdown - virtual void shutdown (void); + virtual void shutdown (); protected: /// Parse command line parameters. diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp index 7e23a78a5bb..68d4ad61f5e 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp @@ -7,7 +7,7 @@ #include "Options_Parser.h" #include "orbsvcs/Notify/Service.h" -TAO_Notify_Tests_EventChannel_Command::TAO_Notify_Tests_EventChannel_Command (void) +TAO_Notify_Tests_EventChannel_Command::TAO_Notify_Tests_EventChannel_Command () : collocated_ (0) { } @@ -17,13 +17,13 @@ TAO_Notify_Tests_EventChannel_Command::~TAO_Notify_Tests_EventChannel_Command () } const char* -TAO_Notify_Tests_EventChannel_Command::get_name (void) +TAO_Notify_Tests_EventChannel_Command::get_name () { return TAO_Notify_Tests_EventChannel_Command::name (); } const char* -TAO_Notify_Tests_EventChannel_Command::name (void) +TAO_Notify_Tests_EventChannel_Command::name () { return TAO_Notify_Tests_Name::event_channel_command; } @@ -84,7 +84,7 @@ TAO_Notify_Tests_EventChannel_Command::init (ACE_Arg_Shifter& arg_shifter) } void -TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf (void) +TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf () { CosNotifyChannelAdmin::EventChannelFactory_var notify_factory; @@ -123,7 +123,7 @@ TAO_Notify_Tests_EventChannel_Command::create_collocated_ecf (void) } void -TAO_Notify_Tests_EventChannel_Command::handle_create (void) +TAO_Notify_Tests_EventChannel_Command::handle_create () { if (this->collocated_ == 1) { @@ -147,7 +147,7 @@ TAO_Notify_Tests_EventChannel_Command::handle_create (void) } void -TAO_Notify_Tests_EventChannel_Command::handle_destroy (void) +TAO_Notify_Tests_EventChannel_Command::handle_destroy () { ACE_DEBUG ((LM_DEBUG, "Destroying event channel %s\n", this->name_.c_str ())); CosNotifyChannelAdmin::EventChannel_var ec; @@ -157,7 +157,7 @@ TAO_Notify_Tests_EventChannel_Command::handle_destroy (void) ec->destroy (); } void -TAO_Notify_Tests_EventChannel_Command::handle_set_qos (void) +TAO_Notify_Tests_EventChannel_Command::handle_set_qos () { CosNotifyChannelAdmin::EventChannel_var ec; @@ -167,13 +167,13 @@ TAO_Notify_Tests_EventChannel_Command::handle_set_qos (void) } void -TAO_Notify_Tests_EventChannel_Command::handle_status (void) +TAO_Notify_Tests_EventChannel_Command::handle_status () { //@@ TODO: Implement } void -TAO_Notify_Tests_EventChannel_Command::execute_i (void) +TAO_Notify_Tests_EventChannel_Command::execute_i () { if (this->command_ == CREATE) { diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h index 3ffc40f87d4..aa45aef7489 100644 --- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h @@ -32,7 +32,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_EventChannel_Command : public TAO_ { public: /// Constructor - TAO_Notify_Tests_EventChannel_Command (void); + TAO_Notify_Tests_EventChannel_Command (); /// Destructor virtual ~TAO_Notify_Tests_EventChannel_Command (); @@ -41,11 +41,11 @@ public: virtual void init (ACE_Arg_Shifter& arg_shifter); /// Execute the command. - virtual void execute_i (void); + virtual void execute_i (); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const char* get_name (); + static const char* name (); protected: ///= Data Members @@ -76,13 +76,13 @@ protected: CORBA::Boolean collocated_; /// Helper method to create a collocated ECF. - void create_collocated_ecf (void); + void create_collocated_ecf (); /// = Handlers - void handle_create (void); - void handle_destroy (void); - void handle_set_qos (void); - void handle_status (void); + void handle_create (); + void handle_destroy (); + void handle_set_qos (); + void handle_status (); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp index 64a1003095c..9932b190831 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp @@ -5,7 +5,7 @@ #include "LookupManager.h" #include "Name.h" -TAO_Notify_Tests_Filter_Command::TAO_Notify_Tests_Filter_Command (void) +TAO_Notify_Tests_Filter_Command::TAO_Notify_Tests_Filter_Command () { } @@ -14,13 +14,13 @@ TAO_Notify_Tests_Filter_Command::~TAO_Notify_Tests_Filter_Command () } const char* -TAO_Notify_Tests_Filter_Command::get_name (void) +TAO_Notify_Tests_Filter_Command::get_name () { return TAO_Notify_Tests_Filter_Command::name (); } const char* -TAO_Notify_Tests_Filter_Command::name (void) +TAO_Notify_Tests_Filter_Command::name () { return TAO_Notify_Tests_Name::filter_command; } @@ -95,7 +95,7 @@ TAO_Notify_Tests_Filter_Command::init (ACE_Arg_Shifter& arg_shifter) } void -TAO_Notify_Tests_Filter_Command::handle_create_filter_factory (void) +TAO_Notify_Tests_Filter_Command::handle_create_filter_factory () { CosNotifyChannelAdmin::EventChannel_var ec; @@ -108,7 +108,7 @@ TAO_Notify_Tests_Filter_Command::handle_create_filter_factory (void) } void -TAO_Notify_Tests_Filter_Command::handle_create_filter (void) +TAO_Notify_Tests_Filter_Command::handle_create_filter () { CosNotifyFilter::FilterFactory_var ff; @@ -121,7 +121,7 @@ TAO_Notify_Tests_Filter_Command::handle_create_filter (void) } void -TAO_Notify_Tests_Filter_Command::handle_add_constraint (void) +TAO_Notify_Tests_Filter_Command::handle_add_constraint () { CosNotifyFilter::Filter_var filter; @@ -138,7 +138,7 @@ TAO_Notify_Tests_Filter_Command::handle_add_constraint (void) } void -TAO_Notify_Tests_Filter_Command::handle_add_filter (void) +TAO_Notify_Tests_Filter_Command::handle_add_filter () { CosNotifyFilter::Filter_var filter; @@ -152,7 +152,7 @@ TAO_Notify_Tests_Filter_Command::handle_add_filter (void) } void -TAO_Notify_Tests_Filter_Command::handle_destroy_filter (void) +TAO_Notify_Tests_Filter_Command::handle_destroy_filter () { CosNotifyFilter::Filter_var filter; @@ -162,7 +162,7 @@ TAO_Notify_Tests_Filter_Command::handle_destroy_filter (void) } void -TAO_Notify_Tests_Filter_Command::execute_i (void) +TAO_Notify_Tests_Filter_Command::execute_i () { if (this->command_ == CREATE_FACTORY) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h index 5b774ff10bd..f679a6682b4 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h @@ -28,7 +28,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Filter_Command : public TAO_Notify { public: /// Constructor - TAO_Notify_Tests_Filter_Command (void); + TAO_Notify_Tests_Filter_Command (); /// Destructor ~TAO_Notify_Tests_Filter_Command (); @@ -37,11 +37,11 @@ public: virtual void init (ACE_Arg_Shifter& arg_shifter); /// Execute the command. - virtual void execute_i (void); + virtual void execute_i (); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const char* get_name (); + static const char* name (); protected: #ifdef HPUX_11 @@ -66,11 +66,11 @@ protected: ACE_CString constraint_; ///= Handlers - void handle_create_filter_factory (void); - void handle_create_filter (void); - void handle_add_constraint (void); - void handle_add_filter (void); - void handle_destroy_filter (void); + void handle_create_filter_factory (); + void handle_create_filter (); + void handle_add_constraint (); + void handle_add_filter (); + void handle_destroy_filter (); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp index d2cbf162200..c06c2834a62 100644 --- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.cpp @@ -4,7 +4,7 @@ #include "Name.h" -TAO_Notify_Tests_LookupManager::TAO_Notify_Tests_LookupManager (void) +TAO_Notify_Tests_LookupManager::TAO_Notify_Tests_LookupManager () : app_ (0) , activation_manager_ (0) , priority_mapping_ (0) diff --git a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h index 6b1db928a77..44fe125c79e 100644 --- a/TAO/orbsvcs/tests/Notify/lib/LookupManager.h +++ b/TAO/orbsvcs/tests/Notify/lib/LookupManager.h @@ -36,7 +36,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_LookupManager { public: /// Constructor - TAO_Notify_Tests_LookupManager (void); + TAO_Notify_Tests_LookupManager (); /// Destructor ~TAO_Notify_Tests_LookupManager (); diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp index 4851b4e8013..5b4e67bf58e 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp @@ -2,7 +2,7 @@ #define NOTIFY_FACTORY_NAME "NotifyEventChannelFactory" #define NAMING_SERVICE_NAME "NameService" -Notify_Test_Client::Notify_Test_Client (void) +Notify_Test_Client::Notify_Test_Client () : num_clients_( 0 ) , done_( false ) { @@ -77,7 +77,7 @@ Notify_Test_Client::init_ORB (int argc, ACE_TCHAR *argv[]) } void -Notify_Test_Client::resolve_naming_service (void) +Notify_Test_Client::resolve_naming_service () { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (NAMING_SERVICE_NAME); @@ -91,7 +91,7 @@ Notify_Test_Client::resolve_naming_service (void) } void -Notify_Test_Client::resolve_Notify_factory (void) +Notify_Test_Client::resolve_Notify_factory () { CosNaming::Name name (1); name.length (1); @@ -105,7 +105,7 @@ Notify_Test_Client::resolve_Notify_factory (void) } int -Notify_Test_Client::ORB_run (void) +Notify_Test_Client::ORB_run () { while (! is_done()) { @@ -156,26 +156,26 @@ Notify_Test_Client::is_done () const } CORBA::ORB_ptr -Notify_Test_Client::orb (void) +Notify_Test_Client::orb () { return this->orb_.in (); } PortableServer::POA_ptr -Notify_Test_Client::root_poa (void) +Notify_Test_Client::root_poa () { return this->root_poa_.in (); } CosNaming::NamingContext_ptr -Notify_Test_Client::naming_context (void) +Notify_Test_Client::naming_context () { return this->naming_context_.in (); } CosNotifyChannelAdmin::EventChannelFactory_ptr -Notify_Test_Client::notify_factory (void) +Notify_Test_Client::notify_factory () { return this->notify_factory_.in (); } diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h index 93f28c2c2c1..5a8e6b551e1 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h +++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h @@ -32,7 +32,7 @@ class TAO_Notify_Tests_Peer; class TAO_NOTIFY_TEST_Export Notify_Test_Client { public: - Notify_Test_Client (void); + Notify_Test_Client (); virtual ~Notify_Test_Client (); /// starts the orb and resolves the notify factory via a naming service. @@ -42,7 +42,7 @@ public: virtual int parse_args (int argc, ACE_TCHAR* argv[]); /// Call ORB::run to accept requests. - int ORB_run (void); + int ORB_run (); int ORB_run (ACE_Time_Value& tv); /// How many clients will call consumer_done. @@ -55,16 +55,16 @@ public: bool is_done () const; /// Access the ORB. This class retains ownership. - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); /// Access the Root POA. This class retains ownership. - PortableServer::POA_ptr root_poa (void); + PortableServer::POA_ptr root_poa (); /// Access the Naming Context. This class retains ownership. - CosNaming::NamingContext_ptr naming_context (void); + CosNaming::NamingContext_ptr naming_context (); /// Access the Notify Factory. This class retains ownership. - CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (void); + CosNotifyChannelAdmin::EventChannelFactory_ptr notify_factory (); /// Create an Event Channel. Ownership is passed to the caller. CosNotifyChannelAdmin::EventChannel_ptr create_event_channel ( @@ -77,10 +77,10 @@ protected: ACE_TCHAR *argv []); /// Try to get hold of a running naming service. - void resolve_naming_service (void); + void resolve_naming_service (); /// Try to resolve the Notify factory from the Naming service. - void resolve_Notify_factory (void); + void resolve_Notify_factory (); // = Data Members /// Reference to the root poa. diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp index 1f5f98fb996..88d48237464 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp @@ -3,7 +3,7 @@ #include "tao/debug.h" #include "ace/Log_Msg.h" -TAO_Notify_Tests_Options_Parser::TAO_Notify_Tests_Options_Parser (void) +TAO_Notify_Tests_Options_Parser::TAO_Notify_Tests_Options_Parser () { } diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h index 655b44e80cf..ecc83844eb0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h +++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h @@ -27,7 +27,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Options_Parser { public: /// Constructor - TAO_Notify_Tests_Options_Parser (void); + TAO_Notify_Tests_Options_Parser (); /// Destructor ~TAO_Notify_Tests_Options_Parser (); diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp index fce46f2b1f9..b8ce5e420d6 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp @@ -9,7 +9,7 @@ #include "Options_Parser.h" #include "orbsvcs/NotifyExtC.h" -TAO_Notify_Tests_Peer::TAO_Notify_Tests_Peer (void) +TAO_Notify_Tests_Peer::TAO_Notify_Tests_Peer () : poa_name_ (TAO_Notify_Tests_Name::root_poa) , ifgop_ (CosNotifyChannelAdmin::OR_OP) { @@ -75,7 +75,7 @@ TAO_Notify_Tests_Peer::set_name (ACE_CString& name) } const ACE_CString& -TAO_Notify_Tests_Peer::get_name (void) +TAO_Notify_Tests_Peer::get_name () { return this->name_; } diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h index 35e8c0c23c7..0583742a62f 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h @@ -29,7 +29,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Peer { public: /// Constructor - TAO_Notify_Tests_Peer (void); + TAO_Notify_Tests_Peer (); /// Destructor virtual ~TAO_Notify_Tests_Peer (); @@ -45,7 +45,7 @@ public: // Accessor to set/get our name. void set_name (ACE_CString& name); - const ACE_CString& get_name (void); + const ACE_CString& get_name (); protected: /// My name. diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp index 1e65754e8f5..a6d350b7010 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp @@ -10,7 +10,7 @@ #include "orbsvcs/NotifyExtC.h" template <class Peer_Traits> -TAO_Notify_Tests_Peer_T<Peer_Traits>::TAO_Notify_Tests_Peer_T (void) +TAO_Notify_Tests_Peer_T<Peer_Traits>::TAO_Notify_Tests_Peer_T () : proxy_id_ (0) { } @@ -22,14 +22,14 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::~TAO_Notify_Tests_Peer_T () template <class Peer_Traits> typename TAO_Notify_Tests_Peer_T<Peer_Traits>::Proxy_Traits_PTR -TAO_Notify_Tests_Peer_T<Peer_Traits>::get_proxy (void) +TAO_Notify_Tests_Peer_T<Peer_Traits>::get_proxy () { return proxy_.in (); } template <class Peer_Traits> typename TAO_Notify_Tests_Peer_T<Peer_Traits>::Peer_Traits_PTR -TAO_Notify_Tests_Peer_T<Peer_Traits>::activate (void) +TAO_Notify_Tests_Peer_T<Peer_Traits>::activate () { return this->_this (); } @@ -76,7 +76,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (Admin_Traits_PTR admin_ptr) template <class Peer_Traits> void -TAO_Notify_Tests_Peer_T<Peer_Traits>::connect (void) +TAO_Notify_Tests_Peer_T<Peer_Traits>::connect () { // Get the POA PortableServer::POA_var poa; @@ -118,7 +118,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::set_qos ( template <class Peer_Traits> void -TAO_Notify_Tests_Peer_T<Peer_Traits>::status (void) +TAO_Notify_Tests_Peer_T<Peer_Traits>::status () { #if (TAO_HAS_MINIMUM_CORBA == 0) try @@ -158,7 +158,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::status (void) template <class Peer_Traits> void -TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect (void) +TAO_Notify_Tests_Peer_T<Peer_Traits>::disconnect () { ACE_ASSERT (!CORBA::is_nil (this->proxy_.in ())); @@ -195,7 +195,7 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::_default_POA ( template <class Peer_Traits> void -TAO_Notify_Tests_Peer_T<Peer_Traits>::deactivate (void) +TAO_Notify_Tests_Peer_T<Peer_Traits>::deactivate () { PortableServer::POA_var poa = this->_default_POA (); diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h index e74225f343b..36e0412a554 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.h @@ -41,7 +41,7 @@ class TAO_Notify_Tests_Peer_T : public TAO_Notify_Tests_Peer, public Peer_Traits public: /// Constructor - TAO_Notify_Tests_Peer_T (void); + TAO_Notify_Tests_Peer_T (); /// Destructor virtual ~TAO_Notify_Tests_Peer_T (); @@ -55,29 +55,29 @@ public: void connect (Admin_Traits_PTR admin_ptr); /// Connect using options parsed and set initial QoS. - virtual void connect (void); + virtual void connect (); // Disconnect from the Peer. - void disconnect (void); + void disconnect (); /// Set Qos void set_qos (CosNotification::QoSProperties& qos); /// Dump status - void status (void); + void status (); // Accessor for <proxy_>. - Proxy_Traits_PTR get_proxy (void); + Proxy_Traits_PTR get_proxy (); /// Deactivate the object. - void deactivate (void); + void deactivate (); // = ServantBase operations - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); protected: /// Activate this object in the default POA. - virtual Peer_Traits_PTR activate (void); + virtual Peer_Traits_PTR activate (); ///= To be implemented by specializations. diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp index b479801e745..87615780943 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp @@ -13,7 +13,7 @@ int WARMUP_COUNT = 10; -TAO_Notify_Tests_Periodic_Consumer::TAO_Notify_Tests_Periodic_Consumer (void) +TAO_Notify_Tests_Periodic_Consumer::TAO_Notify_Tests_Periodic_Consumer () : count_ (-2) , warmup_countdown_ (WARMUP_COUNT) , max_count_ (-1) diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h index 2dec98e86d7..423b38510a5 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h @@ -34,7 +34,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Consumer : public TAO_Not { public: /// Constructor - TAO_Notify_Tests_Periodic_Consumer (void); + TAO_Notify_Tests_Periodic_Consumer (); /// Destructor ~TAO_Notify_Tests_Periodic_Consumer (); diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp index fabecb84dc7..fec946fe400 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp @@ -8,7 +8,7 @@ #include "Options_Parser.h" #include "orbsvcs/NotifyExtC.h" -TAO_Notify_Tests_Periodic_Consumer_Command::TAO_Notify_Tests_Periodic_Consumer_Command (void) +TAO_Notify_Tests_Periodic_Consumer_Command::TAO_Notify_Tests_Periodic_Consumer_Command () { } @@ -17,13 +17,13 @@ TAO_Notify_Tests_Periodic_Consumer_Command::~TAO_Notify_Tests_Periodic_Consumer_ } const char* -TAO_Notify_Tests_Periodic_Consumer_Command::get_name (void) +TAO_Notify_Tests_Periodic_Consumer_Command::get_name () { return TAO_Notify_Tests_Periodic_Consumer_Command::name (); } const char* -TAO_Notify_Tests_Periodic_Consumer_Command::name (void) +TAO_Notify_Tests_Periodic_Consumer_Command::name () { return TAO_Notify_Tests_Name::periodic_consumer_command; } @@ -140,7 +140,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter) } TAO_Notify_Tests_Periodic_Consumer* -TAO_Notify_Tests_Periodic_Consumer_Command::consumer (void) +TAO_Notify_Tests_Periodic_Consumer_Command::consumer () { TAO_Notify_Tests_Activation_Manager* act_mgr = 0; @@ -160,13 +160,13 @@ TAO_Notify_Tests_Periodic_Consumer_Command::consumer (void) } void -TAO_Notify_Tests_Periodic_Consumer_Command::handle_set_qos (void) +TAO_Notify_Tests_Periodic_Consumer_Command::handle_set_qos () { this->consumer ()->set_qos (this->qos_); } void -TAO_Notify_Tests_Periodic_Consumer_Command::handle_create (void) +TAO_Notify_Tests_Periodic_Consumer_Command::handle_create () { TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer (); @@ -179,7 +179,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::handle_create (void) } void -TAO_Notify_Tests_Periodic_Consumer_Command::handle_subscriptions (void) +TAO_Notify_Tests_Periodic_Consumer_Command::handle_subscriptions () { TAO_Notify_Tests_Periodic_Consumer* consumer= this->consumer (); if (consumer == 0) @@ -189,7 +189,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::handle_subscriptions (void) } void -TAO_Notify_Tests_Periodic_Consumer_Command::handle_disconnect (void) +TAO_Notify_Tests_Periodic_Consumer_Command::handle_disconnect () { TAO_Notify_Tests_Periodic_Consumer* consumer= this->consumer (); if (consumer == 0) @@ -199,7 +199,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::handle_disconnect (void) } void -TAO_Notify_Tests_Periodic_Consumer_Command::handle_deactivate (void) +TAO_Notify_Tests_Periodic_Consumer_Command::handle_deactivate () { TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer (); if (consumer == 0) @@ -209,7 +209,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::handle_deactivate (void) } void -TAO_Notify_Tests_Periodic_Consumer_Command::handle_status (void) +TAO_Notify_Tests_Periodic_Consumer_Command::handle_status () { TAO_Notify_Tests_Periodic_Consumer* consumer = this->consumer (); @@ -220,7 +220,7 @@ TAO_Notify_Tests_Periodic_Consumer_Command::handle_status (void) } void -TAO_Notify_Tests_Periodic_Consumer_Command::execute_i (void) +TAO_Notify_Tests_Periodic_Consumer_Command::execute_i () { if (this->command_ == CREATE) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h index fab2d15add8..12778f61a6e 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h @@ -30,7 +30,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Consumer_Command : public { public: /// Constructor - TAO_Notify_Tests_Periodic_Consumer_Command (void); + TAO_Notify_Tests_Periodic_Consumer_Command (); /// Destructor ~TAO_Notify_Tests_Periodic_Consumer_Command (); @@ -39,11 +39,11 @@ public: virtual void init (ACE_Arg_Shifter& arg_shifter); /// Execute the command. - virtual void execute_i (void); + virtual void execute_i (); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const char* get_name (); + static const char* name (); protected: ///= Data Members @@ -75,15 +75,15 @@ protected: ///= Methods // Retreive the consumer. - TAO_Notify_Tests_Periodic_Consumer* consumer (void); + TAO_Notify_Tests_Periodic_Consumer* consumer (); ///= Handlers - void handle_create (void); - void handle_subscriptions (void); - void handle_disconnect (void); - void handle_deactivate (void); - void handle_status (void); - void handle_set_qos (void); + void handle_create (); + void handle_subscriptions (); + void handle_disconnect (); + void handle_deactivate (); + void handle_status (); + void handle_set_qos (); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp index 6fb6b4f1306..7819c118b08 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp @@ -13,7 +13,7 @@ #include "LookupManager.h" #include "Priority_Mapping.h" -TAO_Notify_Tests_Periodic_Supplier::TAO_Notify_Tests_Periodic_Supplier (void) +TAO_Notify_Tests_Periodic_Supplier::TAO_Notify_Tests_Periodic_Supplier () : barrier_ (0), priority_ (0), period_ (0), @@ -172,7 +172,7 @@ TAO_Notify_Tests_Periodic_Supplier::activate_task (ACE_Barrier* barrier) } void -TAO_Notify_Tests_Periodic_Supplier::send_warmup_events (void) +TAO_Notify_Tests_Periodic_Supplier::send_warmup_events () { int WARMUP_COUNT = 10; @@ -183,7 +183,7 @@ TAO_Notify_Tests_Periodic_Supplier::send_warmup_events (void) } void -TAO_Notify_Tests_Periodic_Supplier::send_prologue (void) +TAO_Notify_Tests_Periodic_Supplier::send_prologue () { // populate event. // send the base time and max count. @@ -208,7 +208,7 @@ TAO_Notify_Tests_Periodic_Supplier::send_prologue (void) } void -TAO_Notify_Tests_Periodic_Supplier::handle_svc (void) +TAO_Notify_Tests_Periodic_Supplier::handle_svc () { this->send_prologue (); @@ -291,7 +291,7 @@ TAO_Notify_Tests_Periodic_Supplier::handle_svc (void) } int -TAO_Notify_Tests_Periodic_Supplier::svc (void) +TAO_Notify_Tests_Periodic_Supplier::svc () { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Thread_Task (%t) - wait\n")); diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h index f8d3ee9a8c4..f1a56c220d8 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h @@ -33,7 +33,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Supplier : public TAO_Not { public: /// Constructor - TAO_Notify_Tests_Periodic_Supplier (void); + TAO_Notify_Tests_Periodic_Supplier (); /// Destructor ~TAO_Notify_Tests_Periodic_Supplier (); @@ -54,17 +54,17 @@ public: void dump_stats (ACE_TCHAR* msg, int dump_samples); /// Get the name of the proxy - const char* proxy_name (void); + const char* proxy_name (); protected: /// svc method. - void handle_svc (void); + void handle_svc (); /// Send a few events before the actual measurements. - void send_warmup_events (void); + void send_warmup_events (); /// Send Prologue - void send_prologue (void); + void send_prologue (); /// All tasks synch at this barrier. ACE_Barrier* barrier_; diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp index 893ec715baa..e198d73f345 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp @@ -7,7 +7,7 @@ #include "Options_Parser.h" #include "orbsvcs/NotifyExtC.h" -TAO_Notify_Tests_Periodic_Supplier_Command::TAO_Notify_Tests_Periodic_Supplier_Command (void) +TAO_Notify_Tests_Periodic_Supplier_Command::TAO_Notify_Tests_Periodic_Supplier_Command () { } @@ -16,13 +16,13 @@ TAO_Notify_Tests_Periodic_Supplier_Command::~TAO_Notify_Tests_Periodic_Supplier_ } const char* -TAO_Notify_Tests_Periodic_Supplier_Command::get_name (void) +TAO_Notify_Tests_Periodic_Supplier_Command::get_name () { return TAO_Notify_Tests_Periodic_Supplier_Command::name (); } const char* -TAO_Notify_Tests_Periodic_Supplier_Command::name (void) +TAO_Notify_Tests_Periodic_Supplier_Command::name () { return TAO_Notify_Tests_Name::periodic_supplier_command; } @@ -130,7 +130,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::init (ACE_Arg_Shifter& arg_shifter) } TAO_Notify_Tests_Periodic_Supplier* -TAO_Notify_Tests_Periodic_Supplier_Command::supplier (void) +TAO_Notify_Tests_Periodic_Supplier_Command::supplier () { TAO_Notify_Tests_Activation_Manager* act_mgr = 0; LOOKUP_MANAGER->resolve (act_mgr); @@ -147,7 +147,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::supplier (void) } void -TAO_Notify_Tests_Periodic_Supplier_Command::handle_create (void) +TAO_Notify_Tests_Periodic_Supplier_Command::handle_create () { TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier (); if (supplier == 0) @@ -159,7 +159,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_create (void) } void -TAO_Notify_Tests_Periodic_Supplier_Command::handle_offers (void) +TAO_Notify_Tests_Periodic_Supplier_Command::handle_offers () { TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier (); if (supplier == 0) @@ -169,7 +169,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_offers (void) } void -TAO_Notify_Tests_Periodic_Supplier_Command::handle_disconnect (void) +TAO_Notify_Tests_Periodic_Supplier_Command::handle_disconnect () { TAO_Notify_Tests_Periodic_Supplier* supplier= this->supplier (); if (supplier == 0) @@ -179,7 +179,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_disconnect (void) } void -TAO_Notify_Tests_Periodic_Supplier_Command::handle_deactivate (void) +TAO_Notify_Tests_Periodic_Supplier_Command::handle_deactivate () { TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier (); if (supplier == 0) @@ -189,7 +189,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_deactivate (void) } void -TAO_Notify_Tests_Periodic_Supplier_Command::handle_status (void) +TAO_Notify_Tests_Periodic_Supplier_Command::handle_status () { TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier (); @@ -200,7 +200,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_status (void) } void -TAO_Notify_Tests_Periodic_Supplier_Command::handle_set_qos (void) +TAO_Notify_Tests_Periodic_Supplier_Command::handle_set_qos () { TAO_Notify_Tests_Periodic_Supplier* supplier = this->supplier (); @@ -211,7 +211,7 @@ TAO_Notify_Tests_Periodic_Supplier_Command::handle_set_qos (void) } void -TAO_Notify_Tests_Periodic_Supplier_Command::execute_i (void) +TAO_Notify_Tests_Periodic_Supplier_Command::execute_i () { if (this->command_ == CREATE) { diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h index 7f91d2ecff8..e0d01d2559d 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h @@ -30,7 +30,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Periodic_Supplier_Command : public { public: /// Constructor - TAO_Notify_Tests_Periodic_Supplier_Command (void); + TAO_Notify_Tests_Periodic_Supplier_Command (); /// Destructor ~TAO_Notify_Tests_Periodic_Supplier_Command (); @@ -39,11 +39,11 @@ public: virtual void init (ACE_Arg_Shifter& arg_shifter); /// Execute the command. - virtual void execute_i (void); + virtual void execute_i (); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const char* get_name (); + static const char* name (); protected: #ifdef HPUX_11 @@ -74,15 +74,15 @@ protected: ///= Methods // Retreive the suppliers. - TAO_Notify_Tests_Periodic_Supplier* supplier (void); + TAO_Notify_Tests_Periodic_Supplier* supplier (); ///= Handlers - void handle_create (void); - void handle_offers (void); - void handle_disconnect (void); - void handle_deactivate (void); - void handle_status (void); - void handle_set_qos (void); + void handle_create (); + void handle_offers (); + void handle_disconnect (); + void handle_deactivate (); + void handle_status (); + void handle_set_qos (); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp index 5b65827eef4..6a663b6b6a9 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.cpp @@ -1,7 +1,7 @@ #include "Priority_Mapping.h" -TAO_Notify_Tests_Priority_Mapping::~TAO_Notify_Tests_Priority_Mapping (void) +TAO_Notify_Tests_Priority_Mapping::~TAO_Notify_Tests_Priority_Mapping () { } diff --git a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h index 2af5dd5c60b..f06f83f368e 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h +++ b/TAO/orbsvcs/tests/Notify/lib/Priority_Mapping.h @@ -26,7 +26,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Priority_Mapping { public: /// The destructor - virtual ~TAO_Notify_Tests_Priority_Mapping (void); + virtual ~TAO_Notify_Tests_Priority_Mapping (); virtual CORBA::Boolean to_native (CORBA::Short corba_priority, diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp index 21b198b5164..d0a5f3ad66e 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.cpp @@ -5,14 +5,14 @@ #endif /* __ACE_INLINE__ */ -TAO_Notify_Tests_PushConsumer_Traits::TAO_Notify_Tests_PushConsumer_Traits (void) +TAO_Notify_Tests_PushConsumer_Traits::TAO_Notify_Tests_PushConsumer_Traits () :type_ (CosNotifyChannelAdmin::ANY_EVENT) { } /*******************************************************************/ -TAO_Notify_Tests_PushConsumer::TAO_Notify_Tests_PushConsumer (void) +TAO_Notify_Tests_PushConsumer::TAO_Notify_Tests_PushConsumer () { } @@ -27,14 +27,14 @@ TAO_Notify_Tests_PushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Pee } void -TAO_Notify_Tests_PushConsumer::disconnect_from_proxy (void) +TAO_Notify_Tests_PushConsumer::disconnect_from_proxy () { ACE_DEBUG((LM_DEBUG, "\nPush Consumer disconnecting from supplier.\n")); this->proxy_->disconnect_push_supplier (); } void -TAO_Notify_Tests_PushConsumer::disconnect_push_consumer (void) +TAO_Notify_Tests_PushConsumer::disconnect_push_consumer () { bool this_method_used_only_by_notify_service = false; ACE_ASSERT(this_method_used_only_by_notify_service); diff --git a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h index 27f11806aa7..d547df8b1cb 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/PushConsumer.h @@ -32,7 +32,7 @@ public: class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushConsumer_Traits { public: - TAO_Notify_Tests_PushConsumer_Traits (void); + TAO_Notify_Tests_PushConsumer_Traits (); typedef CosNotifyComm::PushConsumer INTERFACE; typedef CosNotifyComm::PushConsumer_ptr PTR; @@ -62,7 +62,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushConsumer : public TAO_Notify_T public: /// Constructor - TAO_Notify_Tests_PushConsumer (void); + TAO_Notify_Tests_PushConsumer (); /// Destructor virtual ~TAO_Notify_Tests_PushConsumer (); @@ -72,10 +72,10 @@ protected: virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr); /// Disconnect from proxy. - virtual void disconnect_from_proxy (void); + virtual void disconnect_from_proxy (); // = PushConsumer methods - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); /// Default does nothing. void push (const CORBA::Any & data); diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp index c06dc8c17a7..caaf7bbe6d3 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.cpp @@ -5,14 +5,14 @@ #endif /* __ACE_INLINE__ */ -TAO_Notify_Tests_PushSupplier_Traits::TAO_Notify_Tests_PushSupplier_Traits (void) +TAO_Notify_Tests_PushSupplier_Traits::TAO_Notify_Tests_PushSupplier_Traits () :type_ (CosNotifyChannelAdmin::ANY_EVENT) { } /*******************************************************************/ -TAO_Notify_Tests_PushSupplier::TAO_Notify_Tests_PushSupplier (void) +TAO_Notify_Tests_PushSupplier::TAO_Notify_Tests_PushSupplier () { } @@ -35,14 +35,14 @@ TAO_Notify_Tests_PushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ptr, Pee } void -TAO_Notify_Tests_PushSupplier::disconnect_from_proxy (void) +TAO_Notify_Tests_PushSupplier::disconnect_from_proxy () { ACE_DEBUG((LM_DEBUG, "\nPush Supplier disconnecting from consumer.\n")); this->proxy_->disconnect_push_consumer (); } void -TAO_Notify_Tests_PushSupplier::disconnect_push_supplier (void) +TAO_Notify_Tests_PushSupplier::disconnect_push_supplier () { bool this_method_used_only_by_notify_service = false; ACE_ASSERT(this_method_used_only_by_notify_service); diff --git a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h index a0889463f96..d87ee30deb0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/PushSupplier.h @@ -32,7 +32,7 @@ public: class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushSupplier_Traits { public: - TAO_Notify_Tests_PushSupplier_Traits (void); + TAO_Notify_Tests_PushSupplier_Traits (); typedef CosNotifyComm::PushSupplier INTERFACE; typedef CosNotifyComm::PushSupplier_ptr PTR; @@ -62,7 +62,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_PushSupplier : public TAO_Notify_T public: /// Constructor - TAO_Notify_Tests_PushSupplier (void); + TAO_Notify_Tests_PushSupplier (); /// Destructor virtual ~TAO_Notify_Tests_PushSupplier (); @@ -75,10 +75,10 @@ protected: virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr); /// Disconnect from proxy. - virtual void disconnect_from_proxy (void); + virtual void disconnect_from_proxy (); // = PushSupplier method - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp index 5341b868cdc..7e7aed692d5 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.cpp @@ -13,7 +13,7 @@ TAO_Notify_Tests_Relay_Consumer::~TAO_Notify_Tests_Relay_Consumer () } void -TAO_Notify_Tests_Relay_Consumer::connect (void) +TAO_Notify_Tests_Relay_Consumer::connect () { TAO_Notify_Tests_Direct_Consumer::connect (); diff --git a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h index e41b059d7cc..012f0d7d19b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/Relay_Consumer.h @@ -32,7 +32,7 @@ public: ~TAO_Notify_Tests_Relay_Consumer (); /// Connect using options parsed and set initial QoS. - virtual void connect (void); + virtual void connect (); void push_structured_event (const CosNotification::StructuredEvent &/*notification*/ ); diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp index 69f1580fac4..78c0ffbe9a1 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.cpp @@ -5,14 +5,14 @@ #endif /* __ACE_INLINE__ */ -TAO_Notify_Tests_SequencePushConsumer_Traits::TAO_Notify_Tests_SequencePushConsumer_Traits (void) +TAO_Notify_Tests_SequencePushConsumer_Traits::TAO_Notify_Tests_SequencePushConsumer_Traits () :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT) { } /*******************************************************************/ -TAO_Notify_Tests_SequencePushConsumer::TAO_Notify_Tests_SequencePushConsumer (void) +TAO_Notify_Tests_SequencePushConsumer::TAO_Notify_Tests_SequencePushConsumer () { } @@ -27,14 +27,14 @@ TAO_Notify_Tests_SequencePushConsumer::connect_to_peer (Proxy_Traits::PTR proxy_ } void -TAO_Notify_Tests_SequencePushConsumer::disconnect_from_proxy (void) +TAO_Notify_Tests_SequencePushConsumer::disconnect_from_proxy () { ACE_DEBUG((LM_DEBUG, "\nPush Consumer disconnecting from supplier.\n")); this->proxy_->disconnect_sequence_push_supplier (); } void -TAO_Notify_Tests_SequencePushConsumer::disconnect_sequence_push_consumer (void) +TAO_Notify_Tests_SequencePushConsumer::disconnect_sequence_push_consumer () { bool this_method_used_only_by_notify_service = false; ACE_ASSERT(this_method_used_only_by_notify_service); diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h index 6bb54ea72d0..3398d342583 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushConsumer.h @@ -32,7 +32,7 @@ public: class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushConsumer_Traits { public: - TAO_Notify_Tests_SequencePushConsumer_Traits (void); + TAO_Notify_Tests_SequencePushConsumer_Traits (); typedef CosNotifyComm::SequencePushConsumer INTERFACE; typedef CosNotifyComm::SequencePushConsumer_ptr PTR; @@ -62,7 +62,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushConsumer : public TAO_ public: /// Constructor - TAO_Notify_Tests_SequencePushConsumer (void); + TAO_Notify_Tests_SequencePushConsumer (); /// Destructor virtual ~TAO_Notify_Tests_SequencePushConsumer (); @@ -72,10 +72,10 @@ protected: virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr); /// Disconnect from proxy. - virtual void disconnect_from_proxy (void); + virtual void disconnect_from_proxy (); // = SequencePushConsumer methods - virtual void disconnect_sequence_push_consumer (void); + virtual void disconnect_sequence_push_consumer (); /// Default does nothing. virtual void push_structured_events ( diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp index 7898a9101fb..6c3b5ce66d0 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.cpp @@ -5,14 +5,14 @@ #endif /* __ACE_INLINE__ */ -TAO_Notify_Tests_SequencePushSupplier_Traits::TAO_Notify_Tests_SequencePushSupplier_Traits (void) +TAO_Notify_Tests_SequencePushSupplier_Traits::TAO_Notify_Tests_SequencePushSupplier_Traits () :type_ (CosNotifyChannelAdmin::SEQUENCE_EVENT) { } /*******************************************************************/ -TAO_Notify_Tests_SequencePushSupplier::TAO_Notify_Tests_SequencePushSupplier (void) +TAO_Notify_Tests_SequencePushSupplier::TAO_Notify_Tests_SequencePushSupplier () { } @@ -36,14 +36,14 @@ TAO_Notify_Tests_SequencePushSupplier::connect_to_peer (Proxy_Traits::PTR proxy_ } void -TAO_Notify_Tests_SequencePushSupplier::disconnect_from_proxy (void) +TAO_Notify_Tests_SequencePushSupplier::disconnect_from_proxy () { ACE_DEBUG((LM_DEBUG, "\nPush Supplier disconnecting from consumer.\n")); this->proxy_->disconnect_sequence_push_consumer (); } void -TAO_Notify_Tests_SequencePushSupplier::disconnect_sequence_push_supplier (void) +TAO_Notify_Tests_SequencePushSupplier::disconnect_sequence_push_supplier () { bool this_method_used_only_by_notify_service = false; ACE_ASSERT(this_method_used_only_by_notify_service); diff --git a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h index d047bcf2f02..57d4e540967 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/SequencePushSupplier.h @@ -32,7 +32,7 @@ public: class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushSupplier_Traits { public: - TAO_Notify_Tests_SequencePushSupplier_Traits (void); + TAO_Notify_Tests_SequencePushSupplier_Traits (); typedef CosNotifyComm::SequencePushSupplier INTERFACE; typedef CosNotifyComm::SequencePushSupplier_ptr PTR; @@ -62,7 +62,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SequencePushSupplier : public TAO_ public: /// Constructor - TAO_Notify_Tests_SequencePushSupplier (void); + TAO_Notify_Tests_SequencePushSupplier (); /// Destructor virtual ~TAO_Notify_Tests_SequencePushSupplier (); @@ -75,10 +75,10 @@ protected: virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr); /// Disconnect from proxy. - virtual void disconnect_from_proxy (void); + virtual void disconnect_from_proxy (); // = SequencePushSupplier method - virtual void disconnect_sequence_push_supplier (void); + virtual void disconnect_sequence_push_supplier (); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp index 9ef61bfdd45..f05dad97be8 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.cpp @@ -1,7 +1,7 @@ #include "StructuredEvent.h" -TAO_Notify_Tests_StructuredEvent::TAO_Notify_Tests_StructuredEvent (void) +TAO_Notify_Tests_StructuredEvent::TAO_Notify_Tests_StructuredEvent () { } @@ -41,7 +41,7 @@ TAO_Notify_Tests_StructuredEvent::type (const char* domain, const char* type) } const char* -TAO_Notify_Tests_StructuredEvent::type (void) +TAO_Notify_Tests_StructuredEvent::type () { return event_.header.fixed_header.event_type.type_name; } @@ -79,7 +79,7 @@ TAO_Notify_Tests_StructuredEvent::payload (CORBA::Any& value) } CosNotification::StructuredEvent& -TAO_Notify_Tests_StructuredEvent::event (void) +TAO_Notify_Tests_StructuredEvent::event () { return this->event_; } diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h index e7216cff97e..605b84bfb95 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredEvent.h @@ -26,7 +26,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredEvent { public: /// Constructor - TAO_Notify_Tests_StructuredEvent (void); + TAO_Notify_Tests_StructuredEvent (); TAO_Notify_Tests_StructuredEvent (const char* name); TAO_Notify_Tests_StructuredEvent (const char* domain, const char* type); TAO_Notify_Tests_StructuredEvent (const char* name, const char* domain, const char* type); @@ -37,7 +37,7 @@ public: void name (const char* name); void type (const char* domain, const char* type); - const char* type (void); + const char* type (); /// add <name,value> to optional header sequence. void opt_header (const char* name, CORBA::Any& value); @@ -52,7 +52,7 @@ public: void payload (CORBA::Any& value); /// access the underlying event. - CosNotification::StructuredEvent& event (void); + CosNotification::StructuredEvent& event (); private: CosNotification::StructuredEvent event_; diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp index acd8e77f3d1..1de6725538b 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.cpp @@ -5,14 +5,14 @@ #endif /* __ACE_INLINE__ */ -TAO_Notify_Tests_StructuredPushConsumer_Traits::TAO_Notify_Tests_StructuredPushConsumer_Traits (void) +TAO_Notify_Tests_StructuredPushConsumer_Traits::TAO_Notify_Tests_StructuredPushConsumer_Traits () :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT) { } /*******************************************************************/ -TAO_Notify_Tests_StructuredPushConsumer::TAO_Notify_Tests_StructuredPushConsumer (void) +TAO_Notify_Tests_StructuredPushConsumer::TAO_Notify_Tests_StructuredPushConsumer () { } @@ -27,14 +27,14 @@ TAO_Notify_Tests_StructuredPushConsumer::connect_to_peer (Proxy_Traits::PTR prox } void -TAO_Notify_Tests_StructuredPushConsumer::disconnect_from_proxy (void) +TAO_Notify_Tests_StructuredPushConsumer::disconnect_from_proxy () { ACE_DEBUG((LM_DEBUG, "\nPush Consumer disconnecting from supplier.\n")); this->proxy_->disconnect_structured_push_supplier (); } void -TAO_Notify_Tests_StructuredPushConsumer::disconnect_structured_push_consumer (void) +TAO_Notify_Tests_StructuredPushConsumer::disconnect_structured_push_consumer () { bool this_method_used_only_by_notify_service = false; ACE_ASSERT(this_method_used_only_by_notify_service); diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h index 3701c977647..76a878d02ae 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushConsumer.h @@ -32,7 +32,7 @@ public: class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushConsumer_Traits { public: - TAO_Notify_Tests_StructuredPushConsumer_Traits (void); + TAO_Notify_Tests_StructuredPushConsumer_Traits (); typedef CosNotifyComm::StructuredPushConsumer INTERFACE; typedef CosNotifyComm::StructuredPushConsumer_ptr PTR; @@ -62,7 +62,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushConsumer : public TA public: /// Constructor - TAO_Notify_Tests_StructuredPushConsumer (void); + TAO_Notify_Tests_StructuredPushConsumer (); /// Destructor virtual ~TAO_Notify_Tests_StructuredPushConsumer (); @@ -72,10 +72,10 @@ protected: virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr); /// Disconnect from proxy. - virtual void disconnect_from_proxy (void); + virtual void disconnect_from_proxy (); // = StructuredPushConsumer methods - virtual void disconnect_structured_push_consumer (void); + virtual void disconnect_structured_push_consumer (); /// Default does nothing. virtual void push_structured_event ( diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp index 02d9fae6808..609a65e2798 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.cpp @@ -5,14 +5,14 @@ #endif /* __ACE_INLINE__ */ -TAO_Notify_Tests_StructuredPushSupplier_Traits::TAO_Notify_Tests_StructuredPushSupplier_Traits (void) +TAO_Notify_Tests_StructuredPushSupplier_Traits::TAO_Notify_Tests_StructuredPushSupplier_Traits () :type_ (CosNotifyChannelAdmin::STRUCTURED_EVENT) { } /*******************************************************************/ -TAO_Notify_Tests_StructuredPushSupplier::TAO_Notify_Tests_StructuredPushSupplier (void) +TAO_Notify_Tests_StructuredPushSupplier::TAO_Notify_Tests_StructuredPushSupplier () { } @@ -37,14 +37,14 @@ TAO_Notify_Tests_StructuredPushSupplier::connect_to_peer (Proxy_Traits::PTR prox } void -TAO_Notify_Tests_StructuredPushSupplier::disconnect_from_proxy (void) +TAO_Notify_Tests_StructuredPushSupplier::disconnect_from_proxy () { ACE_DEBUG((LM_DEBUG, "\nPush Supplier disconnecting from consumer.\n")); this->proxy_->disconnect_structured_push_consumer (); } void -TAO_Notify_Tests_StructuredPushSupplier::disconnect_structured_push_supplier (void) +TAO_Notify_Tests_StructuredPushSupplier::disconnect_structured_push_supplier () { bool this_method_used_only_by_notify_service = false; ACE_ASSERT(this_method_used_only_by_notify_service); diff --git a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h index 72a1bf22d23..906df4ed279 100644 --- a/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h +++ b/TAO/orbsvcs/tests/Notify/lib/StructuredPushSupplier.h @@ -32,7 +32,7 @@ public: class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushSupplier_Traits { public: - TAO_Notify_Tests_StructuredPushSupplier_Traits (void); + TAO_Notify_Tests_StructuredPushSupplier_Traits (); typedef CosNotifyComm::StructuredPushSupplier INTERFACE; typedef CosNotifyComm::StructuredPushSupplier_ptr PTR; @@ -62,7 +62,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_StructuredPushSupplier : public TA public: /// Constructor - TAO_Notify_Tests_StructuredPushSupplier (void); + TAO_Notify_Tests_StructuredPushSupplier (); /// Destructor virtual ~TAO_Notify_Tests_StructuredPushSupplier (); @@ -75,10 +75,10 @@ protected: virtual void connect_to_peer (Proxy_Traits::PTR proxy_ptr, Peer_Traits::PTR peer_ptr); /// Disconnect from proxy. - virtual void disconnect_from_proxy (void); + virtual void disconnect_from_proxy (); // = StructuredPushSupplier method - virtual void disconnect_structured_push_supplier (void); + virtual void disconnect_structured_push_supplier (); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp index b3b91fae728..80ba61097f1 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp @@ -5,7 +5,7 @@ #include "Name.h" #include "Options_Parser.h" -TAO_Notify_Tests_SupplierAdmin_Command::TAO_Notify_Tests_SupplierAdmin_Command (void) +TAO_Notify_Tests_SupplierAdmin_Command::TAO_Notify_Tests_SupplierAdmin_Command () : ifgop_ (CosNotifyChannelAdmin::OR_OP), id_ (0) { } @@ -15,13 +15,13 @@ TAO_Notify_Tests_SupplierAdmin_Command::~TAO_Notify_Tests_SupplierAdmin_Command } const char* -TAO_Notify_Tests_SupplierAdmin_Command::get_name (void) +TAO_Notify_Tests_SupplierAdmin_Command::get_name () { return TAO_Notify_Tests_SupplierAdmin_Command::name (); } const char* -TAO_Notify_Tests_SupplierAdmin_Command::name (void) +TAO_Notify_Tests_SupplierAdmin_Command::name () { return TAO_Notify_Tests_Name::supplier_admin_command; } @@ -87,7 +87,7 @@ TAO_Notify_Tests_SupplierAdmin_Command::init (ACE_Arg_Shifter& arg_shifter) } void -TAO_Notify_Tests_SupplierAdmin_Command::handle_create (void) +TAO_Notify_Tests_SupplierAdmin_Command::handle_create () { CosNotifyChannelAdmin::EventChannel_var ec; @@ -102,7 +102,7 @@ TAO_Notify_Tests_SupplierAdmin_Command::handle_create (void) } void -TAO_Notify_Tests_SupplierAdmin_Command::handle_offers (void) +TAO_Notify_Tests_SupplierAdmin_Command::handle_offers () { CosNotifyChannelAdmin::SupplierAdmin_var admin; @@ -128,12 +128,12 @@ TAO_Notify_Tests_SupplierAdmin_Command::handle_offers (void) } void -TAO_Notify_Tests_SupplierAdmin_Command::handle_status (void) +TAO_Notify_Tests_SupplierAdmin_Command::handle_status () { } void -TAO_Notify_Tests_SupplierAdmin_Command::handle_set_qos (void) +TAO_Notify_Tests_SupplierAdmin_Command::handle_set_qos () { CosNotifyChannelAdmin::SupplierAdmin_var admin; @@ -143,7 +143,7 @@ TAO_Notify_Tests_SupplierAdmin_Command::handle_set_qos (void) } void -TAO_Notify_Tests_SupplierAdmin_Command::execute_i (void) +TAO_Notify_Tests_SupplierAdmin_Command::execute_i () { if (this->command_ == CREATE) { diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h index 5652a2d05c8..e7b13a30048 100644 --- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h +++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h @@ -28,7 +28,7 @@ class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_SupplierAdmin_Command : public TAO { public: /// Constructor - TAO_Notify_Tests_SupplierAdmin_Command (void); + TAO_Notify_Tests_SupplierAdmin_Command (); /// Destructor ~TAO_Notify_Tests_SupplierAdmin_Command (); @@ -37,11 +37,11 @@ public: virtual void init (ACE_Arg_Shifter& arg_shifter); /// Execute the command. - virtual void execute_i (void); + virtual void execute_i (); /// Name of object - virtual const char* get_name (void); - static const char* name (void); + virtual const char* get_name (); + static const char* name (); protected: #ifdef HPUX_11 @@ -73,10 +73,10 @@ protected: CosNotification::EventTypeSeq removed_; /// = Handlers - void handle_create (void); - void handle_offers (void); - void handle_status (void); - void handle_set_qos (void); + void handle_create (); + void handle_offers (); + void handle_status (); + void handle_set_qos (); }; #include /**/ "ace/post.h" diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp index 75e2ce86f1b..170fa2a4ab7 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.cpp @@ -5,7 +5,7 @@ template <class Supplier_Traits> -TAO_Notify_Tests_Supplier_T<Supplier_Traits>::TAO_Notify_Tests_Supplier_T (void) +TAO_Notify_Tests_Supplier_T<Supplier_Traits>::TAO_Notify_Tests_Supplier_T () { } @@ -15,7 +15,7 @@ TAO_Notify_Tests_Supplier_T<Supplier_Traits>::~TAO_Notify_Tests_Supplier_T () } template <class Supplier_Traits> typename TAO_Notify_Tests_Supplier_T<Supplier_Traits>::Proxy_Traits_PTR -TAO_Notify_Tests_Supplier_T<Supplier_Traits>::get_proxy_consumer (void) +TAO_Notify_Tests_Supplier_T<Supplier_Traits>::get_proxy_consumer () { return this->get_proxy (); } diff --git a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h index 8b9e22292c8..43d4e6310b2 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h +++ b/TAO/orbsvcs/tests/Notify/lib/Supplier_T.h @@ -50,13 +50,13 @@ class TAO_Notify_Tests_Supplier_T : public TAO_Notify_Tests_Peer_T <Supplier_Tra public: /// Constructor - TAO_Notify_Tests_Supplier_T (void); + TAO_Notify_Tests_Supplier_T (); /// Destructor ~TAO_Notify_Tests_Supplier_T (); /// For backward compatibility. use <get_proxy> instead. - Proxy_Traits_PTR get_proxy_consumer (void); + Proxy_Traits_PTR get_proxy_consumer (); /// Send offer change. void offer_change (CosNotification::EventTypeSeq &added, CosNotification::EventTypeSeq& removed); diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp index 89e9ca09e88..63780e8d631 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.cpp @@ -1,5 +1,5 @@ #include "Task_Callback.h" -TAO_Notify_Tests_Task_Callback::~TAO_Notify_Tests_Task_Callback (void) +TAO_Notify_Tests_Task_Callback::~TAO_Notify_Tests_Task_Callback () { } diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h index fa25715f91d..5961ff0407e 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h +++ b/TAO/orbsvcs/tests/Notify/lib/Task_Callback.h @@ -26,7 +26,7 @@ class TAO_Notify_Tests_Periodic_Consumer; class TAO_NOTIFY_TEST_Export TAO_Notify_Tests_Task_Callback { public: - virtual ~TAO_Notify_Tests_Task_Callback (void); + virtual ~TAO_Notify_Tests_Task_Callback (); virtual void done (TAO_Notify_Tests_Periodic_Supplier* supplier) = 0; virtual void done (TAO_Notify_Tests_Periodic_Consumer* consumer) = 0; }; diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp index 89ee2135cd5..98efa2bd726 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp +++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp @@ -9,12 +9,12 @@ ACE_High_Res_Timer::global_scale_factor_type Task_Stats::gsf_ = ACE_High_Res_Timer::global_scale_factor (); -Base_Time::Base_Time (void) +Base_Time::Base_Time () { base_time_ = ACE_OS::gethrtime (); } -Task_Stats::Task_Stats (void) +Task_Stats::Task_Stats () : base_time_(0), end_time_ (0), max_samples_ (0), @@ -26,7 +26,7 @@ Task_Stats::Task_Stats (void) { } -Task_Stats::~Task_Stats (void) +Task_Stats::~Task_Stats () { delete[] this->time_inv_; delete[] this->time_exec_; diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h index 90c1e76fec5..15c70bfd8c3 100644 --- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h +++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h @@ -26,7 +26,7 @@ class TAO_NOTIFY_TEST_Export Base_Time { public: - Base_Time (void); + Base_Time (); ACE_hrtime_t base_time_; }; @@ -41,10 +41,10 @@ class TAO_NOTIFY_TEST_Export Task_Stats { public: /// Constructor - Task_Stats (void); + Task_Stats (); /// Destructor - ~Task_Stats (void); + ~Task_Stats (); /// Useful Global Scale Factor static ACE_High_Res_Timer::global_scale_factor_type gsf_; diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp index 92a936634e6..476f7066653 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp @@ -38,12 +38,12 @@ public: { } - void go (void) + void go () { started_ = true; } - void done (void) + void done () { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp index c140fa781cf..13944655096 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp @@ -37,12 +37,12 @@ public: { } - void go (void) + void go () { started_ = true; } - void done (void) + void done () { started_ = false; } diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp index 910eae6827d..433ee9953a7 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp @@ -61,7 +61,7 @@ RedGreen_Test::parse_args (int argc, return 0; } -RedGreen_Test::RedGreen_Test (void) +RedGreen_Test::RedGreen_Test () : burst_size_ (10), nthreads_ (2) { @@ -117,7 +117,7 @@ RedGreen_Test::init (int argc, } void -RedGreen_Test::run (void) +RedGreen_Test::run () { try { @@ -142,7 +142,7 @@ RedGreen_Test::run (void) } void -RedGreen_Test::done (void) +RedGreen_Test::done () { dump_results (); worker_.done (); @@ -181,7 +181,7 @@ RedGreen_Test::init_ORB (int argc, ACE_TCHAR *argv []) } void -RedGreen_Test::resolve_naming_service (void) +RedGreen_Test::resolve_naming_service () { CORBA::Object_var naming_obj = this->orb_->resolve_initial_references (NAMING_SERVICE_NAME); @@ -197,7 +197,7 @@ RedGreen_Test::resolve_naming_service (void) } void -RedGreen_Test::resolve_Notify_factory (void) +RedGreen_Test::resolve_Notify_factory () { CosNaming::Name name (1); name.length (1); @@ -213,7 +213,7 @@ RedGreen_Test::resolve_Notify_factory (void) } void -RedGreen_Test::create_EC (void) +RedGreen_Test::create_EC () { CosNotifyChannelAdmin::ChannelID id; @@ -225,7 +225,7 @@ RedGreen_Test::create_EC (void) } void -RedGreen_Test::create_supplieradmin (void) +RedGreen_Test::create_supplieradmin () { CosNotifyChannelAdmin::AdminID adminid; @@ -237,7 +237,7 @@ RedGreen_Test::create_supplieradmin (void) } void -RedGreen_Test::create_consumeradmin (void) +RedGreen_Test::create_consumeradmin () { CosNotifyChannelAdmin::AdminID adminid; @@ -249,7 +249,7 @@ RedGreen_Test::create_consumeradmin (void) } void -RedGreen_Test::create_consumers (void) +RedGreen_Test::create_consumers () { ACE_NEW (this->normal_consumer_, RedGreen_Test_StructuredPushConsumer (this)); @@ -261,7 +261,7 @@ RedGreen_Test::create_consumers (void) } void -RedGreen_Test::create_suppliers (void) +RedGreen_Test::create_suppliers () { ACE_NEW (this->supplier_, RedGreen_Test_StructuredPushSupplier ()); @@ -269,7 +269,7 @@ RedGreen_Test::create_suppliers (void) } void -RedGreen_Test::send_events (void) +RedGreen_Test::send_events () { // Setup the Consumer 1 to receive //event_type : "DOMAIN_GREEN", "DOMAIN_GREEN". @@ -337,7 +337,7 @@ RedGreen_Test::send_events (void) void -RedGreen_Test::dump_results (void) +RedGreen_Test::dump_results () { ACE_Throughput_Stats throughput; ACE_High_Res_Timer::global_scale_factor_type gsf = @@ -437,7 +437,7 @@ RedGreen_Test_StructuredPushConsumer::connect ( } void -RedGreen_Test_StructuredPushConsumer::disconnect (void) +RedGreen_Test_StructuredPushConsumer::disconnect () { this->proxy_supplier_-> disconnect_structured_push_supplier (); @@ -505,7 +505,7 @@ RedGreen_Test_StructuredPushConsumer::disconnect_structured_push_consumer ( } CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr -RedGreen_Test_StructuredPushConsumer::get_proxy_supplier (void) +RedGreen_Test_StructuredPushConsumer::get_proxy_supplier () { return this->proxy_supplier_.in (); } @@ -587,7 +587,7 @@ RedGreen_Test_StructuredPushSupplier::connect ( } void -RedGreen_Test_StructuredPushSupplier::disconnect (void) +RedGreen_Test_StructuredPushSupplier::disconnect () { ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ())); @@ -637,7 +637,7 @@ RedGreen_Test_StructuredPushSupplier::disconnect_structured_push_supplier ( //***************************************************************** -Worker::Worker (void) +Worker::Worker () { } @@ -648,13 +648,13 @@ Worker::orb (CORBA::ORB_ptr orb) } void -Worker::done (void) +Worker::done () { consumer_is_done = true; } int -Worker::svc (void) +Worker::svc () { try { diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h index 1fcdeaa6a64..44f32fc0028 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h @@ -42,7 +42,7 @@ class Worker : public ACE_Task_Base { public: /// Constructor. - Worker (void); + Worker (); void orb (CORBA::ORB_ptr orb); @@ -50,7 +50,7 @@ public: virtual int svc (); // Shutdown ORB - void done (void); + void done (); private: /// The orb @@ -68,25 +68,25 @@ class RedGreen_Test { public: // = Initialization - RedGreen_Test (void); + RedGreen_Test (); int parse_args (int argc, ACE_TCHAR *argv[]); - void dump_results (void); + void dump_results (); /// Initialize the Client. void init (int argc, ACE_TCHAR *argv []); /// Run the demo. - void run (void); + void run (); /// Called when all events we are waiting for have occurred. - void done (void); + void done (); /// Destroy from the EC - void destroy_ec (void); + void destroy_ec (); int burst_size_; Worker worker_; @@ -98,28 +98,28 @@ class RedGreen_Test ACE_TCHAR *argv []); /// Try to get hold of a running naming service. - void resolve_naming_service (void); + void resolve_naming_service (); /// Try to resolve the Notify factory from the Naming service. - void resolve_Notify_factory (void); + void resolve_Notify_factory (); /// Create an EC. - void create_EC (void); + void create_EC (); /// Create the Supplier Admin. - void create_supplieradmin(void); + void create_supplieradmin(); /// Create the Consumer Admin. - void create_consumeradmin (void); + void create_consumeradmin (); /// Create and initialize the consumers. - void create_consumers (void); + void create_consumers (); /// create and initialize the suppliers. - void create_suppliers (void); + void create_suppliers (); /// send the events. - void send_events (void); + void send_events (); // = Data Members. /// Reference to the root poa. @@ -177,10 +177,10 @@ public: void connect (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin); /// Disconnect from the supplier. - virtual void disconnect (void); + virtual void disconnect (); /// Accessor for the Proxy that we're connected to. - CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (void); + CosNotifyChannelAdmin::StructuredProxyPushSupplier_ptr get_proxy_supplier (); /// Accumulate the throughput statistics into <throughput> void accumulate_into (ACE_Throughput_Stats &throughput) const; @@ -210,7 +210,7 @@ protected: // = Methods /// Destructor - virtual ~RedGreen_Test_StructuredPushConsumer (void); + virtual ~RedGreen_Test_StructuredPushConsumer (); // = NotifyPublish method virtual void offer_change ( @@ -247,14 +247,14 @@ class RedGreen_Test_StructuredPushSupplier // public: /// Constructor. - RedGreen_Test_StructuredPushSupplier (void); + RedGreen_Test_StructuredPushSupplier (); /// Connect the Supplier to the EventChannel. /// Creates a new proxy supplier and connects to it. void connect (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin); /// Disconnect from the supplier. - void disconnect (void); + void disconnect (); /// Send one event. virtual void send_event (CosNotification::StructuredEvent& event); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp index d1aa014c192..7b7ea8fbf23 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp @@ -115,7 +115,7 @@ Throughput_StructuredPushSupplier::dump_stats ( } int -Throughput_StructuredPushSupplier::svc (void) +Throughput_StructuredPushSupplier::svc () { // Initialize a time value to pace the test. ACE_Time_Value tv (0, test_client_->burst_pause_); @@ -179,7 +179,7 @@ Throughput_StructuredPushSupplier::svc (void) } /***************************************************************************/ -Notify_Throughput::Notify_Throughput (void) +Notify_Throughput::Notify_Throughput () : collocated_ec_ (0), burst_count_ (1), burst_pause_ (10000), @@ -388,7 +388,7 @@ Notify_Throughput::parse_args(int argc, ACE_TCHAR *argv[]) } void -Notify_Throughput::create_EC (void) +Notify_Throughput::create_EC () { if (this->collocated_ec_ == 1) { @@ -438,7 +438,7 @@ else } void -Notify_Throughput::run_test (void) +Notify_Throughput::run_test () { ACE_DEBUG ((LM_DEBUG, "collocated_ec_ %d ," "burst_count_ %d, " @@ -491,7 +491,7 @@ Notify_Throughput::run_test (void) } void -Notify_Throughput::peer_done (void) +Notify_Throughput::peer_done () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, lock_); @@ -503,7 +503,7 @@ Notify_Throughput::peer_done (void) } void -Notify_Throughput::dump_results (void) +Notify_Throughput::dump_results () { ACE_Throughput_Stats throughput; ACE_High_Res_Timer::global_scale_factor_type gsf = @@ -575,7 +575,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) // **************************************************************** -Worker::Worker (void) +Worker::Worker () :done_ (0) { } @@ -587,7 +587,7 @@ Worker::orb (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { ACE_Time_Value tv(5); diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h index 3608ad848c4..041cee324e2 100644 --- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h +++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h @@ -36,7 +36,7 @@ class Worker : public ACE_Task_Base { public: /// ctor - Worker (void); + Worker (); void orb (CORBA::ORB_ptr orb); @@ -131,7 +131,7 @@ class Notify_Throughput : public Notify_Test_Client { public: // Initialization and termination code - Notify_Throughput (void); + Notify_Throughput (); virtual ~Notify_Throughput (); int parse_args(int argc, ACE_TCHAR *argv[]) ; @@ -140,18 +140,18 @@ public: int init (int argc, ACE_TCHAR *argv []); /// Run the test. - void run_test (void); + void run_test (); /// Peers call this when done. - void peer_done (void); + void peer_done (); /// check if we got the expected results. - void dump_results (void); + void dump_results (); Worker worker_; protected: /// Create participants. - void create_EC (void); + void create_EC (); /// is the ec collocated. CORBA::Boolean collocated_ec_; diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp index 9641e4f164f..b67966b3f46 100644 --- a/TAO/orbsvcs/tests/Property/client.cpp +++ b/TAO/orbsvcs/tests/Property/client.cpp @@ -14,7 +14,7 @@ #include "tao/debug.h" - Client::Client (void) + Client::Client () { } @@ -52,7 +52,7 @@ Client::init (int argc, // Testing the methods of the property service. int -Client::property_tester (void) +Client::property_tester () { // = Testing PropertySet & Iterators. @@ -103,7 +103,7 @@ Client::property_tester (void) // Testing define_property. int -Client::test_define_property (void) +Client::test_define_property () { CORBA::Any anyval; @@ -159,7 +159,7 @@ Client::test_define_property (void) // Testing get_all_property_names of the PropertySet. int -Client::test_get_all_property_names (void) +Client::test_get_all_property_names () { // Get the size. CORBA::ULong num_of_properties = @@ -233,7 +233,7 @@ Client::test_get_all_property_names (void) // properties. int -Client::test_get_properties (void) +Client::test_get_properties () { // Get float_property, string_property and no_property. If return // value is false and type is tc_void then that name is not there in @@ -322,7 +322,7 @@ Client::test_get_properties (void) // Testing, get_number_of_properties. int -Client::test_get_number_of_properties (void) +Client::test_get_number_of_properties () { CORBA::ULong nproperties = this->propsetdef_->get_number_of_properties (); @@ -366,7 +366,7 @@ Client::test_delete_property (const char *property_name) // properties. int -Client::test_delete_properties (void) +Client::test_delete_properties () { CosPropertyService::PropertyNames prop_names; prop_names.length (3); @@ -383,7 +383,7 @@ Client::test_delete_properties (void) // float in the property set. int -Client::test_define_properties (void) +Client::test_define_properties () { CosPropertyService::Properties nproperties; nproperties.length (4); @@ -429,7 +429,7 @@ Client::test_define_properties (void) // Test get_all_properties. int -Client::test_get_all_properties (void) +Client::test_get_all_properties () { // Get the number of current properties. CORBA::ULong num_of_properties = @@ -563,7 +563,7 @@ Client::test_get_all_properties (void) // Testing define property with mode. // Defines char, short, long and float properties with different modes. int -Client::test_define_property_with_mode (void) +Client::test_define_property_with_mode () { CORBA::Any anyval; @@ -620,7 +620,7 @@ Client::test_define_property_with_mode (void) } int -Client::test_get_property_value (void) +Client::test_get_property_value () { try { diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h index 18c81e93438..2bcb7e48f87 100644 --- a/TAO/orbsvcs/tests/Property/client.h +++ b/TAO/orbsvcs/tests/Property/client.h @@ -38,17 +38,17 @@ class Client { public: /// Constructor. - Client (void); + Client (); /// Initialize the ORB etc, and bind the MMDevices. int init (int argc, ACE_TCHAR **argv); /// Run the client. This will call StreamCtrl::bind_devs. - int run (void); + int run (); /// Testing the property service methods. - int property_tester (void); + int property_tester (); protected: /// Bind to the remote MMDevice. @@ -58,34 +58,34 @@ protected: // = Property Testing. /// Testing the define property method. - int test_define_property (void); + int test_define_property (); /// Testing the number of properties, currently in the Property Set. - int test_get_number_of_properties (void); + int test_get_number_of_properties (); ///Testing get_all_property_names. - int test_get_all_property_names (void); + int test_get_all_property_names (); /// Testing get_property_value. - int test_get_property_value (void); + int test_get_property_value (); ///Testing get_properties. Give the names and get their properties. - int test_get_properties (void); + int test_get_properties (); /// Testing get_all_properties. - int test_get_all_properties (void); + int test_get_all_properties (); /// Testing delete_property. int test_delete_property (const char *property_name); /// Testing delete_properties. - int test_delete_properties (void); + int test_delete_properties (); /// Defining a sequence of properties. - int test_define_properties (void); + int test_define_properties (); /// Defines properties with various modes. - int test_define_property_with_mode (void); + int test_define_property_with_mode (); /// The ORB manager, handles ORB initialization etc. TAO_ORB_Manager manager_; diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp index 3dec33abd9a..cfa6d7e40bd 100644 --- a/TAO/orbsvcs/tests/Property/main.cpp +++ b/TAO/orbsvcs/tests/Property/main.cpp @@ -31,36 +31,36 @@ public: // He has to instantiate TAO_NamesIterator class using the instance // of TAO_PropertySet. - TAO_PropertySet_Tester (void); + TAO_PropertySet_Tester (); // Constructor. - ~TAO_PropertySet_Tester (void); + ~TAO_PropertySet_Tester (); // Destructor. - int test_define_property (void); + int test_define_property (); // Defines a char,a short, a long, a float and a string property. - int test_get_number_of_properties (void); + int test_get_number_of_properties (); // Gets the number of properties currently defined in the PropertySet. int test_delete_property (const char *property_name); // Delete a given property. - int test_is_property_defined (void); + int test_is_property_defined (); // Check the following properties are defined or // no. "char_property", "short_property" and a "string_property". - int test_get_property_value (void); + int test_get_property_value (); // Get the "float_property" and "string_property" and print them // out. - int test_delete_properties (void); + int test_delete_properties (); // Delete char, short,long, and string properties. - int test_delete_all_properties (void); + int test_delete_all_properties (); // Delete all the properties. - int test_define_properties (void); + int test_define_properties (); // Define a sequence of properties. a char, a short, a long, a float // and a string. @@ -82,14 +82,14 @@ public: TAO_PropertyNamesIterator_Tester (TAO_PropertySet_Tester &propertyset_tester); // Constructor. To make names iterator from the property set object. - ~TAO_PropertyNamesIterator_Tester (void); + ~TAO_PropertyNamesIterator_Tester (); // Destructor. - int test_next_one (void); + int test_next_one (); // Test next one method. Iterate thru all the names in the // PropertySet and print them out. - int test_reset (void); + int test_reset (); // Test the reset method. int test_next_n (size_t n); @@ -101,18 +101,18 @@ private: // Constructor. -TAO_PropertySet_Tester::TAO_PropertySet_Tester (void) +TAO_PropertySet_Tester::TAO_PropertySet_Tester () { } // Destructor. -TAO_PropertySet_Tester::~TAO_PropertySet_Tester (void) +TAO_PropertySet_Tester::~TAO_PropertySet_Tester () { } // Defines a char, a short, a long, a float and a string. int -TAO_PropertySet_Tester::test_define_property (void) +TAO_PropertySet_Tester::test_define_property () { ACE_DEBUG ((LM_DEBUG, "\nChecking define_property\n")); @@ -185,7 +185,7 @@ TAO_PropertySet_Tester::test_define_property (void) // Testing, get_number_of_properties. int -TAO_PropertySet_Tester::test_get_number_of_properties (void) +TAO_PropertySet_Tester::test_get_number_of_properties () { ACE_DEBUG ((LM_DEBUG, "Main : Number of props : %d\n", @@ -208,7 +208,7 @@ TAO_PropertySet_Tester::test_delete_property (const char *property_name) // Gets the value of "short_property" and "string_property". int -TAO_PropertySet_Tester::test_get_property_value (void) +TAO_PropertySet_Tester::test_get_property_value () { ACE_DEBUG ((LM_DEBUG, "\nChecking get_property_value\n")); @@ -246,7 +246,7 @@ TAO_PropertySet_Tester::test_get_property_value (void) // "string_property" and "char_property". int -TAO_PropertySet_Tester::test_is_property_defined (void) +TAO_PropertySet_Tester::test_is_property_defined () { ACE_DEBUG ((LM_DEBUG, "\nChecking is_property_defined ()\n")); @@ -276,7 +276,7 @@ TAO_PropertySet_Tester::test_is_property_defined (void) // PropertySet. Deleting char, short, long, float and string // properties. int -TAO_PropertySet_Tester::test_delete_properties (void) +TAO_PropertySet_Tester::test_delete_properties () { ACE_DEBUG ((LM_DEBUG, "\nChecking delete_properties == Deleting a sequence of Properties\n")); @@ -298,7 +298,7 @@ TAO_PropertySet_Tester::test_delete_properties (void) // Defines a sequnce of properties containing, char, short, long, // float and string property in the property set. int -TAO_PropertySet_Tester::test_define_properties (void) +TAO_PropertySet_Tester::test_define_properties () { ACE_DEBUG ((LM_DEBUG, "\nChecking define_properties == Defining sequence of properties\n")); @@ -353,7 +353,7 @@ TAO_PropertySet_Tester::test_define_properties (void) // Delete all the properties. int -TAO_PropertySet_Tester::test_delete_all_properties (void) +TAO_PropertySet_Tester::test_delete_all_properties () { // Deleting all the properties ACE_DEBUG ((LM_DEBUG, @@ -375,14 +375,14 @@ TAO_PropertyNamesIterator_Tester::TAO_PropertyNamesIterator_Tester (TAO_Property } // Destructor. -TAO_PropertyNamesIterator_Tester::~TAO_PropertyNamesIterator_Tester (void) +TAO_PropertyNamesIterator_Tester::~TAO_PropertyNamesIterator_Tester () { } // Test next one method. Iterate thru all the names in the // PropertySet and print them out. int -TAO_PropertyNamesIterator_Tester::test_next_one (void) +TAO_PropertyNamesIterator_Tester::test_next_one () { CORBA::String_var strvar; ACE_DEBUG ((LM_DEBUG, @@ -399,7 +399,7 @@ TAO_PropertyNamesIterator_Tester::test_next_one (void) // Reset the names iterator. int -TAO_PropertyNamesIterator_Tester::test_reset (void) +TAO_PropertyNamesIterator_Tester::test_reset () { ACE_DEBUG ((LM_DEBUG, "Resetting (reset ()) the NamesIterator.")); diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp index f583e10c785..959933e9d5c 100644 --- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp @@ -27,7 +27,7 @@ public: My_Test_Object (CORBA::Short id = 0); // Constructor. - ~My_Test_Object (void); + ~My_Test_Object (); // Destructor. // = Interface implementation accessor methods. @@ -35,7 +35,7 @@ public: void id (CORBA::Short id); // Sets id. - CORBA::Short id (void); + CORBA::Short id (); // Gets id. private: @@ -47,12 +47,12 @@ My_Test_Object::My_Test_Object (CORBA::Short id) { } -My_Test_Object::~My_Test_Object (void) +My_Test_Object::~My_Test_Object () { } CORBA::Short -My_Test_Object::id (void) +My_Test_Object::id () { return id_; } diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp index 21be335d766..b2e4d80e1d8 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp @@ -10,7 +10,7 @@ const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); -void do_nothing (void) +void do_nothing () { } diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp index 6d40115b9ea..d1e7215d8ee 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp @@ -11,7 +11,7 @@ void -Callback_i::shutdown (void) +Callback_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); this->orb_->shutdown (false); @@ -48,7 +48,7 @@ Simple_Server_i::callback_object (Callback_ptr callback } int -Simple_Server_i::call_client (void) +Simple_Server_i::call_client () { size_t pre_call_connections = this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size (); @@ -86,7 +86,7 @@ Simple_Server_i::call_client (void) void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h index f7a40ffbf10..8444d669abe 100644 --- a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h +++ b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.h @@ -28,10 +28,10 @@ public: Callback_i (CORBA::ORB_ptr orb); /// Safe way to shutdown - void shutdown (void); + void shutdown (); /// The callback method - void callback_method (void); + void callback_method (); private: /// The orb @@ -56,9 +56,9 @@ public: void callback_object (Callback_ptr callback); - void shutdown (void); + void shutdown (); - int call_client (void); + int call_client (); private: /// The ORB diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp index c2e101e5072..c9bce7f4a55 100644 --- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp +++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.cpp @@ -11,7 +11,7 @@ Foo_i::Foo_i (CORBA::ORB_ptr orb, } void -Foo_i::baz (void) +Foo_i::baz () { // Make sure that logging will occur. ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR); @@ -30,7 +30,7 @@ Foo_i::baz (void) } void -Foo_i::shutdown (void) +Foo_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h index d8b35af56e5..37311e46ef9 100644 --- a/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h +++ b/TAO/orbsvcs/tests/Security/Bug_1107_Regression/Foo_i.h @@ -24,9 +24,9 @@ public: SecurityLevel3::SecurityCurrent_ptr current); /// Test method. - virtual void baz (void); + virtual void baz (); - virtual void shutdown (void); + virtual void shutdown (); private: /// Reference to the ORB. diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp index 2aea77e7ca2..6a2b9729e2c 100644 --- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp +++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.cpp @@ -13,7 +13,7 @@ Client_Task::Client_Task ( } int -Client_Task::svc (void) +Client_Task::svc () { try { diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h index f1b2d8da72f..754f82a4803 100644 --- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h +++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Client_Task.h @@ -20,7 +20,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); int result_; private: diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp index 613fff71ac8..55b31a10e62 100644 --- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp +++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.cpp @@ -10,7 +10,7 @@ Messenger_i::Messenger_i (CORBA::ORB_var orb) } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } @@ -56,7 +56,7 @@ Messenger_i::call_message (const char * user_name) } void -Messenger_i::shutdown (void) +Messenger_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.h b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.h index cdd6cad484a..0172d33db30 100644 --- a/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.h +++ b/TAO/orbsvcs/tests/Security/Bug_2908_Regression/Messenger_i.h @@ -17,7 +17,7 @@ public: Messenger_i (CORBA::ORB_var orb); // Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, const char * subject, @@ -25,7 +25,7 @@ public: virtual CORBA::Boolean call_message (const char * user_name); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp index a78901c9e85..eea1bb60430 100644 --- a/TAO/orbsvcs/tests/Security/Callback/client_i.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/client_i.cpp @@ -6,7 +6,7 @@ client_i::client_i (server_ptr s) { } -client_i::~client_i (void) +client_i::~client_i () { } diff --git a/TAO/orbsvcs/tests/Security/Callback/client_i.h b/TAO/orbsvcs/tests/Security/Callback/client_i.h index 6cbcbb68d82..1966178c441 100644 --- a/TAO/orbsvcs/tests/Security/Callback/client_i.h +++ b/TAO/orbsvcs/tests/Security/Callback/client_i.h @@ -27,7 +27,7 @@ class client_i { public: client_i (server_ptr s); - virtual ~client_i (void); + virtual ~client_i (); virtual void test_reply (const char *msg); diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp index 8084f520be6..8483de6b74d 100644 --- a/TAO/orbsvcs/tests/Security/Callback/server_i.cpp +++ b/TAO/orbsvcs/tests/Security/Callback/server_i.cpp @@ -6,7 +6,7 @@ server_i::server_i (CORBA::ORB_ptr orb) { } -server_i::~server_i (void) +server_i::~server_i () { } @@ -23,7 +23,7 @@ server_i::test_request (const char *msg) } void -server_i::shutdown (void) +server_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Security/Callback/server_i.h b/TAO/orbsvcs/tests/Security/Callback/server_i.h index 5d674c48ca3..759001a23a5 100644 --- a/TAO/orbsvcs/tests/Security/Callback/server_i.h +++ b/TAO/orbsvcs/tests/Security/Callback/server_i.h @@ -25,13 +25,13 @@ class server_i { public: server_i (CORBA::ORB_ptr orb); - virtual ~server_i (void); + virtual ~server_i (); virtual void set_client (client_ptr c); virtual void test_request (const char *msg); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp index 6f2713ef5f3..7cfc74c06c0 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.cpp @@ -24,7 +24,7 @@ Simple_Server_i::send_line (const char *) } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h index fb2e86350c9..3391e218fca 100644 --- a/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h +++ b/TAO/orbsvcs/tests/Security/Crash_Test/test_i.h @@ -29,7 +29,7 @@ public: // = The Simple_Server methods. void send_line (const char *line); - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp index 64c5acf73df..4f1b86398cc 100644 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.cpp @@ -9,7 +9,7 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb, } int -Client_Task::svc (void) +Client_Task::svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h index f0e94c59e2a..cf414bdc1bd 100644 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Client_Task.h @@ -21,7 +21,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Reference to the ORB diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp index 900e505506a..751dc660f08 100644 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.cpp @@ -1,6 +1,6 @@ #include "Receiver_i.h" -Receiver_i::Receiver_i (void) +Receiver_i::Receiver_i () : message_count_ (0) , byte_count_ (0) { @@ -16,7 +16,7 @@ Receiver_i::receive_payload (const Receiver::Payload &payload) } CORBA::Long -Receiver_i::get_event_count (void) +Receiver_i::get_event_count () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->message_count_; diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h index 8f426fb3106..ea27d75337e 100644 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Receiver_i.h @@ -13,11 +13,11 @@ class Receiver_i { public: /// Constructor - Receiver_i (void); + Receiver_i (); /// Get the number of events that have been received, local method - CORBA::Long get_event_count (void); + CORBA::Long get_event_count (); // = The skeleton methods virtual void receive_payload (const Receiver::Payload &payload); diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp index 00b43a9ed7d..262880457aa 100644 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.cpp @@ -19,7 +19,7 @@ Sender_i::Sender_i (CORBA::ULong no_clients, this->payload_[j] = (j % 256); } -Sender_i::~Sender_i (void) +Sender_i::~Sender_i () { delete []this->receivers_; } @@ -49,7 +49,7 @@ Sender_i::receiver_object (Receiver_ptr recv) void -Sender_i::send_message (void) +Sender_i::send_message () { // NOTE:No synchronization with purpose. Synchrnozing this is // going to spoil the whole purpose of this test. diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h index a57494d613d..e19766d6b8e 100644 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Sender_i.h @@ -20,13 +20,13 @@ public: Sender_i (CORBA::ULong no_clients, ACE_Manual_Event &event); - virtual ~Sender_i (void); + virtual ~Sender_i (); // = The skeleton methods virtual CORBA::Long receiver_object (Receiver *recv); /// Public method defined locally - void send_message (void); + void send_message (); private: /// Synchronizing acces to this class diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp index e6b3d3e6fcc..48b6835359c 100644 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.cpp @@ -20,7 +20,7 @@ Server_Task::Server_Task (Sender_i *sender, } int -Server_Task::svc (void) +Server_Task::svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Wait for the Event\n")); diff --git a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h index 3a34b55d44c..71c65b4a4c2 100644 --- a/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h +++ b/TAO/orbsvcs/tests/Security/MT_BiDir_SSL/Server_Task.h @@ -30,7 +30,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// The sender object diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp index d44c009f95d..de55515f5c6 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.cpp @@ -9,7 +9,7 @@ Client_Worker::Client_Worker (Simple_Server_ptr server, } void -Client_Worker::validate_connection (void) +Client_Worker::validate_connection () { // Ping the object 100 times, ignoring all exceptions. // It would be better to use validate_connection() but the test must @@ -32,7 +32,7 @@ Client_Worker::validate_connection (void) } int -Client_Worker::svc (void) +Client_Worker::svc () { try { diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h index 011ef349b52..c153997ffa4 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Client_Worker.h @@ -39,7 +39,7 @@ public: private: /// Validate the connection - void validate_connection (void); + void validate_connection (); private: /// The server. diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp index 0d3f42a283f..1405bed4ce4 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Server_Worker.cpp @@ -6,7 +6,7 @@ Server_Worker::Server_Worker (CORBA::ORB_ptr orb) } int -Server_Worker::svc (void) +Server_Worker::svc () { try { diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp index 41dad39c610..06520b66af1 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.cpp @@ -11,13 +11,13 @@ #endif /* __ACE_INLINE__ */ void -Simple_Server_i::ping (void) +Simple_Server_i::ping () { return; } void -Simple_Server_i::validate_protocol (void) +Simple_Server_i::validate_protocol () { if (this->validated_ == NOT_VALIDATED) { @@ -74,7 +74,7 @@ Simple_Server_i::test_method (CORBA::Long x) } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h index ac63e1363ff..7688de68c5f 100644 --- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h +++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/test_i.h @@ -27,13 +27,13 @@ public: Simple_Server_i (CORBA::ORB_ptr orb); // = The Simple_Server methods. - void ping (void); + void ping (); - void validate_protocol (void); + void validate_protocol (); CORBA::Long test_method (CORBA::Long x); - void shutdown (void); + void shutdown (); private: /// The ORB diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp index 8dc48e6da45..0d613916741 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.cpp @@ -11,7 +11,7 @@ Client_Worker::Client_Worker (Simple_Server_ptr server, } void -Client_Worker::validate_connection (void) +Client_Worker::validate_connection () { // Ping the object 100 times, ignoring all exceptions. // It would be better to use validate_connection() but the test must @@ -34,7 +34,7 @@ Client_Worker::validate_connection (void) } int -Client_Worker::svc (void) +Client_Worker::svc () { try { diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h index 58dae974023..b8bc8551311 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h @@ -41,7 +41,7 @@ public: private: /// Validate the connection - void validate_connection (void); + void validate_connection (); private: /// The server. diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp index 0d3f42a283f..1405bed4ce4 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp @@ -6,7 +6,7 @@ Server_Worker::Server_Worker (CORBA::ORB_ptr orb) } int -Server_Worker::svc (void) +Server_Worker::svc () { try { diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp index b7fb970ade2..19cc9236609 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.cpp @@ -16,7 +16,7 @@ Simple_Server_i::test_method (CORBA::Long x) } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h index e86c3d80b96..a35a606020f 100644 --- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h +++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/test_i.h @@ -29,7 +29,7 @@ public: // = The Simple_Server methods. CORBA::Long test_method (CORBA::Long x); - void shutdown (void); + void shutdown (); private: /// The ORB diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp index 55c5b3d403c..f55e54e6e20 100644 --- a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp +++ b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.cpp @@ -8,7 +8,7 @@ Foo_i::Foo_i (CORBA::ORB_ptr orb) } void -Foo_i::shutdown (void) +Foo_i::shutdown () { ACE_DEBUG ((LM_DEBUG,"SUCCESS: server received expected shutdown\n")); this->orb_->shutdown (false); diff --git a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h index 9dc19ba4a7c..a3617e357de 100644 --- a/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h +++ b/TAO/orbsvcs/tests/Security/Null_Cipher/Foo_i.h @@ -21,7 +21,7 @@ public: /// Constructor. Foo_i (CORBA::ORB_ptr); - virtual void shutdown (void); + virtual void shutdown (); private: /// Reference to the ORB. diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp index 26c904715f2..53a6e121397 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.cpp @@ -10,7 +10,7 @@ Foo_i::Foo_i (CORBA::ORB_ptr orb, } void -Foo_i::baz (void) +Foo_i::baz () { SecurityLevel3::ClientCredentials_var credentials = this->current_->client_credentials (); @@ -26,7 +26,7 @@ Foo_i::baz (void) } void -Foo_i::shutdown (void) +Foo_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h index 186ec8f7df6..954e3d9456e 100644 --- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h +++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h @@ -24,9 +24,9 @@ public: SecurityLevel3::SecurityCurrent_ptr current); /// Test method. - virtual void baz (void); + virtual void baz (); - virtual void shutdown (void); + virtual void shutdown (); private: /// Reference to the ORB. diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp index 7adcf51ace6..07ae135debb 100644 --- a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp +++ b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.cpp @@ -10,7 +10,7 @@ Foo_i::Foo_i (CORBA::ORB_ptr orb, } void -Foo_i::baz (void) +Foo_i::baz () { if (this->current_.in() == 0) { @@ -49,7 +49,7 @@ Foo_i::baz (void) } void -Foo_i::shutdown (void) +Foo_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h index 39b242a8ce8..5abe3a68709 100644 --- a/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h +++ b/TAO/orbsvcs/tests/Security/mixed_security_test/Foo_i.h @@ -24,9 +24,9 @@ public: SecurityLevel3::SecurityCurrent_ptr); /// Test method. - virtual void baz (void); + virtual void baz (); - virtual void shutdown (void); + virtual void shutdown (); private: /// Reference to the ORB. diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.cpp b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.cpp index ed4ef394a2f..586ce510a09 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.cpp +++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.cpp @@ -10,12 +10,12 @@ #include "Messenger_i.h" #include <iostream> // Implementation skeleton constructor -Messenger_i::Messenger_i (void) +Messenger_i::Messenger_i () { } // Implementation skeleton destructor -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } diff --git a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h index cee6e0f4872..32f6b0c7f83 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h +++ b/TAO/orbsvcs/tests/Security/ssliop_CSD/Messenger_i.h @@ -14,10 +14,10 @@ class Messenger_i : public virtual POA_Messenger { public: //Constructor - Messenger_i (void); + Messenger_i (); //Destructor - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual CORBA::Boolean send_message ( const char * user_name, diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp index a41ad93f439..c5e27f4d2d0 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp @@ -70,7 +70,7 @@ CosNaming_Client::CosNaming_Client () // Parses the command line arguments and returns an error status. int -CosNaming_Client::parse_args (void) +CosNaming_Client::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("p:dstieym:c:")); int c; @@ -171,7 +171,7 @@ CosNaming_Client::parse_args (void) // Execute client example code. int -CosNaming_Client::run (void) +CosNaming_Client::run () { this->activate(); int rv = test_->execute (naming_client_); @@ -183,7 +183,7 @@ CosNaming_Client::run (void) return rv; } -CosNaming_Client::~CosNaming_Client (void) +CosNaming_Client::~CosNaming_Client () { delete test_; } @@ -242,7 +242,7 @@ MT_Test::MT_Test (CORBA::ORB_ptr orb, } int -MT_Test::svc (void) +MT_Test::svc () { // Obtain object reference to the Naming Service (create new stub.) @@ -964,7 +964,7 @@ Persistent_Test_Begin::Persistent_Test_Begin (CORBA::ORB_ptr orb, { } -Persistent_Test_Begin::~Persistent_Test_Begin (void) +Persistent_Test_Begin::~Persistent_Test_Begin () { } @@ -1015,7 +1015,7 @@ Persistent_Test_End::Persistent_Test_End (CORBA::ORB_ptr orb, { } -Persistent_Test_End::~Persistent_Test_End (void) +Persistent_Test_End::~Persistent_Test_End () { } diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h index 46cdc01bc6c..427cf0b3473 100644 --- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h +++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.h @@ -225,7 +225,7 @@ public: FILE * ior_output_file); /// Destructor. - virtual ~Persistent_Test_Begin (void); + virtual ~Persistent_Test_Begin (); /// Execute the persistent test (part 1) code. virtual int execute (TAO_Naming_Client &root_context); @@ -259,7 +259,7 @@ public: const ACE_TCHAR * ior); /// Destructor. - virtual ~Persistent_Test_End (void); + virtual ~Persistent_Test_End (); /// Execute the persistent test (part 2). virtual int execute (TAO_Naming_Client &root_context); @@ -289,15 +289,15 @@ class CosNaming_Client : public ACE_Task_Base { public: /// Constructor. - CosNaming_Client (void); + CosNaming_Client (); /// Destructor. - ~CosNaming_Client (void); + ~CosNaming_Client (); /// Execute client example code. - int run (void); + int run (); - int svc (void); + int svc (); /// Initialize the client communication endpoint with server. int init (int argc, ACE_TCHAR **argv); @@ -311,7 +311,7 @@ public: private: /// Parses the arguments passed on the command line. - int parse_args (void); + int parse_args (); /// # of arguments on the command line. int argc_; diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp index b0929b688a6..0b8e258dbcf 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp +++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp @@ -29,7 +29,7 @@ public: My_Test_Object (CORBA::Short id = 0); /// Destructor. - ~My_Test_Object (void); + ~My_Test_Object (); // = Interface implementation accessor methods. @@ -37,7 +37,7 @@ public: void id (CORBA::Short id); /// Gets id. - CORBA::Short id (void); + CORBA::Short id (); private: short id_; @@ -48,12 +48,12 @@ My_Test_Object::My_Test_Object (CORBA::Short id) { } -My_Test_Object::~My_Test_Object (void) +My_Test_Object::~My_Test_Object () { } CORBA::Short -My_Test_Object::id (void) +My_Test_Object::id () { return id_; } @@ -66,7 +66,7 @@ My_Test_Object::id (CORBA::Short id) // Constructor. -CosNaming_Client::CosNaming_Client (void) +CosNaming_Client::CosNaming_Client () : argc_ (0), argv_ (0), test_ (0) @@ -76,7 +76,7 @@ CosNaming_Client::CosNaming_Client (void) // Parses the command line arguments and returns an error status. int -CosNaming_Client::parse_args (void) +CosNaming_Client::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("p:dstieym:c:l")); int c; @@ -188,12 +188,12 @@ CosNaming_Client::parse_args (void) // Execute client example code. int -CosNaming_Client::run (void) +CosNaming_Client::run () { return test_->execute (naming_client_); } -CosNaming_Client::~CosNaming_Client (void) +CosNaming_Client::~CosNaming_Client () { delete test_; } @@ -233,7 +233,7 @@ Naming_Test::Naming_Test (PortableServer::POA_ptr poa) { } -Naming_Test::~Naming_Test (void) +Naming_Test::~Naming_Test () { } @@ -248,7 +248,7 @@ MT_Test::MT_Test (CORBA::ORB_ptr orb, } int -MT_Test::svc (void) +MT_Test::svc () { // Obtain object reference to the Naming Service (create new stub.) @@ -1048,7 +1048,7 @@ Persistent_Test_Begin::Persistent_Test_Begin (CORBA::ORB_ptr orb, { } -Persistent_Test_Begin::~Persistent_Test_Begin (void) +Persistent_Test_Begin::~Persistent_Test_Begin () { } @@ -1101,7 +1101,7 @@ Persistent_Test_End::Persistent_Test_End (CORBA::ORB_ptr orb, { } -Persistent_Test_End::~Persistent_Test_End (void) +Persistent_Test_End::~Persistent_Test_End () { } @@ -1161,7 +1161,7 @@ Persistent_List_Test::Persistent_List_Test (CORBA::ORB_ptr orb, { } -Persistent_List_Test::~Persistent_List_Test (void) +Persistent_List_Test::~Persistent_List_Test () { } diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.h b/TAO/orbsvcs/tests/Simple_Naming/client.h index e3c0c431e8c..2c186d1f129 100644 --- a/TAO/orbsvcs/tests/Simple_Naming/client.h +++ b/TAO/orbsvcs/tests/Simple_Naming/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; protected: @@ -238,7 +238,7 @@ public: FILE * ior_output_file); /// Destructor. - virtual ~Persistent_Test_Begin (void); + virtual ~Persistent_Test_Begin (); /// Execute the persistent test (part 1) code. virtual int execute (TAO_Naming_Client &root_context); @@ -273,7 +273,7 @@ public: const ACE_TCHAR * ior); /// Destructor. - virtual ~Persistent_Test_End (void); + virtual ~Persistent_Test_End (); /// Execute the persistent test (part 2). virtual int execute (TAO_Naming_Client &root_context); @@ -304,7 +304,7 @@ public: PortableServer::POA_ptr poa); /// Destructor. - virtual ~Persistent_List_Test (void); + virtual ~Persistent_List_Test (); /// Execute the persistent test (part 3). virtual int execute (TAO_Naming_Client &root_context); @@ -330,13 +330,13 @@ class CosNaming_Client { public: /// Constructor. - CosNaming_Client (void); + CosNaming_Client (); /// Destructor. - ~CosNaming_Client (void); + ~CosNaming_Client (); /// Execute client example code. - int run (void); + int run (); /// Initialize the client communication endpoint with server. int init (int argc, ACE_TCHAR **argv); @@ -350,7 +350,7 @@ public: private: /// Parses the arguments passed on the command line. - int parse_args (void); + int parse_args (); /// # of arguments on the command line. int argc_; diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp index 0fc088ab8d4..c3123193415 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.cpp +++ b/TAO/orbsvcs/tests/Time/Client_i.cpp @@ -12,7 +12,7 @@ // Constructor. -Client_i::Client_i (void) +Client_i::Client_i () : ior_ (0), loop_count_ (10), shutdown_ (0), @@ -25,7 +25,7 @@ Client_i::Client_i (void) // given server. void -Client_i::test_for_secure_universal_time (void) +Client_i::test_for_secure_universal_time () { ACE_DEBUG ((LM_DEBUG, "[CLIENT] Process/Thread Id : (%P/%t) Testing secure_time()\n")); @@ -47,7 +47,7 @@ Client_i::test_for_secure_universal_time (void) // from the clerk_ and prints out the various attributes of the UTO. void -Client_i::test_for_universal_time (void) +Client_i::test_for_universal_time () { ACE_DEBUG ((LM_DEBUG, "[CLIENT] Process/Thread Id : (%P/%t) Testing universal_time()\n")); @@ -76,7 +76,7 @@ Client_i::test_for_universal_time (void) } void -Client_i::test_for_new_universal_time (void) +Client_i::test_for_new_universal_time () { TimeBase::TimeT time = 999999999; TimeBase::InaccuracyT inaccuracy = 9999; @@ -108,7 +108,7 @@ Client_i::test_for_new_universal_time (void) } void -Client_i::test_for_uto_from_utc (void) +Client_i::test_for_uto_from_utc () { TimeBase::UtcT utc_struct; @@ -145,7 +145,7 @@ Client_i::test_for_uto_from_utc (void) } void -Client_i::test_for_new_interval (void) +Client_i::test_for_new_interval () { TimeBase::TimeT lower = 666666666; TimeBase::TimeT upper = 999999999; @@ -204,7 +204,7 @@ Client_i::read_ior (ACE_TCHAR *filename) // Parses the command line arguments and returns an error status. int -Client_i::parse_args (void) +Client_i::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("dn:f:xk:")); int c; @@ -256,7 +256,7 @@ Client_i::parse_args (void) // Execute client example code. int -Client_i::run (void) +Client_i::run () { // Retrieves the current universal time. test_for_universal_time (); @@ -278,13 +278,13 @@ Client_i::run (void) return 0; } -Client_i::~Client_i (void) +Client_i::~Client_i () { ACE_OS::free (this->ior_); } int -Client_i::obtain_initial_references (void) +Client_i::obtain_initial_references () { try { diff --git a/TAO/orbsvcs/tests/Time/Client_i.h b/TAO/orbsvcs/tests/Time/Client_i.h index 5c062491e9a..8f318302101 100644 --- a/TAO/orbsvcs/tests/Time/Client_i.h +++ b/TAO/orbsvcs/tests/Time/Client_i.h @@ -28,13 +28,13 @@ class Client_i { public: /// Constructor. - Client_i (void); + Client_i (); /// Destructor. - ~Client_i (void); + ~Client_i (); /// Execute client example code. - int run (void); + int run (); /// Initialize the client communication endpoint with server. int init (int argc, ACE_TCHAR *argv[]); @@ -44,29 +44,29 @@ public: * <secure_universal_time> has not been currently implemented in the * given server. */ - void test_for_secure_universal_time (void); + void test_for_secure_universal_time (); /// Tests if the server returns a valid time. - void test_for_universal_time (void); + void test_for_universal_time (); /// Tests if the server returns a new UTO filled with the given time. - void test_for_new_universal_time (void); + void test_for_new_universal_time (); /// Tests if the returned UTO has the same value as the given UTC. - void test_for_uto_from_utc (void); + void test_for_uto_from_utc (); /// Tests if a new TIO is created according to the given bounds. - void test_for_new_interval (void); + void test_for_new_interval (); private: /// Function to read the server IOR from a file. int read_ior (ACE_TCHAR *filename); /// Parses the arguments passed on the command line. - int parse_args (void); + int parse_args (); /// To initialize the naming service and get a clerk IOR. - int obtain_initial_references (void); + int obtain_initial_references (); /// # of arguments on the command line. int argc_; diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp index 08a54f19bf8..a708aa96047 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp @@ -15,7 +15,7 @@ TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if, this->admin_ = lookup_if->admin_if (); } -TAO_Offer_Exporter::~TAO_Offer_Exporter (void) +TAO_Offer_Exporter::~TAO_Offer_Exporter () { while (! this->clean_up_.is_empty ()) { @@ -26,7 +26,7 @@ TAO_Offer_Exporter::~TAO_Offer_Exporter (void) } void -TAO_Offer_Exporter::export_offers (void) +TAO_Offer_Exporter::export_offers () { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Exporting offers.\n")); @@ -88,7 +88,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg) } void -TAO_Offer_Exporter::export_offers_to_all (void) +TAO_Offer_Exporter::export_offers_to_all () { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Exporting to all.\n")); @@ -152,7 +152,7 @@ TAO_Offer_Exporter::export_offers_to_all (void) void -TAO_Offer_Exporter::withdraw_offers (void) +TAO_Offer_Exporter::withdraw_offers () { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Withdrawing all offers.\n")); @@ -179,7 +179,7 @@ TAO_Offer_Exporter::withdraw_offers (void) } void -TAO_Offer_Exporter::describe_offers (void) +TAO_Offer_Exporter::describe_offers () { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Describing all offers.\n")); @@ -218,7 +218,7 @@ TAO_Offer_Exporter::describe_offers (void) } void -TAO_Offer_Exporter::modify_offers (void) +TAO_Offer_Exporter::modify_offers () { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Modifying all offers.\n")); @@ -257,7 +257,7 @@ TAO_Offer_Exporter::modify_offers (void) void TAO_Offer_Exporter:: -withdraw_offers_using_constraints (void) +withdraw_offers_using_constraints () { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Withdrawing with constraint.\n")); @@ -289,7 +289,7 @@ withdraw_offers_using_constraints (void) } CosTrading::OfferIdSeq* -TAO_Offer_Exporter::grab_offerids (void) +TAO_Offer_Exporter::grab_offerids () { if (this->verbose_) ACE_DEBUG ((LM_DEBUG, "TAO_Offer_Exporter::Grabbing all offer ids.\n")); @@ -350,7 +350,7 @@ TAO_Offer_Exporter::grab_offerids (void) } void -TAO_Offer_Exporter::create_offers (void) +TAO_Offer_Exporter::create_offers () { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Exporter::Creating offers.\n")); const int QUEUE_SIZE = 4; diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h index 30e4de33131..9a9e3cbfe26 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.h +++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.h @@ -24,31 +24,31 @@ public: TAO_Offer_Exporter (CosTrading::Lookup_ptr lookup_if, CORBA::Boolean verbose); - ~TAO_Offer_Exporter (void); + ~TAO_Offer_Exporter (); - void export_offers (void); + void export_offers (); // Export a number of offers to the Trading Service. - void export_offers_to_all (void); + void export_offers_to_all (); // Export a number of offers to all traders accessible by the // bootstrapped trader. - void withdraw_offers (void); + void withdraw_offers (); // Withdraw all exported offers. - void describe_offers (void); + void describe_offers (); // Describe all the offers registered with the bootstrapped trader. - void modify_offers (void); + void modify_offers (); // Remove some properties and change some properties in each offer. - void withdraw_offers_using_constraints (void); + void withdraw_offers_using_constraints (); // Withdraw a number of offers based on a constraint string. private: - CosTrading::OfferIdSeq* grab_offerids (void); + CosTrading::OfferIdSeq* grab_offerids (); - void create_offers (void); + void create_offers (); // Fill in each of the offer structures. void export_to (CosTrading::Register_ptr reg); diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp index 7998cef2b78..a9c4bfc2d5d 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp @@ -8,7 +8,7 @@ TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if, } void -TAO_Offer_Importer::perform_queries (void) +TAO_Offer_Importer::perform_queries () { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Importer::Federated Query.\n")); @@ -22,7 +22,7 @@ TAO_Offer_Importer::perform_queries (void) } void -TAO_Offer_Importer::perform_directed_queries (void) +TAO_Offer_Importer::perform_directed_queries () { ACE_DEBUG ((LM_DEBUG, "*** TAO_Offer_Importer::Directed Query.\n")); diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.h b/TAO/orbsvcs/tests/Trading/Offer_Importer.h index 2e7c7ac76cd..4ed8ff13c35 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Importer.h +++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.h @@ -30,10 +30,10 @@ public: TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if, CORBA::Boolean verbose = 1); - void perform_queries (void); + void perform_queries (); // Barrage the bootstrapped-to trader with queries. - void perform_directed_queries (void); + void perform_directed_queries (); // Direct a query to a trader two graph edges distant from the // bootstrapped-to trader. diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp index 2ddafeff55d..464f0968b60 100644 --- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp +++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp @@ -16,7 +16,7 @@ TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if, this->create_types (); } -TAO_Service_Type_Exporter::~TAO_Service_Type_Exporter (void) +TAO_Service_Type_Exporter::~TAO_Service_Type_Exporter () { try { @@ -28,7 +28,7 @@ TAO_Service_Type_Exporter::~TAO_Service_Type_Exporter (void) } void -TAO_Service_Type_Exporter::remove_all_types (void) +TAO_Service_Type_Exporter::remove_all_types () { ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::removing all" " types from the Repository.\n")); @@ -57,7 +57,7 @@ TAO_Service_Type_Exporter::remove_all_types (void) } void -TAO_Service_Type_Exporter::add_all_types (void) +TAO_Service_Type_Exporter::add_all_types () { ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::" @@ -66,7 +66,7 @@ TAO_Service_Type_Exporter::add_all_types (void) } void -TAO_Service_Type_Exporter::add_all_types_to_all (void) +TAO_Service_Type_Exporter::add_all_types_to_all () { ACE_DEBUG ((LM_DEBUG, "*** TAO_Service_Type_Exporter::" "add all types to all repositories.\n")); @@ -163,7 +163,7 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos) } void -TAO_Service_Type_Exporter::list_all_types (void) +TAO_Service_Type_Exporter::list_all_types () { try { @@ -202,7 +202,7 @@ TAO_Service_Type_Exporter::list_all_types (void) } void -TAO_Service_Type_Exporter::describe_all_types (void) +TAO_Service_Type_Exporter::describe_all_types () { try { @@ -229,7 +229,7 @@ TAO_Service_Type_Exporter::describe_all_types (void) } void -TAO_Service_Type_Exporter::fully_describe_all_types (void) +TAO_Service_Type_Exporter::fully_describe_all_types () { try { @@ -287,7 +287,7 @@ dump_typestruct (const char* type_name, } void -TAO_Service_Type_Exporter::create_types (void) +TAO_Service_Type_Exporter::create_types () { TT_Info::Remote_Output ro; this->type_structs_[TT_Info::REMOTE_IO].props.length (6); diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h index b522791e59f..bd8d235c3f7 100644 --- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h +++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.h @@ -23,33 +23,33 @@ public: TAO_Service_Type_Exporter (CosTrading::Lookup_ptr lookup_if, CORBA::Boolean verbose); - ~TAO_Service_Type_Exporter (void); + ~TAO_Service_Type_Exporter (); - void remove_all_types (void); + void remove_all_types (); // Remove all service types from the trading service instance. - void add_all_types (void); + void add_all_types (); // Add all the generated service types to the trading service instance. - void add_all_types_to_all (void); + void add_all_types_to_all (); // Add all the generated service types to all the trading service // instances linked to the trading service we bootstrapped to. - void list_all_types (void); + void list_all_types (); // List all the service types registered with the trading service // instance. - void describe_all_types (void); + void describe_all_types (); // Describe all the service types registered with the trading // service instance. - void fully_describe_all_types (void); + void fully_describe_all_types (); // Same as describe_all_types, but fully describe lists the // properties of all service types the described service type // inherits from. private: - void create_types (void); + void create_types (); // Generate the service type description structures. void add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos); diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h index 5ddbcae8a1f..0116a2c0e17 100644 --- a/TAO/orbsvcs/tests/Trading/TT_Info.h +++ b/TAO/orbsvcs/tests/Trading/TT_Info.h @@ -33,7 +33,7 @@ public: public: Remote_Output (void) {} - virtual void confirm (void) + virtual void confirm () {} // Method to test that the importer received a valid reference to // the exported object. @@ -45,7 +45,7 @@ public: public: Printer (void) {} - virtual void confirm (void) + virtual void confirm () {} // Method to test that the importer received a valid reference to // the exported object. @@ -57,7 +57,7 @@ public: public: Plotter (void) {} - virtual void confirm (void) + virtual void confirm () {} // Method to test that the importer received a valid reference to // the exported object. @@ -69,7 +69,7 @@ public: public: File_System (void) {} - virtual void confirm (void) + virtual void confirm () {} // Method to test that the importer received a valid reference to // the exported object. @@ -81,7 +81,7 @@ public: public: PostScript_Printer (void) {} - virtual void confirm (void) + virtual void confirm () {} // Method to test that the importer received a valid reference to // the exported object. diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp index 7b553031a5c..1153350b624 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp @@ -18,17 +18,17 @@ #include "ace/SString.h" // Constructor -IOR_corbaname_Client_i::IOR_corbaname_Client_i (void) +IOR_corbaname_Client_i::IOR_corbaname_Client_i () { } // Destructor -IOR_corbaname_Client_i::~IOR_corbaname_Client_i (void) +IOR_corbaname_Client_i::~IOR_corbaname_Client_i () { } int -IOR_corbaname_Client_i::run (void) +IOR_corbaname_Client_i::run () { try { diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h index 6cbfc28dc7d..59ecec46e84 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h +++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h @@ -28,11 +28,11 @@ class IOR_corbaname_Client_i { public: // = Constructor and destructor. - IOR_corbaname_Client_i (void); - ~IOR_corbaname_Client_i (void); + IOR_corbaname_Client_i (); + ~IOR_corbaname_Client_i (); /// Execute the client example code. - int run (void); + int run (); /// Initialize the client communication endpoint with the server. int init (int argc, ACE_TCHAR **argv); diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp index 3934b8461a8..6892ef8166d 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp +++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp @@ -1,13 +1,13 @@ #include "status_i.h" -corbaname_Status_i::corbaname_Status_i (void) +corbaname_Status_i::corbaname_Status_i () { // Constructor } CORBA::Boolean -corbaname_Status_i::print_status (void) +corbaname_Status_i::print_status () { // If the client makes a succesful request, return a true value // indicating that it has successfully reached the server. diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.h b/TAO/orbsvcs/tests/ior_corbaname/status_i.h index 1ca8ba13f7c..d4f54fa9f87 100644 --- a/TAO/orbsvcs/tests/ior_corbaname/status_i.h +++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.h @@ -6,9 +6,9 @@ class corbaname_Status_i : public POA_corbaname::Status { public: - corbaname_Status_i (void); + corbaname_Status_i (); - CORBA::Boolean print_status (void); + CORBA::Boolean print_status (); }; #endif /* STATUS_I_H */ diff --git a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp index 54a67ee5c7d..9fb6d6cf573 100644 --- a/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp +++ b/TAO/orbsvcs/tests/unit/Trading/Interpreter/Interpreter.cpp @@ -9,7 +9,7 @@ class Literal_Visitor: public TAO_Constraint_Visitor { public: Literal_Visitor (Literal_Interpreter<T>* interp); - virtual ~Literal_Visitor (void); + virtual ~Literal_Visitor (); virtual int visit_constraint (TAO_Unary_Constraint*); @@ -55,7 +55,7 @@ Literal_Visitor<T>::Literal_Visitor (Literal_Interpreter<T>* interp) } template<class T> -Literal_Visitor<T>::~Literal_Visitor (void) +Literal_Visitor<T>::~Literal_Visitor () { } @@ -76,8 +76,8 @@ template<class T> class Literal_Interpreter: public TAO_Interpreter { public: - Literal_Interpreter (void); - virtual ~Literal_Interpreter (void); + Literal_Interpreter (); + virtual ~Literal_Interpreter (); bool test (const char* str, T expected); @@ -91,12 +91,12 @@ private: }; template<class T> -Literal_Interpreter<T>::Literal_Interpreter (void) +Literal_Interpreter<T>::Literal_Interpreter () { } template<class T> -Literal_Interpreter<T>::~Literal_Interpreter (void) +Literal_Interpreter<T>::~Literal_Interpreter () { } |