diff options
Diffstat (limited to 'TAO/tests')
1232 files changed, 3213 insertions, 3213 deletions
diff --git a/TAO/tests/AMH_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp index 5f7d3cd9fef..9335e55a899 100644 --- a/TAO/tests/AMH_Exceptions/server.cpp +++ b/TAO/tests/AMH_Exceptions/server.cpp @@ -72,7 +72,7 @@ public: virtual ~ST_AMH_Server (); /// ORB initialisation stuff - int start_orb_and_poa (void); + int start_orb_and_poa (); /// register the servant with the poa virtual void register_servant (ST_AMH_Servant *servant); @@ -131,7 +131,7 @@ ST_AMH_Server::~ST_AMH_Server () } int -ST_AMH_Server::start_orb_and_poa (void) +ST_AMH_Server::start_orb_and_poa () { try { diff --git a/TAO/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp index 086b43367e0..9a11058625a 100644 --- a/TAO/tests/AMH_Oneway/server.cpp +++ b/TAO/tests/AMH_Oneway/server.cpp @@ -79,7 +79,7 @@ public: virtual ~ST_AMH_Server (); /// ORB initialization stuff - int start_orb_and_poa (void); + int start_orb_and_poa (); /// register the servant with the poa virtual void register_servant (ST_AMH_Servant *servant); @@ -142,7 +142,7 @@ ST_AMH_Server::cleanup () } int -ST_AMH_Server::start_orb_and_poa (void) +ST_AMH_Server::start_orb_and_poa () { try { diff --git a/TAO/tests/AMI/ami_test_i.cpp b/TAO/tests/AMI/ami_test_i.cpp index b87718680e2..05d667e8919 100644 --- a/TAO/tests/AMI/ami_test_i.cpp +++ b/TAO/tests/AMI/ami_test_i.cpp @@ -61,13 +61,13 @@ 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/tests/AMI/ami_test_i.h b/TAO/tests/AMI/ami_test_i.h index 22f9b58728f..d6a316e2232 100644 --- a/TAO/tests/AMI/ami_test_i.h +++ b/TAO/tests/AMI/ami_test_i.h @@ -34,9 +34,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/tests/AMI/client.cpp b/TAO/tests/AMI/client.cpp index 56956036f51..d68560f8842 100644 --- a/TAO/tests/AMI/client.cpp +++ b/TAO/tests/AMI/client.cpp @@ -102,7 +102,7 @@ public: class Handler : public POA_A::AMI_AMI_TestHandler { public: - Handler (void) + Handler () { }; @@ -153,7 +153,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")); @@ -164,7 +164,7 @@ public: ACE_DEBUG ((LM_DEBUG, "Callback method <set_yadda_excep> called:\n")); }; - ~Handler (void) + ~Handler () { }; @@ -307,7 +307,7 @@ Client::Client (A::AMI_Test_ptr server, } int -Client::svc (void) +Client::svc () { try { diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp index 8e7b68040a1..fd015614963 100644 --- a/TAO/tests/AMI/simple_client.cpp +++ b/TAO/tests/AMI/simple_client.cpp @@ -142,7 +142,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/tests/AMI_Buffering/AMI_Buffering.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp index 4c592413169..cc3b457afe4 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering.cpp +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.cpp @@ -18,7 +18,7 @@ AMI_Buffering::Nest_Guard::Nest_Guard (AMI_Buffering &a) target_.max_nest_ = target_.nest_; } -AMI_Buffering::Nest_Guard::~Nest_Guard (void) +AMI_Buffering::Nest_Guard::~Nest_Guard () { --target_.nest_; } @@ -40,25 +40,25 @@ AMI_Buffering::receive_data (const Test::Payload &the_payload) } void -AMI_Buffering::flush (void) +AMI_Buffering::flush () { } void -AMI_Buffering::sync (void) +AMI_Buffering::sync () { this->admin_->flush (); } void -AMI_Buffering::shutdown (void) +AMI_Buffering::shutdown () { this->must_shutdown_ = true; this->try_shutdown(); } void -AMI_Buffering::try_shutdown(void) +AMI_Buffering::try_shutdown() { if (!this->must_shutdown_ || this->nest_ > 0) return; diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.h b/TAO/tests/AMI_Buffering/AMI_Buffering.h index 8717c5b5917..22de3af8fee 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering.h +++ b/TAO/tests/AMI_Buffering/AMI_Buffering.h @@ -17,20 +17,20 @@ public: // = The skeleton methods virtual void receive_data (const Test::Payload &the_payload); - virtual void flush (void); + virtual void flush (); - virtual void sync (void); + virtual void sync (); - virtual void shutdown (void); + virtual void shutdown (); /// internal implementation of shutdown. This - void try_shutdown (void); + void try_shutdown (); class Nest_Guard { public: Nest_Guard (AMI_Buffering &); - ~Nest_Guard (void); + ~Nest_Guard (); private: AMI_Buffering &target_; }; diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp index 9706776f1fc..c50ae8d98eb 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp +++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.cpp @@ -8,13 +8,13 @@ AMI_Buffering_Admin::AMI_Buffering_Admin (CORBA::ORB_ptr orb) } CORBA::ULong -AMI_Buffering_Admin::request_count (void) +AMI_Buffering_Admin::request_count () { return this->request_count_; } CORBA::ULong -AMI_Buffering_Admin::bytes_received_count (void) +AMI_Buffering_Admin::bytes_received_count () { return this->bytes_received_count_; } @@ -27,12 +27,12 @@ AMI_Buffering_Admin::request_received (CORBA::ULong payload_length) } void -AMI_Buffering_Admin::flush (void) +AMI_Buffering_Admin::flush () { } void -AMI_Buffering_Admin::shutdown (void) +AMI_Buffering_Admin::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h index 60f0b40346a..490e0d364a2 100644 --- a/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h +++ b/TAO/tests/AMI_Buffering/AMI_Buffering_Admin.h @@ -14,15 +14,15 @@ public: AMI_Buffering_Admin (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::ULong request_count (void); + virtual CORBA::ULong request_count (); - virtual CORBA::ULong bytes_received_count (void); + virtual CORBA::ULong bytes_received_count (); virtual void request_received (CORBA::ULong payload_length); - virtual void flush (void); + virtual void flush (); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to shutdown the application. diff --git a/TAO/tests/AMI_Buffering/Client_Task.cpp b/TAO/tests/AMI_Buffering/Client_Task.cpp index 48327cc41ca..db5bae4319d 100644 --- a/TAO/tests/AMI_Buffering/Client_Task.cpp +++ b/TAO/tests/AMI_Buffering/Client_Task.cpp @@ -8,14 +8,14 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb) } void -Client_Task::terminate_loop (void) +Client_Task::terminate_loop () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->terminate_loop_ = 1; } int -Client_Task::svc (void) +Client_Task::svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); try diff --git a/TAO/tests/AMI_Buffering/Client_Task.h b/TAO/tests/AMI_Buffering/Client_Task.h index 631aae096d2..b4b64869a89 100644 --- a/TAO/tests/AMI_Buffering/Client_Task.h +++ b/TAO/tests/AMI_Buffering/Client_Task.h @@ -18,10 +18,10 @@ public: Client_Task (CORBA::ORB_ptr orb); /// Terminate the loop - void terminate_loop (void); + void terminate_loop (); /// Thread entry point - int svc (void); + int svc (); private: /// Reference to the ORB diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.cpp b/TAO/tests/AMI_Buffering/Reply_Handler.cpp index 99cf8d3157b..53848092efc 100644 --- a/TAO/tests/AMI_Buffering/Reply_Handler.cpp +++ b/TAO/tests/AMI_Buffering/Reply_Handler.cpp @@ -1,11 +1,11 @@ #include "Reply_Handler.h" -Reply_Handler::Reply_Handler (void) +Reply_Handler::Reply_Handler () { } void -Reply_Handler::receive_data (void) +Reply_Handler::receive_data () { } @@ -23,7 +23,7 @@ Reply_Handler::receive_data_excep (::Messaging::ExceptionHolder *holder) } void -Reply_Handler::sync (void) +Reply_Handler::sync () { } @@ -41,7 +41,7 @@ Reply_Handler::sync_excep (::Messaging::ExceptionHolder *holder) } void -Reply_Handler::shutdown (void) +Reply_Handler::shutdown () { } diff --git a/TAO/tests/AMI_Buffering/Reply_Handler.h b/TAO/tests/AMI_Buffering/Reply_Handler.h index 9260787f71b..a6ae680c824 100644 --- a/TAO/tests/AMI_Buffering/Reply_Handler.h +++ b/TAO/tests/AMI_Buffering/Reply_Handler.h @@ -11,16 +11,16 @@ class Reply_Handler { public: /// Constructor - Reply_Handler (void); + Reply_Handler (); // = The skeleton methods - virtual void receive_data (void); + virtual void receive_data (); virtual void receive_data_excep (::Messaging::ExceptionHolder *holder); - virtual void sync (void); + virtual void sync (); virtual void sync_excep (::Messaging::ExceptionHolder *holder); - virtual void shutdown (void); + virtual void shutdown (); virtual void shutdown_excep (::Messaging::ExceptionHolder *holder); }; diff --git a/TAO/tests/AMI_Timeouts/timeout_i.cpp b/TAO/tests/AMI_Timeouts/timeout_i.cpp index 0a77ef98bc8..4bcfed42729 100644 --- a/TAO/tests/AMI_Timeouts/timeout_i.cpp +++ b/TAO/tests/AMI_Timeouts/timeout_i.cpp @@ -34,7 +34,7 @@ Timeout_i::sendTimeToWait (CORBA::Long msec) } void -Timeout_i::shutdown (void) +Timeout_i::shutdown () { orb_->shutdown (); //ACE_DEBUG ((LM_DEBUG, @@ -53,7 +53,7 @@ TimeoutHandler_i::TimeoutHandler_i () } void -TimeoutHandler_i::sendTimeToWait (void) +TimeoutHandler_i::sendTimeToWait () { ACE_DEBUG ((LM_DEBUG, "reply")); diff --git a/TAO/tests/AMI_Timeouts/timeout_i.h b/TAO/tests/AMI_Timeouts/timeout_i.h index b5da504a2ed..e15ae533023 100644 --- a/TAO/tests/AMI_Timeouts/timeout_i.h +++ b/TAO/tests/AMI_Timeouts/timeout_i.h @@ -24,7 +24,7 @@ public: virtual void sendTimeToWait (CORBA::Long msec); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; @@ -38,7 +38,7 @@ public: ~TimeoutHandler_i () = default; - virtual void sendTimeToWait (void); + virtual void sendTimeToWait (); virtual void sendTimeToWait_excep ( ::Messaging::ExceptionHolder * excep_holder); diff --git a/TAO/tests/Abstract_Interface/test_i.cpp b/TAO/tests/Abstract_Interface/test_i.cpp index 7ec9006996a..65900ae7808 100644 --- a/TAO/tests/Abstract_Interface/test_i.cpp +++ b/TAO/tests/Abstract_Interface/test_i.cpp @@ -43,7 +43,7 @@ passer_i::passer_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) } void -passer_i::shutdown (void) +passer_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Abstract_Interface/test_i.h b/TAO/tests/Abstract_Interface/test_i.h index 7c103c98c8e..f6c2c3673e8 100644 --- a/TAO/tests/Abstract_Interface/test_i.h +++ b/TAO/tests/Abstract_Interface/test_i.h @@ -22,7 +22,7 @@ public: virtual void pass_nil (base_out outarg); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; PortableServer::POA_var poa_; diff --git a/TAO/tests/Alt_Mapping/alt_mapping_i.cpp b/TAO/tests/Alt_Mapping/alt_mapping_i.cpp index ed022f1e666..b6c0de213b7 100644 --- a/TAO/tests/Alt_Mapping/alt_mapping_i.cpp +++ b/TAO/tests/Alt_Mapping/alt_mapping_i.cpp @@ -20,7 +20,7 @@ Alt_Mapping_i::Alt_Mapping_i (CORBA::ORB_ptr orb) { } -Alt_Mapping_i::~Alt_Mapping_i (void) +Alt_Mapping_i::~Alt_Mapping_i () { } @@ -54,7 +54,7 @@ Alt_Mapping_i::test_struct_sequence ( } void -Alt_Mapping_i::shutdown (void) +Alt_Mapping_i::shutdown () { this->orb_->shutdown (); } diff --git a/TAO/tests/Alt_Mapping/alt_mapping_i.h b/TAO/tests/Alt_Mapping/alt_mapping_i.h index e0e852b0fb9..3c52050a2eb 100644 --- a/TAO/tests/Alt_Mapping/alt_mapping_i.h +++ b/TAO/tests/Alt_Mapping/alt_mapping_i.h @@ -25,7 +25,7 @@ class Alt_Mapping_i : public POA_Alt_Mapping public: Alt_Mapping_i (CORBA::ORB_ptr orb); - ~Alt_Mapping_i (void); + ~Alt_Mapping_i (); virtual std::string test_unbounded_string (const std::string s1, @@ -37,7 +37,7 @@ public: Alt_Mapping::StructSeq & s2, Alt_Mapping::StructSeq & s3); - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Alt_Mapping/client.cpp b/TAO/tests/Alt_Mapping/client.cpp index b7751a8c753..0ee820d05cc 100644 --- a/TAO/tests/Alt_Mapping/client.cpp +++ b/TAO/tests/Alt_Mapping/client.cpp @@ -31,14 +31,14 @@ Alt_Mapping_Client<T>::Alt_Mapping_Client (CORBA::ORB_ptr orb, // destructor template <class T> -Alt_Mapping_Client<T>::~Alt_Mapping_Client (void) +Alt_Mapping_Client<T>::~Alt_Mapping_Client () { delete this->test_object_; } // All the individual tests. template <class T> int -Alt_Mapping_Client<T>::run_sii_test (void) +Alt_Mapping_Client<T>::run_sii_test () { CORBA::ULong i = 0; // loop index Options *opt = OPTIONS::instance (); // get the options diff --git a/TAO/tests/Alt_Mapping/client.h b/TAO/tests/Alt_Mapping/client.h index 6dce445ec8b..8a4be2d0646 100644 --- a/TAO/tests/Alt_Mapping/client.h +++ b/TAO/tests/Alt_Mapping/client.h @@ -39,10 +39,10 @@ public: Alt_Mapping_ptr objref, T *); - ~Alt_Mapping_Client (void); + ~Alt_Mapping_Client (); /// run the SII test - int run_sii_test (void); + int run_sii_test (); private: /// underlying ORB diff --git a/TAO/tests/Alt_Mapping/driver.cpp b/TAO/tests/Alt_Mapping/driver.cpp index 829a8834d05..fc5f22ee919 100644 --- a/TAO/tests/Alt_Mapping/driver.cpp +++ b/TAO/tests/Alt_Mapping/driver.cpp @@ -40,11 +40,11 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } // constructor -Driver::Driver (void) +Driver::Driver () { } -Driver::~Driver (void) +Driver::~Driver () { } @@ -102,7 +102,7 @@ Driver::init (int argc, ACE_TCHAR **argv) } int -Driver::run (void) +Driver::run () { // serves as a factory of Param_Client objects. It is also responsible to // start the test diff --git a/TAO/tests/Alt_Mapping/driver.h b/TAO/tests/Alt_Mapping/driver.h index 42b76a5c132..a1e0ac1f4f2 100644 --- a/TAO/tests/Alt_Mapping/driver.h +++ b/TAO/tests/Alt_Mapping/driver.h @@ -27,14 +27,14 @@ class Driver { public: // = Constructor and destructor. - Driver (void); - ~Driver (void); + Driver (); + ~Driver (); /// Initialize the driver object int init (int argc, ACE_TCHAR **argv); /// Execute client example code. - int run (void); + int run (); private: /// underlying ORB (we do not own it) diff --git a/TAO/tests/Alt_Mapping/helper.cpp b/TAO/tests/Alt_Mapping/helper.cpp index b1c28b87cc1..a80382afa39 100644 --- a/TAO/tests/Alt_Mapping/helper.cpp +++ b/TAO/tests/Alt_Mapping/helper.cpp @@ -16,28 +16,28 @@ const CORBA::ULong TEST_BUFSIZE = 128; -Generator::Generator (void) +Generator::Generator () { } -Generator::~Generator (void) +Generator::~Generator () { } CORBA::Short -Generator::gen_short (void) +Generator::gen_short () { return (CORBA::Short) (ACE_OS::rand () % TEST_BUFSIZE); } CORBA::Long -Generator::gen_long (void) +Generator::gen_long () { return ::ACE_OS::rand () % TEST_BUFSIZE; } char * -Generator::gen_string (void) +Generator::gen_string () { return gen_string (TEST_BUFSIZE); } @@ -64,7 +64,7 @@ Generator::gen_string (int max_length) } CORBA::WChar * -Generator::gen_wstring (void) +Generator::gen_wstring () { return gen_wstring (TEST_BUFSIZE); } @@ -92,7 +92,7 @@ Generator::gen_wstring (int max_length) } const Alt_Mapping::Fixed_Struct -Generator::gen_fixed_struct (void) +Generator::gen_fixed_struct () { this->fixed_struct_.l = ACE_OS::rand (); this->fixed_struct_.c = ACE_OS::rand () % 128; diff --git a/TAO/tests/Alt_Mapping/helper.h b/TAO/tests/Alt_Mapping/helper.h index ab589675057..55824f5078a 100644 --- a/TAO/tests/Alt_Mapping/helper.h +++ b/TAO/tests/Alt_Mapping/helper.h @@ -20,17 +20,17 @@ class Generator { public: - Generator (void); + Generator (); - ~Generator (void); + ~Generator (); - CORBA::Short gen_short (void); - CORBA::Long gen_long (void); - char* gen_string (void); + CORBA::Short gen_short (); + CORBA::Long gen_long (); + char* gen_string (); char* gen_string (int maxlength); - CORBA::WChar* gen_wstring (void); + CORBA::WChar* gen_wstring (); CORBA::WChar* gen_wstring (int maxlength); - const Alt_Mapping::Fixed_Struct gen_fixed_struct (void); + const Alt_Mapping::Fixed_Struct gen_fixed_struct (); private: Alt_Mapping::Fixed_Struct fixed_struct_; diff --git a/TAO/tests/Alt_Mapping/options.cpp b/TAO/tests/Alt_Mapping/options.cpp index 923d6ed5fa7..56659886a1c 100644 --- a/TAO/tests/Alt_Mapping/options.cpp +++ b/TAO/tests/Alt_Mapping/options.cpp @@ -20,7 +20,7 @@ #include "ace/Log_Msg.h" // Constructor.p -Options::Options (void) +Options::Options () : ior_ (CORBA::string_dup ("file://test.ior")), test_type_ (Options::NO_TEST), invoke_type_ (Options::SII), @@ -30,7 +30,7 @@ Options::Options (void) { } -Options::~Options (void) +Options::~Options () { } @@ -133,19 +133,19 @@ Options::param_test_ior () const } Options::TEST_TYPE -Options::test_type (void) +Options::test_type () { return this->test_type_; } Options::INVOKE_TYPE -Options::invoke_type (void) +Options::invoke_type () { return this->invoke_type_; } CORBA::ULong -Options::loop_count (void) +Options::loop_count () { return this->loop_count_; } diff --git a/TAO/tests/Alt_Mapping/options.h b/TAO/tests/Alt_Mapping/options.h index 8a6796c3cef..23a36cf6720 100644 --- a/TAO/tests/Alt_Mapping/options.h +++ b/TAO/tests/Alt_Mapping/options.h @@ -40,10 +40,10 @@ public: }; /// constructor - Options (void); + Options (); /// destructor - ~Options (void); + ~Options (); /// Parses the arguments passed on the command line. int parse_args (int argc, ACE_TCHAR **argv); @@ -52,13 +52,13 @@ public: char const * param_test_ior () const; /// what test to run - TEST_TYPE test_type (void); + TEST_TYPE test_type (); /// whether to use SII or DII - INVOKE_TYPE invoke_type (void); + INVOKE_TYPE invoke_type (); /// number of times to run the test - CORBA::ULong loop_count (void); + CORBA::ULong loop_count (); /// whether debug option is on or not CORBA::Boolean debug () const; diff --git a/TAO/tests/Alt_Mapping/results.cpp b/TAO/tests/Alt_Mapping/results.cpp index 098370c8dcb..b6957633956 100644 --- a/TAO/tests/Alt_Mapping/results.cpp +++ b/TAO/tests/Alt_Mapping/results.cpp @@ -14,17 +14,17 @@ #include "tao/debug.h" #include "ace/Log_Msg.h" -Results::Results (void) +Results::Results () { } -Results::~Results (void) +Results::~Results () { delete [] this->elapsed_time_; } void -Results::print_stats (void) +Results::print_stats () { double avg_real_time = 0, @@ -103,20 +103,20 @@ Results::print_exception (const char * /* call_name */) } void -Results::start_timer (void) +Results::start_timer () { this->timer_.start (); } void -Results::stop_timer (void) +Results::stop_timer () { this->timer_.stop (); this->timer_.elapsed_time (this->elapsed_time_[this->call_count_-1]); } CORBA::ULong -Results::call_count (void) +Results::call_count () { return this->call_count_; } @@ -128,7 +128,7 @@ Results::call_count (CORBA::ULong c) } CORBA::ULong -Results::error_count (void) +Results::error_count () { return this->error_count_; } diff --git a/TAO/tests/Alt_Mapping/results.h b/TAO/tests/Alt_Mapping/results.h index dd2e62756f7..0607cc430e9 100644 --- a/TAO/tests/Alt_Mapping/results.h +++ b/TAO/tests/Alt_Mapping/results.h @@ -33,31 +33,31 @@ class Results { public: /// ctor - Results (void); + Results (); /// destructor - ~Results (void); + ~Results (); /// prints the time stats - void print_stats (void); + void print_stats (); /// print the exception void print_exception (const char *call_name); /// start timing - void start_timer (void); + void start_timer (); /// stop timing - void stop_timer (void); + void stop_timer (); /// return call count - CORBA::ULong call_count (void); + CORBA::ULong call_count (); /// set the call count void call_count (CORBA::ULong); /// return the error count - CORBA::ULong error_count (void); + CORBA::ULong error_count (); /// set error count void error_count (CORBA::ULong); diff --git a/TAO/tests/Alt_Mapping/ub_string.cpp b/TAO/tests/Alt_Mapping/ub_string.cpp index a1cb328c8a5..b71967dca0f 100644 --- a/TAO/tests/Alt_Mapping/ub_string.cpp +++ b/TAO/tests/Alt_Mapping/ub_string.cpp @@ -17,12 +17,12 @@ // Test_Unbounded_String // ************************************************************************ -Test_Unbounded_String::Test_Unbounded_String (void) +Test_Unbounded_String::Test_Unbounded_String () : opname_ (CORBA::string_dup ("test_unbounded_string")) { } -Test_Unbounded_String::~Test_Unbounded_String (void) +Test_Unbounded_String::~Test_Unbounded_String () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -46,7 +46,7 @@ Test_Unbounded_String::init_parameters (Alt_Mapping_ptr) } int -Test_Unbounded_String::reset_parameters (void) +Test_Unbounded_String::reset_parameters () { this->inout_ = this->in_.c_str (); this->out_.clear (); @@ -75,7 +75,7 @@ Test_Unbounded_String::run_sii_test (Alt_Mapping_ptr objref) } CORBA::Boolean -Test_Unbounded_String::check_validity (void) +Test_Unbounded_String::check_validity () { CORBA::ULong len = this->in_.length (); @@ -98,7 +98,7 @@ Test_Unbounded_String::check_validity (CORBA::Request_ptr ) } void -Test_Unbounded_String::print_values (void) +Test_Unbounded_String::print_values () { ACE_DEBUG ((LM_DEBUG, "\n=*=*=*=*=*=*\n" diff --git a/TAO/tests/Alt_Mapping/ub_string.h b/TAO/tests/Alt_Mapping/ub_string.h index 7326aa8f5de..7af096f8bf8 100644 --- a/TAO/tests/Alt_Mapping/ub_string.h +++ b/TAO/tests/Alt_Mapping/ub_string.h @@ -22,10 +22,10 @@ class Test_Unbounded_String { public: /// ctor - Test_Unbounded_String (void); + Test_Unbounded_String (); /// dtor - ~Test_Unbounded_String (void); + ~Test_Unbounded_String (); /// run the SII test int run_sii_test (Alt_Mapping_ptr objref); @@ -37,16 +37,16 @@ public: int init_parameters (Alt_Mapping_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); private: /// operation name diff --git a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp index 771849b9cd3..3b3c0c7e8ba 100644 --- a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp +++ b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp @@ -63,7 +63,7 @@ Test_Unbounded_Struct_Sequence::init_parameters (Alt_Mapping_ptr) } int -Test_Unbounded_Struct_Sequence::reset_parameters (void) +Test_Unbounded_Struct_Sequence::reset_parameters () { this->inout_.clear (); this->out_.clear (); @@ -92,7 +92,7 @@ Test_Unbounded_Struct_Sequence::run_sii_test ( } CORBA::Boolean -Test_Unbounded_Struct_Sequence::check_validity (void) +Test_Unbounded_Struct_Sequence::check_validity () { return (this->compare (this->in_, this->inout_) && this->compare (this->in_, this->out_) @@ -100,7 +100,7 @@ Test_Unbounded_Struct_Sequence::check_validity (void) } void -Test_Unbounded_Struct_Sequence::print_values (void) +Test_Unbounded_Struct_Sequence::print_values () { ACE_DEBUG ((LM_DEBUG, "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n" diff --git a/TAO/tests/Alt_Mapping/ub_struct_seq.h b/TAO/tests/Alt_Mapping/ub_struct_seq.h index 973f9a0f186..4579bef5674 100644 --- a/TAO/tests/Alt_Mapping/ub_struct_seq.h +++ b/TAO/tests/Alt_Mapping/ub_struct_seq.h @@ -23,10 +23,10 @@ class Test_Unbounded_Struct_Sequence { public: /// ctor - Test_Unbounded_Struct_Sequence (void); + Test_Unbounded_Struct_Sequence (); /// dtor - ~Test_Unbounded_Struct_Sequence (void); + ~Test_Unbounded_Struct_Sequence (); /// run the SII test int run_sii_test (Alt_Mapping_ptr objref); @@ -38,13 +38,13 @@ public: int init_parameters (Alt_Mapping_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// print all the values - void print_values (void); + void print_values (); protected: /// compare diff --git a/TAO/tests/Any/Recursive/Hello.cpp b/TAO/tests/Any/Recursive/Hello.cpp index b1013a6061c..82d4b4724db 100644 --- a/TAO/tests/Any/Recursive/Hello.cpp +++ b/TAO/tests/Any/Recursive/Hello.cpp @@ -19,7 +19,7 @@ Hello::get_any (CORBA::Any const & the_any) void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Any/Recursive/Hello.h b/TAO/tests/Any/Recursive/Hello.h index d8ef497e2e9..97d878316d8 100644 --- a/TAO/tests/Any/Recursive/Hello.h +++ b/TAO/tests/Any/Recursive/Hello.h @@ -26,7 +26,7 @@ public: // Return the any provide as an "in" argument. virtual CORBA::Any * get_any (CORBA::Any const & the_any); - virtual void shutdown (void); + virtual void shutdown (); private: /// The ORB which will be shutdown by Hello::shutdown(). diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp index 8ea1c79868a..286816e91c4 100644 --- a/TAO/tests/BiDirectional/client.cpp +++ b/TAO/tests/BiDirectional/client.cpp @@ -5,7 +5,7 @@ const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); -void do_nothing (void) +void do_nothing () { } diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp index b94de23c40e..354f30e5e11 100644 --- a/TAO/tests/BiDirectional/test_i.cpp +++ b/TAO/tests/BiDirectional/test_i.cpp @@ -10,7 +10,7 @@ #endif /* __ACE_INLINE__ */ void -Callback_i::shutdown (void) +Callback_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); this->orb_->shutdown (false); @@ -47,7 +47,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/tests/BiDirectional/test_i.h b/TAO/tests/BiDirectional/test_i.h index f7a40ffbf10..8444d669abe 100644 --- a/TAO/tests/BiDirectional/test_i.h +++ b/TAO/tests/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/tests/BiDirectional_DelayedUpcall/client.cpp b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp index 3ce3740d7ce..4ff765c785a 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_DelayedUpcall/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/tests/BiDirectional_DelayedUpcall/test_i.cpp b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp index 1ce4b4964a8..a7c003f4788 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp +++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp @@ -10,7 +10,7 @@ #endif /* __ACE_INLINE__ */ void -Callback_i::shutdown (void) +Callback_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); // Shutdown the server before we shutdown our own ORB @@ -20,7 +20,7 @@ Callback_i::shutdown (void) } void -Callback_i::callback_method (void) +Callback_i::callback_method () { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "Callback method called\n")); @@ -91,7 +91,7 @@ Simple_Server_i::callback_object (Callback_ptr callback void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h index 7d63e09030c..3b9f0628482 100644 --- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h +++ b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h @@ -29,10 +29,10 @@ public: Callback_i (CORBA::ORB_ptr orb, Simple_Server_ptr srv); /// Safe way to shutdown - void shutdown (void); + void shutdown (); /// The callback method - void callback_method (void); + void callback_method (); private: /// The orb @@ -59,7 +59,7 @@ public: void callback_object (Callback_ptr callback); - void shutdown (void); + void shutdown (); virtual int handle_timeout (const ACE_Time_Value ¤t_time, const void *act = 0); diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp index 7c14fc00199..daa8ef6e573 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/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/tests/BiDirectional_NestedUpcall/test_i.cpp b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp index fb14458b6e6..750ad83399d 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp +++ b/TAO/tests/BiDirectional_NestedUpcall/test_i.cpp @@ -9,7 +9,7 @@ #endif /* __ACE_INLINE__ */ void -Callback_i::shutdown (void) +Callback_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n")); this->orb_->shutdown (false); @@ -63,7 +63,7 @@ Simple_Server_i::callback_object (Callback_ptr callback void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/BiDirectional_NestedUpcall/test_i.h b/TAO/tests/BiDirectional_NestedUpcall/test_i.h index 8051d1c805a..9b78f5a9fe1 100644 --- a/TAO/tests/BiDirectional_NestedUpcall/test_i.h +++ b/TAO/tests/BiDirectional_NestedUpcall/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,7 +56,7 @@ public: void callback_object (Callback_ptr callback); - void shutdown (void); + void shutdown (); private: /// The ORB diff --git a/TAO/tests/Big_AMI/ami_test_i.cpp b/TAO/tests/Big_AMI/ami_test_i.cpp index 08a56b206e7..45a6662936f 100644 --- a/TAO/tests/Big_AMI/ami_test_i.cpp +++ b/TAO/tests/Big_AMI/ami_test_i.cpp @@ -37,7 +37,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l, } void -AMI_Test_i::shutdown (void) +AMI_Test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Big_AMI/ami_test_i.h b/TAO/tests/Big_AMI/ami_test_i.h index 843c2e2648c..4a4597272ce 100644 --- a/TAO/tests/Big_AMI/ami_test_i.h +++ b/TAO/tests/Big_AMI/ami_test_i.h @@ -32,7 +32,7 @@ public: const char* in_str, const A::Payload &the_payload); - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Big_Oneways/Coordinator.cpp b/TAO/tests/Big_Oneways/Coordinator.cpp index 7b5cb6645c6..70bc80cdf48 100644 --- a/TAO/tests/Big_Oneways/Coordinator.cpp +++ b/TAO/tests/Big_Oneways/Coordinator.cpp @@ -8,7 +8,7 @@ Coordinator::Coordinator (CORBA::ULong peer_count) ACE_NEW (this->peers_, Test::Peer_var[this->peer_max_]); } -Coordinator::~Coordinator (void) +Coordinator::~Coordinator () { delete[] this->peers_; } @@ -42,7 +42,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control, } void -Coordinator::shutdown_all_peers (void) +Coordinator::shutdown_all_peers () { for (Test::Peer_var *i = this->peers_; i != this->peers_ + this->peer_count_; diff --git a/TAO/tests/Big_Oneways/Coordinator.h b/TAO/tests/Big_Oneways/Coordinator.h index 72e79a9389e..5995c27e2ac 100644 --- a/TAO/tests/Big_Oneways/Coordinator.h +++ b/TAO/tests/Big_Oneways/Coordinator.h @@ -25,14 +25,14 @@ public: Test::Session_List &session_list); /// Shutdown all the peers - void shutdown_all_peers (void); + void shutdown_all_peers (); // = The skeleton methods virtual void add_peer (Test::Peer_ptr peer); protected: /// Protected Destructor, call _remove_ref() instead - virtual ~Coordinator (void); + virtual ~Coordinator (); private: /// Store a reference to each peer diff --git a/TAO/tests/Big_Oneways/Peer.cpp b/TAO/tests/Big_Oneways/Peer.cpp index be8124c5d82..d81779cec2d 100644 --- a/TAO/tests/Big_Oneways/Peer.cpp +++ b/TAO/tests/Big_Oneways/Peer.cpp @@ -6,7 +6,7 @@ Peer::Peer (CORBA::ORB_ptr orb) { } -Peer::~Peer (void) +Peer::~Peer () { } @@ -41,7 +41,7 @@ Peer::create_session (Test::Session_Control_ptr control, } void -Peer::shutdown (void) +Peer::shutdown () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Peer::shutdown, waiting for threads\n")); diff --git a/TAO/tests/Big_Oneways/Peer.h b/TAO/tests/Big_Oneways/Peer.h index 9188396fcce..61ce3f84a50 100644 --- a/TAO/tests/Big_Oneways/Peer.h +++ b/TAO/tests/Big_Oneways/Peer.h @@ -14,7 +14,7 @@ public: Peer (CORBA::ORB_ptr orb); /// Destructor - virtual ~Peer (void); + virtual ~Peer (); // = The skeleton methods virtual Test::Session_ptr create_session (Test::Session_Control_ptr control, @@ -22,7 +22,7 @@ public: CORBA::ULong thread_count, CORBA::ULong message_count, CORBA::ULong peer_count); - virtual void shutdown (void); + virtual void shutdown (); private: /// Keep a pointer to the ORB to shutdown cleanly diff --git a/TAO/tests/Big_Oneways/Session.cpp b/TAO/tests/Big_Oneways/Session.cpp index 5f205cd73a8..5baadc17457 100644 --- a/TAO/tests/Big_Oneways/Session.cpp +++ b/TAO/tests/Big_Oneways/Session.cpp @@ -18,12 +18,12 @@ Session::Session (Test::Session_Control_ptr control, { } -Session::~Session (void) +Session::~Session () { } int -Session::svc (void) +Session::svc () { this->barrier_.wait (); CORBA::ULong i = 0; @@ -86,7 +86,7 @@ Session::svc (void) } void -Session::validate_connections (void) +Session::validate_connections () { CORBA::ULong session_count = this->other_sessions_.length (); @@ -151,7 +151,7 @@ Session::start (const Test::Session_List &other_sessions) } void -Session::ping (void) +Session::ping () { } @@ -197,7 +197,7 @@ Session::receive_payload (const Test::Payload &the_payload) void -Session::destroy (void) +Session::destroy () { // Make sure local resources are released diff --git a/TAO/tests/Big_Oneways/Session.h b/TAO/tests/Big_Oneways/Session.h index 13fe7148e09..826f35db6f8 100644 --- a/TAO/tests/Big_Oneways/Session.h +++ b/TAO/tests/Big_Oneways/Session.h @@ -26,19 +26,19 @@ public: CORBA::ULong peer_count); /// Destructor - virtual ~Session (void); + virtual ~Session (); /// Run one of the experiment threads - int svc (void); + int svc (); // = The skeleton methods virtual void start (const Test::Session_List &other_sessions); - virtual void ping (void); + virtual void ping (); virtual void receive_payload (const Test::Payload &the_payload); - virtual void destroy (void); + virtual void destroy (); private: /// Helper function used to report any problems and destroy local @@ -50,7 +50,7 @@ private: /// Make sure that all threads have connections avaiable to the /// other sessions. - void validate_connections (void); + void validate_connections (); private: /// Synchronize the internal state diff --git a/TAO/tests/Big_Oneways/Session_Control.cpp b/TAO/tests/Big_Oneways/Session_Control.cpp index bccb40f881d..dcf22af2c38 100644 --- a/TAO/tests/Big_Oneways/Session_Control.cpp +++ b/TAO/tests/Big_Oneways/Session_Control.cpp @@ -12,7 +12,7 @@ Session_Control::all_sessions_finished () const return this->session_count_ == 0; } -Session_Control::~Session_Control (void) +Session_Control::~Session_Control () { if (this->session_count_ == 0 && this->success_) { diff --git a/TAO/tests/Big_Oneways/Session_Control.h b/TAO/tests/Big_Oneways/Session_Control.h index 7b7791f5f67..bd9e1d24bbd 100644 --- a/TAO/tests/Big_Oneways/Session_Control.h +++ b/TAO/tests/Big_Oneways/Session_Control.h @@ -17,7 +17,7 @@ public: Session_Control (CORBA::ULong session_count); /// Destructor - virtual ~Session_Control (void); + virtual ~Session_Control (); /// Return 1 when all sessions have finished int all_sessions_finished () const; diff --git a/TAO/tests/Big_Oneways/Session_Task.cpp b/TAO/tests/Big_Oneways/Session_Task.cpp index d457a3b146a..cdd2ec01d07 100644 --- a/TAO/tests/Big_Oneways/Session_Task.cpp +++ b/TAO/tests/Big_Oneways/Session_Task.cpp @@ -8,7 +8,7 @@ Session_Task::Session_Task (Session *session) } int -Session_Task::svc (void) +Session_Task::svc () { return this->session_->svc (); } diff --git a/TAO/tests/Big_Oneways/Session_Task.h b/TAO/tests/Big_Oneways/Session_Task.h index a2b151ece63..a12710923c2 100644 --- a/TAO/tests/Big_Oneways/Session_Task.h +++ b/TAO/tests/Big_Oneways/Session_Task.h @@ -19,7 +19,7 @@ public: Session_Task (Session *session); /// Thread entry point - int svc (void); + int svc (); private: /// Reference to the test interface diff --git a/TAO/tests/Big_Reply/Big_Reply_i.cpp b/TAO/tests/Big_Reply/Big_Reply_i.cpp index 957614f04d6..a8c3761c15d 100644 --- a/TAO/tests/Big_Reply/Big_Reply_i.cpp +++ b/TAO/tests/Big_Reply/Big_Reply_i.cpp @@ -7,7 +7,7 @@ Big_Reply_i::Big_Reply_i (CORBA::ORB_ptr orb, { } -Big_Reply_i::~Big_Reply_i (void) +Big_Reply_i::~Big_Reply_i () { } diff --git a/TAO/tests/Big_Reply/Big_Reply_i.h b/TAO/tests/Big_Reply/Big_Reply_i.h index 46d1209bbf3..0d6d2b93c2c 100644 --- a/TAO/tests/Big_Reply/Big_Reply_i.h +++ b/TAO/tests/Big_Reply/Big_Reply_i.h @@ -26,14 +26,14 @@ public: CORBA::ULong length); ///Destructor - virtual ~Big_Reply_i (void); + virtual ~Big_Reply_i (); // = The skeleton methods - virtual Test::Octet_Seq *get_big_reply (void); + virtual Test::Octet_Seq *get_big_reply (); - virtual void ping (void); + virtual void ping (); - virtual void shutdown (void); + virtual void shutdown (); private: /// Our local ORB ptr diff --git a/TAO/tests/Big_Reply/Client_Task.cpp b/TAO/tests/Big_Reply/Client_Task.cpp index d0732cf60f8..e2c1a4c2aa2 100644 --- a/TAO/tests/Big_Reply/Client_Task.cpp +++ b/TAO/tests/Big_Reply/Client_Task.cpp @@ -13,7 +13,7 @@ Client_Task::Client_Task (Test::Big_Reply_ptr reply_gen, } int -Client_Task::svc (void) +Client_Task::svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); @@ -43,7 +43,7 @@ Client_Task::svc (void) } void -Client_Task::validate_connection (void) +Client_Task::validate_connection () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Validating connection ..\n")); diff --git a/TAO/tests/Big_Reply/Client_Task.h b/TAO/tests/Big_Reply/Client_Task.h index d19e1b48d64..b487b05b1ca 100644 --- a/TAO/tests/Big_Reply/Client_Task.h +++ b/TAO/tests/Big_Reply/Client_Task.h @@ -20,11 +20,11 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Validate the connection - void validate_connection (void); + void validate_connection (); private: /// Reference to the test interface diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.cpp b/TAO/tests/Big_Request_Muxing/Client_Task.cpp index df1cd5a53b2..9846d0ba5d6 100644 --- a/TAO/tests/Big_Request_Muxing/Client_Task.cpp +++ b/TAO/tests/Big_Request_Muxing/Client_Task.cpp @@ -44,7 +44,7 @@ Client_Task::ID () const } int -Client_Task::svc (void) +Client_Task::svc () { ++tasks_running_; if (TAO_debug_level > 0) @@ -138,7 +138,7 @@ Client_Task::svc (void) } void -Client_Task::validate_connection (void) +Client_Task::validate_connection () { try { diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.h b/TAO/tests/Big_Request_Muxing/Client_Task.h index 0b130075d98..1ab52fa9b08 100644 --- a/TAO/tests/Big_Request_Muxing/Client_Task.h +++ b/TAO/tests/Big_Request_Muxing/Client_Task.h @@ -28,7 +28,7 @@ public: const ACE_CString& ident); /// Thread entry point - int svc (void); + int svc (); bool done() const; const char *ID () const; @@ -36,7 +36,7 @@ public: private: /// Make sure that all threads have connections available to /// workaround bug 189 - void validate_connection (void); + void validate_connection (); private: /// Reference to the test interface diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp index b55f11f3bfc..f901863619d 100644 --- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp +++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.cpp @@ -1,6 +1,6 @@ #include "Payload_Receiver.h" -Payload_Receiver::Payload_Receiver (void) +Payload_Receiver::Payload_Receiver () : message_count_ (0) , maybe_lost_count_ (0) { @@ -25,7 +25,7 @@ Payload_Receiver::more_data ( } void -Payload_Receiver::ping (void) +Payload_Receiver::ping () { } diff --git a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h index de55d042079..706ee6371ed 100644 --- a/TAO/tests/Big_Request_Muxing/Payload_Receiver.h +++ b/TAO/tests/Big_Request_Muxing/Payload_Receiver.h @@ -13,13 +13,13 @@ class Payload_Receiver : public virtual POA_Test::Payload_Receiver { public: - Payload_Receiver (void); + Payload_Receiver (); // = The skeleton methods virtual void more_data (const Test::Payload &payload, CORBA::Boolean maybe_lost); - virtual void ping (void); + virtual void ping (); int count (bool maybe_lost = false) const; diff --git a/TAO/tests/Big_Twoways/Coordinator.cpp b/TAO/tests/Big_Twoways/Coordinator.cpp index 7813458813f..36507c31cb2 100644 --- a/TAO/tests/Big_Twoways/Coordinator.cpp +++ b/TAO/tests/Big_Twoways/Coordinator.cpp @@ -8,7 +8,7 @@ Coordinator::Coordinator (CORBA::ULong peer_count) ACE_NEW (this->peers_, Test::Peer_var[this->peer_max_]); } -Coordinator::~Coordinator (void) +Coordinator::~Coordinator () { delete[] this->peers_; } @@ -42,7 +42,7 @@ Coordinator::create_session_list (Test::Session_Control_ptr session_control, } void -Coordinator::shutdown_all_peers (void) +Coordinator::shutdown_all_peers () { for (Test::Peer_var *i = this->peers_; i != this->peers_ + this->peer_count_; diff --git a/TAO/tests/Big_Twoways/Coordinator.h b/TAO/tests/Big_Twoways/Coordinator.h index 15809cba47e..5eea7e62c33 100644 --- a/TAO/tests/Big_Twoways/Coordinator.h +++ b/TAO/tests/Big_Twoways/Coordinator.h @@ -24,14 +24,14 @@ public: Test::Session_List &session_list); /// Shutdown all the peers - void shutdown_all_peers (void); + void shutdown_all_peers (); // = The skeleton methods virtual void add_peer (Test::Peer_ptr peer); protected: /// Protected destructor, call _remove_ref() to delete - virtual ~Coordinator (void); + virtual ~Coordinator (); private: /// Store a reference to each peer diff --git a/TAO/tests/Big_Twoways/Peer.cpp b/TAO/tests/Big_Twoways/Peer.cpp index a7df3f550ec..2024fb17cc6 100644 --- a/TAO/tests/Big_Twoways/Peer.cpp +++ b/TAO/tests/Big_Twoways/Peer.cpp @@ -6,7 +6,7 @@ Peer::Peer (CORBA::ORB_ptr orb) { } -Peer::~Peer (void) +Peer::~Peer () { } @@ -31,7 +31,7 @@ Peer::create_session (Test::Session_Control_ptr control, } void -Peer::shutdown (void) +Peer::shutdown () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Peer::shutdown, waiting for threads\n")); diff --git a/TAO/tests/Big_Twoways/Peer.h b/TAO/tests/Big_Twoways/Peer.h index 9188396fcce..61ce3f84a50 100644 --- a/TAO/tests/Big_Twoways/Peer.h +++ b/TAO/tests/Big_Twoways/Peer.h @@ -14,7 +14,7 @@ public: Peer (CORBA::ORB_ptr orb); /// Destructor - virtual ~Peer (void); + virtual ~Peer (); // = The skeleton methods virtual Test::Session_ptr create_session (Test::Session_Control_ptr control, @@ -22,7 +22,7 @@ public: CORBA::ULong thread_count, CORBA::ULong message_count, CORBA::ULong peer_count); - virtual void shutdown (void); + virtual void shutdown (); private: /// Keep a pointer to the ORB to shutdown cleanly diff --git a/TAO/tests/Big_Twoways/Session.cpp b/TAO/tests/Big_Twoways/Session.cpp index 13edf85c678..9ca05f2e34a 100644 --- a/TAO/tests/Big_Twoways/Session.cpp +++ b/TAO/tests/Big_Twoways/Session.cpp @@ -18,12 +18,12 @@ Session::Session (Test::Session_Control_ptr control, { } -Session::~Session (void) +Session::~Session () { } int -Session::svc (void) +Session::svc () { this->barrier_.wait (); @@ -183,7 +183,7 @@ Session::echo_payload (const Test::Payload &the_payload) void -Session::destroy (void) +Session::destroy () { // Make sure local resources are released @@ -206,7 +206,7 @@ Session::more_work () const } void -Session::validate_connections (void) +Session::validate_connections () { const CORBA::ULong session_count = this->other_sessions_.length (); diff --git a/TAO/tests/Big_Twoways/Session.h b/TAO/tests/Big_Twoways/Session.h index 7ee8c297f2e..9288200e1b3 100644 --- a/TAO/tests/Big_Twoways/Session.h +++ b/TAO/tests/Big_Twoways/Session.h @@ -26,18 +26,18 @@ public: CORBA::ULong peer_count); /// Run one of the experiment threads - int svc (void); + int svc (); // = The skeleton methods virtual void start (const Test::Session_List &other_sessions); virtual Test::Payload* echo_payload (const Test::Payload &the_payload); - virtual void destroy (void); + virtual void destroy (); protected: /// Protected destructor, call _remove_ref() to delete - virtual ~Session (void); + virtual ~Session (); private: /// Helper function used to report any problems and destroy local @@ -48,7 +48,7 @@ private: int more_work () const; /// Validate all the connections - void validate_connections (void); + void validate_connections (); private: /// Synchronize the internal state diff --git a/TAO/tests/Big_Twoways/Session_Control.cpp b/TAO/tests/Big_Twoways/Session_Control.cpp index 027bd658625..59a9f6a04ef 100644 --- a/TAO/tests/Big_Twoways/Session_Control.cpp +++ b/TAO/tests/Big_Twoways/Session_Control.cpp @@ -12,7 +12,7 @@ Session_Control::all_sessions_finished () const return this->session_count_ == 0; } -Session_Control::~Session_Control (void) +Session_Control::~Session_Control () { if (this->session_count_ == 0 && this->success_) { diff --git a/TAO/tests/Big_Twoways/Session_Control.h b/TAO/tests/Big_Twoways/Session_Control.h index 7b7791f5f67..bd9e1d24bbd 100644 --- a/TAO/tests/Big_Twoways/Session_Control.h +++ b/TAO/tests/Big_Twoways/Session_Control.h @@ -17,7 +17,7 @@ public: Session_Control (CORBA::ULong session_count); /// Destructor - virtual ~Session_Control (void); + virtual ~Session_Control (); /// Return 1 when all sessions have finished int all_sessions_finished () const; diff --git a/TAO/tests/Big_Twoways/Session_Task.cpp b/TAO/tests/Big_Twoways/Session_Task.cpp index d457a3b146a..cdd2ec01d07 100644 --- a/TAO/tests/Big_Twoways/Session_Task.cpp +++ b/TAO/tests/Big_Twoways/Session_Task.cpp @@ -8,7 +8,7 @@ Session_Task::Session_Task (Session *session) } int -Session_Task::svc (void) +Session_Task::svc () { return this->session_->svc (); } diff --git a/TAO/tests/Big_Twoways/Session_Task.h b/TAO/tests/Big_Twoways/Session_Task.h index a2b151ece63..a12710923c2 100644 --- a/TAO/tests/Big_Twoways/Session_Task.h +++ b/TAO/tests/Big_Twoways/Session_Task.h @@ -19,7 +19,7 @@ public: Session_Task (Session *session); /// Thread entry point - int svc (void); + int svc (); private: /// Reference to the test interface diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp index 64b3444a447..75ff94e7e8c 100644 --- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp +++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.cpp @@ -15,7 +15,7 @@ Blocking_Sync_None::slow_operation (const Test::Payload &, } void -Blocking_Sync_None::shutdown (void) +Blocking_Sync_None::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h index 76044d36263..eff1fcb4390 100644 --- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h +++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.h @@ -17,7 +17,7 @@ public: virtual void slow_operation (const Test::Payload &the_payload, CORBA::ULong sleep_microseconds); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to shutdown the application. diff --git a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp index 6ae6ebf541a..50c18856bd1 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.cpp @@ -6,7 +6,7 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb) } int -Client_Task::svc (void) +Client_Task::svc () { try { diff --git a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.h b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.h index 40b44ee5757..d98b2894ae2 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Client_Task.h +++ b/TAO/tests/Bug_1020_Basic_Regression/Client_Task.h @@ -18,7 +18,7 @@ public: Client_Task (CORBA::ORB_ptr orb); /// Thread entry point - int svc (void); + int svc (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp index 775f68a3c18..f2f0bb05caf 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.cpp @@ -26,7 +26,7 @@ Echo_Caller::start_task(Test::Echo_ptr client) } void -Echo_Caller::shutdown(void) +Echo_Caller::shutdown() { ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n")); orb_->shutdown(0); diff --git a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h index 8ed7ebb0b35..3f079f0cd2f 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h +++ b/TAO/tests/Bug_1020_Basic_Regression/Echo_Caller.h @@ -14,7 +14,7 @@ public: virtual void start_task (Test::Echo_ptr client); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp index e8aae406238..780d8fc11a1 100644 --- a/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1020_Basic_Regression/Server_Task.cpp @@ -9,7 +9,7 @@ Server_Task::Server_Task (Test::Echo_ptr echo, } int -Server_Task::svc (void) +Server_Task::svc () { Test::Payload payload (32768); payload.length (32768); diff --git a/TAO/tests/Bug_1020_Regression/ORB_Task.cpp b/TAO/tests/Bug_1020_Regression/ORB_Task.cpp index cb379028636..930327a63a8 100644 --- a/TAO/tests/Bug_1020_Regression/ORB_Task.cpp +++ b/TAO/tests/Bug_1020_Regression/ORB_Task.cpp @@ -13,7 +13,7 @@ ORB_Task::ORB_Task(CORBA::ORB_ptr orb) } int -ORB_Task::svc (void) +ORB_Task::svc () { try { diff --git a/TAO/tests/Bug_1020_Regression/Server_Task.cpp b/TAO/tests/Bug_1020_Regression/Server_Task.cpp index cb93da3a251..9828cbe2226 100644 --- a/TAO/tests/Bug_1020_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1020_Regression/Server_Task.cpp @@ -12,7 +12,7 @@ Server_Task::Server_Task(Test::Echo_ptr echo) } int -Server_Task::svc (void) +Server_Task::svc () { Test::Payload pload(16); pload.length(16); int stop_loop = 0; diff --git a/TAO/tests/Bug_1020_Regression/Server_Task.h b/TAO/tests/Bug_1020_Regression/Server_Task.h index fbd0c089642..8562bc493fe 100644 --- a/TAO/tests/Bug_1020_Regression/Server_Task.h +++ b/TAO/tests/Bug_1020_Regression/Server_Task.h @@ -17,7 +17,7 @@ public: Server_Task (Test::Echo_ptr echo); /// Thread entry point - int svc (void); + int svc (); private: /// Reference to the test interface diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.cpp b/TAO/tests/Bug_1254_Regression/BlobServer.cpp index ee750de19eb..990c6dd42d7 100644 --- a/TAO/tests/Bug_1254_Regression/BlobServer.cpp +++ b/TAO/tests/Bug_1254_Regression/BlobServer.cpp @@ -26,7 +26,7 @@ BlobServerImpl::test( } void -BlobServerImpl::shutdown (void) +BlobServerImpl::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_1254_Regression/BlobServer.h b/TAO/tests/Bug_1254_Regression/BlobServer.h index 3875b04a7f4..e6c77019a20 100644 --- a/TAO/tests/Bug_1254_Regression/BlobServer.h +++ b/TAO/tests/Bug_1254_Regression/BlobServer.h @@ -17,7 +17,7 @@ public: BlobType1& blob1, BlobType2& blob2 ); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp index 9bed2cb6b47..846cb985b38 100644 --- a/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp +++ b/TAO/tests/Bug_1269_Regression/Echo_Caller.cpp @@ -25,7 +25,7 @@ Echo_Caller::start_task(Test::Echo_ptr client) } void -Echo_Caller::shutdown(void) +Echo_Caller::shutdown() { ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n")); orb_->shutdown(0); diff --git a/TAO/tests/Bug_1269_Regression/Echo_Caller.h b/TAO/tests/Bug_1269_Regression/Echo_Caller.h index 8ae5d484754..76d1ae79a1e 100644 --- a/TAO/tests/Bug_1269_Regression/Echo_Caller.h +++ b/TAO/tests/Bug_1269_Regression/Echo_Caller.h @@ -14,7 +14,7 @@ public: virtual void start_task(Test::Echo_ptr client); - virtual void shutdown(void); + virtual void shutdown(); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1269_Regression/Server_Timer.cpp b/TAO/tests/Bug_1269_Regression/Server_Timer.cpp index 56ec581d509..82a425e5e0b 100644 --- a/TAO/tests/Bug_1269_Regression/Server_Timer.cpp +++ b/TAO/tests/Bug_1269_Regression/Server_Timer.cpp @@ -15,7 +15,7 @@ Server_Timer::Server_Timer(Test::Echo_ptr echo, } void -Server_Timer::activate (void) +Server_Timer::activate () { ACE_Time_Value tv (0, 20000); this->reactor()->schedule_timer (this, 0, tv); diff --git a/TAO/tests/Bug_1269_Regression/Server_Timer.h b/TAO/tests/Bug_1269_Regression/Server_Timer.h index b249d3afcea..f575f3ce74d 100644 --- a/TAO/tests/Bug_1269_Regression/Server_Timer.h +++ b/TAO/tests/Bug_1269_Regression/Server_Timer.h @@ -21,7 +21,7 @@ public: /// Constructor Server_Timer (Test::Echo_ptr echo, ACE_Reactor * reactor); - void activate (void); + void activate (); /// Thread entry point int handle_timeout(ACE_Time_Value const & tv, void const *); diff --git a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp index 5d1490074c3..8756d4d29e8 100644 --- a/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp +++ b/TAO/tests/Bug_1270_Regression/Echo_Caller.cpp @@ -27,7 +27,7 @@ Echo_Caller::start_task(Test::Echo_ptr client) } void -Echo_Caller::shutdown(void) +Echo_Caller::shutdown() { ACE_DEBUG ((LM_DEBUG, "Server received shutdown message\n")); orb_->shutdown(0); diff --git a/TAO/tests/Bug_1270_Regression/Echo_Caller.h b/TAO/tests/Bug_1270_Regression/Echo_Caller.h index c480d2f76fd..bdd51cb30c5 100644 --- a/TAO/tests/Bug_1270_Regression/Echo_Caller.h +++ b/TAO/tests/Bug_1270_Regression/Echo_Caller.h @@ -15,7 +15,7 @@ public: virtual void start_task(Test::Echo_ptr client); - virtual void shutdown(void); + virtual void shutdown(); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1270_Regression/Server_Timer.cpp b/TAO/tests/Bug_1270_Regression/Server_Timer.cpp index bdb0533b1a6..4a727bce0fd 100644 --- a/TAO/tests/Bug_1270_Regression/Server_Timer.cpp +++ b/TAO/tests/Bug_1270_Regression/Server_Timer.cpp @@ -17,7 +17,7 @@ Server_Timer::Server_Timer(Test::Echo_ptr echo, } void -Server_Timer::activate (void) +Server_Timer::activate () { ACE_Time_Value tv (0, 20000); this->reactor()->schedule_timer (this, 0, tv, tv); diff --git a/TAO/tests/Bug_1270_Regression/Server_Timer.h b/TAO/tests/Bug_1270_Regression/Server_Timer.h index 6d3194ff4bb..b9e00941a97 100644 --- a/TAO/tests/Bug_1270_Regression/Server_Timer.h +++ b/TAO/tests/Bug_1270_Regression/Server_Timer.h @@ -21,7 +21,7 @@ public: /// Constructor Server_Timer (Test::Echo_ptr echo, ACE_Reactor * reactor); - void activate (void); + void activate (); /// Thread entry point int handle_timeout(ACE_Time_Value const & tv, void const *); diff --git a/TAO/tests/Bug_1330_Regression/Test_i.cpp b/TAO/tests/Bug_1330_Regression/Test_i.cpp index f4c287557a5..6abc12a38d4 100644 --- a/TAO/tests/Bug_1330_Regression/Test_i.cpp +++ b/TAO/tests/Bug_1330_Regression/Test_i.cpp @@ -10,12 +10,12 @@ Test_i::~Test_i() } void -Test_i::test_method (void) +Test_i::test_method () { } void -Test_i::shutdown (void) +Test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_1330_Regression/Test_i.h b/TAO/tests/Bug_1330_Regression/Test_i.h index 0ae7dfeface..e2b6c7e28e5 100644 --- a/TAO/tests/Bug_1330_Regression/Test_i.h +++ b/TAO/tests/Bug_1330_Regression/Test_i.h @@ -12,12 +12,12 @@ public: Test_i (CORBA::ORB_ptr orb); /// Destructor - ~Test_i (void); + ~Test_i (); /// A method - virtual void test_method(void); + virtual void test_method(); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp b/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp index dc7e2595146..05649be4244 100644 --- a/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp +++ b/TAO/tests/Bug_1361_Regression/Echo_Caller.cpp @@ -19,7 +19,7 @@ Echo_Caller::start_task(Test::Echo_ptr client) } void -Echo_Caller::shutdown(void) +Echo_Caller::shutdown() { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server received shutdown message\n")); pool_->shutdown(); diff --git a/TAO/tests/Bug_1361_Regression/Echo_Caller.h b/TAO/tests/Bug_1361_Regression/Echo_Caller.h index 436fae8c468..bf2fb1fcd89 100644 --- a/TAO/tests/Bug_1361_Regression/Echo_Caller.h +++ b/TAO/tests/Bug_1361_Regression/Echo_Caller.h @@ -17,7 +17,7 @@ public: virtual void start_task(Test::Echo_ptr client); - virtual void shutdown(void); + virtual void shutdown(); private: Thread_Pool *pool_; diff --git a/TAO/tests/Bug_1361_Regression/ORB_Task.cpp b/TAO/tests/Bug_1361_Regression/ORB_Task.cpp index d8074e356af..0f72129c222 100644 --- a/TAO/tests/Bug_1361_Regression/ORB_Task.cpp +++ b/TAO/tests/Bug_1361_Regression/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/tests/Bug_1361_Regression/Server_Thread_Pool.cpp b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp index e3e80c625f6..100c82f835e 100644 --- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp +++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp @@ -26,12 +26,12 @@ Thread_Pool::Thread_Pool (CORBA::ORB_ptr orb, "activate failed\n")); } -Thread_Pool::~Thread_Pool (void) +Thread_Pool::~Thread_Pool () { } int -Thread_Pool::shutdown (void) +Thread_Pool::shutdown () { thr_mgr_->cancel_grp (grp_id_); @@ -81,7 +81,7 @@ Thread_Pool::put (ACE_Message_Block *mb, // for all other threads to complete this iteration. int -Thread_Pool::svc (void) +Thread_Pool::svc () { // Note that the <ACE_Task::svc_run> method automatically adds us to // the Thread_Manager when the thread begins. diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h index 94e88b01841..bcd01b5a604 100644 --- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h +++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h @@ -13,9 +13,9 @@ public: int n_threads); // Constructor activates <n_threads> in the thread pool. - virtual ~Thread_Pool (void); + virtual ~Thread_Pool (); // Destructor... - int shutdown (void); + int shutdown (); virtual int svc (); diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp index b432f576dc5..9ece8d2188f 100644 --- a/TAO/tests/Bug_1361_Regression/client.cpp +++ b/TAO/tests/Bug_1361_Regression/client.cpp @@ -22,7 +22,7 @@ public: ACE_Event_Handler::Reference_Counting_Policy::ENABLED); } - void activate (void) + void activate () { ACE_Time_Value tv (150, 0); this->reactor()->schedule_timer (this, 0, tv, tv); diff --git a/TAO/tests/Bug_1476_Regression/Client_Task.cpp b/TAO/tests/Bug_1476_Regression/Client_Task.cpp index 1a9e42386d4..7a50dd9f165 100644 --- a/TAO/tests/Bug_1476_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_1476_Regression/Client_Task.cpp @@ -16,7 +16,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/tests/Bug_1476_Regression/Client_Task.h b/TAO/tests/Bug_1476_Regression/Client_Task.h index 86427d8a6fa..a0ce97ce27c 100644 --- a/TAO/tests/Bug_1476_Regression/Client_Task.h +++ b/TAO/tests/Bug_1476_Regression/Client_Task.h @@ -21,7 +21,7 @@ public: int number_of_oneways); /// Thread entry point - int svc (void); + int svc (); private: /// Reference to the test interface diff --git a/TAO/tests/Bug_1476_Regression/Sender_i.cpp b/TAO/tests/Bug_1476_Regression/Sender_i.cpp index ad02084fb96..26c6fea3bfb 100644 --- a/TAO/tests/Bug_1476_Regression/Sender_i.cpp +++ b/TAO/tests/Bug_1476_Regression/Sender_i.cpp @@ -7,7 +7,7 @@ Sender_i::Sender_i (CORBA::ORB_ptr orb) { } -Sender_i::~Sender_i (void) +Sender_i::~Sender_i () { } @@ -19,7 +19,7 @@ Sender_i::active_objects (CORBA::ULong no_threads) void -Sender_i::send_ready_message (void) +Sender_i::send_ready_message () { ACE_DEBUG ((LM_DEBUG, "Received a call ...\n")); diff --git a/TAO/tests/Bug_1476_Regression/Server_Task.cpp b/TAO/tests/Bug_1476_Regression/Server_Task.cpp index d5da80805a5..9189b995034 100644 --- a/TAO/tests/Bug_1476_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1476_Regression/Server_Task.cpp @@ -9,7 +9,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb, } int -Server_Task::svc (void) +Server_Task::svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n")); try diff --git a/TAO/tests/Bug_1476_Regression/Server_Task.h b/TAO/tests/Bug_1476_Regression/Server_Task.h index b00eef99fbf..48fdbd39930 100644 --- a/TAO/tests/Bug_1476_Regression/Server_Task.h +++ b/TAO/tests/Bug_1476_Regression/Server_Task.h @@ -19,7 +19,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Reference to the ORB diff --git a/TAO/tests/Bug_1482_Regression/Client_Task.cpp b/TAO/tests/Bug_1482_Regression/Client_Task.cpp index ccb8dd6b03b..75fc7db51f9 100644 --- a/TAO/tests/Bug_1482_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_1482_Regression/Client_Task.cpp @@ -15,7 +15,7 @@ Client_Task::Client_Task (Test::Hello_ptr receiver, } int -Client_Task::svc (void) +Client_Task::svc () { // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); diff --git a/TAO/tests/Bug_1482_Regression/Client_Task.h b/TAO/tests/Bug_1482_Regression/Client_Task.h index 69e937d7249..203b18adea3 100644 --- a/TAO/tests/Bug_1482_Regression/Client_Task.h +++ b/TAO/tests/Bug_1482_Regression/Client_Task.h @@ -22,7 +22,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Reference to the test interface diff --git a/TAO/tests/Bug_1482_Regression/Hello.cpp b/TAO/tests/Bug_1482_Regression/Hello.cpp index 33e7e166cef..5a403fb9ee5 100644 --- a/TAO/tests/Bug_1482_Regression/Hello.cpp +++ b/TAO/tests/Bug_1482_Regression/Hello.cpp @@ -9,7 +9,7 @@ Hello::Hello (CORBA::ORB_ptr orb) } CORBA::ULong -Hello::next_prime (void) +Hello::next_prime () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, diff --git a/TAO/tests/Bug_1482_Regression/Hello.h b/TAO/tests/Bug_1482_Regression/Hello.h index 1f9423f17c0..7a9e7650c39 100644 --- a/TAO/tests/Bug_1482_Regression/Hello.h +++ b/TAO/tests/Bug_1482_Regression/Hello.h @@ -14,7 +14,7 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::ULong next_prime (void); + virtual CORBA::ULong next_prime (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Bug_1482_Regression/Server_Task.cpp b/TAO/tests/Bug_1482_Regression/Server_Task.cpp index 502da807fc9..ea1882c01a2 100644 --- a/TAO/tests/Bug_1482_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1482_Regression/Server_Task.cpp @@ -8,7 +8,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb, } int -Server_Task::svc (void) +Server_Task::svc () { // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n")); try diff --git a/TAO/tests/Bug_1482_Regression/Server_Task.h b/TAO/tests/Bug_1482_Regression/Server_Task.h index a07f998f5a1..a7faae94890 100644 --- a/TAO/tests/Bug_1482_Regression/Server_Task.h +++ b/TAO/tests/Bug_1482_Regression/Server_Task.h @@ -20,7 +20,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Reference to the ORB diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp index 0dc9dffc534..ffcdab9ef9d 100644 --- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp +++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.cpp @@ -3,7 +3,7 @@ #include "Client_ORBInitializer.h" #include "interceptors.h" -Client_ORBInitializer::Client_ORBInitializer (void) +Client_ORBInitializer::Client_ORBInitializer () { } diff --git a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h index e8e845f1793..a9108fadae8 100644 --- a/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h +++ b/TAO/tests/Bug_1495_Regression/Client_ORBInitializer.h @@ -26,7 +26,7 @@ class Client_ORBInitializer : { public: /// Constructor - Client_ORBInitializer (void); + Client_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Bug_1495_Regression/Client_Task.cpp b/TAO/tests/Bug_1495_Regression/Client_Task.cpp index 93bda38044a..c414a163b65 100644 --- a/TAO/tests/Bug_1495_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_1495_Regression/Client_Task.cpp @@ -22,7 +22,7 @@ Client_Task::Client_Task (const ACE_TCHAR *input, int -Client_Task::svc (void) +Client_Task::svc () { try { diff --git a/TAO/tests/Bug_1495_Regression/Client_Task.h b/TAO/tests/Bug_1495_Regression/Client_Task.h index cb903f47ab4..4bc3ee6cb10 100644 --- a/TAO/tests/Bug_1495_Regression/Client_Task.h +++ b/TAO/tests/Bug_1495_Regression/Client_Task.h @@ -28,7 +28,7 @@ class Client_Task : public ACE_Task_Base ACE_Thread_Manager *thr_mgr); /// Thread entry point. - int svc (void); + int svc (); private: /// File to read in the remote IOR. diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp index fa95c4361e6..7099617cadd 100644 --- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp +++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.cpp @@ -3,7 +3,7 @@ #include "Server_ORBInitializer.h" #include "server_interceptor.h" -Server_ORBInitializer::Server_ORBInitializer (void) +Server_ORBInitializer::Server_ORBInitializer () { } @@ -30,7 +30,7 @@ Server_ORBInitializer::post_init ( } Echo_Server_Request_Interceptor * -Server_ORBInitializer::server_interceptor (void) +Server_ORBInitializer::server_interceptor () { return this->server_interceptor_; } diff --git a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h index 2272771c5de..7fac80332ca 100644 --- a/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h +++ b/TAO/tests/Bug_1495_Regression/Server_ORBInitializer.h @@ -28,7 +28,7 @@ class Server_ORBInitializer : { public: /// Constructor - Server_ORBInitializer (void); + Server_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); @@ -36,7 +36,7 @@ public: /// Return the created server request interceptor. Only valid after /// post_init(), i.e. ORB_init(), has been called. - Echo_Server_Request_Interceptor * server_interceptor (void); + Echo_Server_Request_Interceptor * server_interceptor (); private: /// Pointer to the server request interceptor. ORB is responsible diff --git a/TAO/tests/Bug_1495_Regression/Server_Task.cpp b/TAO/tests/Bug_1495_Regression/Server_Task.cpp index 0d526c9fe4a..65421ea9e3a 100644 --- a/TAO/tests/Bug_1495_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1495_Regression/Server_Task.cpp @@ -26,7 +26,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output, int -Server_Task::svc (void) +Server_Task::svc () { try { diff --git a/TAO/tests/Bug_1495_Regression/Server_Task.h b/TAO/tests/Bug_1495_Regression/Server_Task.h index 86383eaae2b..cefabdbc8dc 100644 --- a/TAO/tests/Bug_1495_Regression/Server_Task.h +++ b/TAO/tests/Bug_1495_Regression/Server_Task.h @@ -29,7 +29,7 @@ class Server_Task : public ACE_Task_Base ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Output file for the server IOR diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp index 4bc7c2cbc34..333ac2cc665 100644 --- a/TAO/tests/Bug_1495_Regression/client_interceptor.cpp +++ b/TAO/tests/Bug_1495_Regression/client_interceptor.cpp @@ -12,18 +12,18 @@ Echo_Client_Request_Interceptor (const char *id) { } -Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) +Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () { } char * -Echo_Client_Request_Interceptor::name (void) +Echo_Client_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (void) +Echo_Client_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Bug_1495_Regression/client_interceptor.h b/TAO/tests/Bug_1495_Regression/client_interceptor.h index 2c4921837d5..ca95623f402 100644 --- a/TAO/tests/Bug_1495_Regression/client_interceptor.h +++ b/TAO/tests/Bug_1495_Regression/client_interceptor.h @@ -28,10 +28,10 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp index 5eacad5a411..781480882a7 100644 --- a/TAO/tests/Bug_1495_Regression/server_interceptor.cpp +++ b/TAO/tests/Bug_1495_Regression/server_interceptor.cpp @@ -5,7 +5,7 @@ #include "ace/OS_NS_string.h" #include "ace/Thread.h" -Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) +Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor () : myname_ ("Echo_Server_Interceptor") { } @@ -17,7 +17,7 @@ Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (CORBA::Object_ { } -Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) +Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () { } @@ -34,13 +34,13 @@ Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo } char * -Echo_Server_Request_Interceptor::name (void) +Echo_Server_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (void) +Echo_Server_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Bug_1495_Regression/server_interceptor.h b/TAO/tests/Bug_1495_Regression/server_interceptor.h index 3073b9069b0..3338dd0fdbb 100644 --- a/TAO/tests/Bug_1495_Regression/server_interceptor.h +++ b/TAO/tests/Bug_1495_Regression/server_interceptor.h @@ -22,7 +22,7 @@ class Echo_Server_Request_Interceptor { // = Server-side echo interceptor. For checking interceptor visually only. public: - Echo_Server_Request_Interceptor (void); + Echo_Server_Request_Interceptor (); // cotr. Echo_Server_Request_Interceptor (CORBA::Object_ptr forward_location); @@ -32,10 +32,10 @@ public: void forward_reference (CORBA::Object_ptr forward_location); - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); diff --git a/TAO/tests/Bug_1495_Regression/test_i.cpp b/TAO/tests/Bug_1495_Regression/test_i.cpp index ad7ed5cb1e1..a40b83d58c1 100644 --- a/TAO/tests/Bug_1495_Regression/test_i.cpp +++ b/TAO/tests/Bug_1495_Regression/test_i.cpp @@ -14,7 +14,7 @@ Bug1495_i::Bug1495_i (CORBA::ORB_ptr orb) { } -Bug1495_i::~Bug1495_i (void) +Bug1495_i::~Bug1495_i () { } @@ -27,7 +27,7 @@ Bug1495_i::get_thread_id (Bug1495_Regression::ThreadId_out thread_id) } void -Bug1495_i::shutdown (void) +Bug1495_i::shutdown () { ACE_DEBUG ((LM_INFO, "Shutting down orb %Q\n", diff --git a/TAO/tests/Bug_1495_Regression/test_i.h b/TAO/tests/Bug_1495_Regression/test_i.h index f9a97ecee65..81f28c596a9 100644 --- a/TAO/tests/Bug_1495_Regression/test_i.h +++ b/TAO/tests/Bug_1495_Regression/test_i.h @@ -40,11 +40,11 @@ public: Bug1495_i (CORBA::ORB_ptr orb); //Destructor - virtual ~Bug1495_i (void); + virtual ~Bug1495_i (); virtual void get_thread_id (Bug1495_Regression::ThreadId_out thread_id); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; }; diff --git a/TAO/tests/Bug_1535_Regression/Test.cpp b/TAO/tests/Bug_1535_Regression/Test.cpp index c99cfe0aaec..6b55ca475d1 100644 --- a/TAO/tests/Bug_1535_Regression/Test.cpp +++ b/TAO/tests/Bug_1535_Regression/Test.cpp @@ -6,12 +6,12 @@ Hello::Hello (PortableServer::POA_ptr poa) : } void -Hello::print_hello_world (void) +Hello::print_hello_world () { } PortableServer::POA_ptr -Hello::_default_POA (void) +Hello::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/tests/Bug_1535_Regression/Test.h b/TAO/tests/Bug_1535_Regression/Test.h index 9e987171955..a0d9d7e2b2b 100644 --- a/TAO/tests/Bug_1535_Regression/Test.h +++ b/TAO/tests/Bug_1535_Regression/Test.h @@ -13,9 +13,9 @@ public: Hello (PortableServer::POA_ptr poa); // = The skeleton methods - virtual void print_hello_world (void); + virtual void print_hello_world (); - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); private: PortableServer::POA_var poa_; diff --git a/TAO/tests/Bug_1551_Regression/Client_Task.cpp b/TAO/tests/Bug_1551_Regression/Client_Task.cpp index 3c2f6013b86..245b9f0ecfb 100644 --- a/TAO/tests/Bug_1551_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_1551_Regression/Client_Task.cpp @@ -11,12 +11,12 @@ Client_Task::Client_Task (Test::Hello_ptr receiver, { } -Client_Task::~Client_Task (void) +Client_Task::~Client_Task () { } int -Client_Task::svc (void) +Client_Task::svc () { // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); diff --git a/TAO/tests/Bug_1551_Regression/Client_Task.h b/TAO/tests/Bug_1551_Regression/Client_Task.h index 4a942cc92b9..337d870aed1 100644 --- a/TAO/tests/Bug_1551_Regression/Client_Task.h +++ b/TAO/tests/Bug_1551_Regression/Client_Task.h @@ -17,10 +17,10 @@ public: CORBA::ORB_ptr o, ACE_Thread_Manager *thr_mgr); - ~Client_Task (void); + ~Client_Task (); /// Thread entry point - int svc (void); + int svc (); private: /// Reference to the test interface diff --git a/TAO/tests/Bug_1551_Regression/Hello.cpp b/TAO/tests/Bug_1551_Regression/Hello.cpp index 2885a6c62ff..4ffc42f9f65 100644 --- a/TAO/tests/Bug_1551_Regression/Hello.cpp +++ b/TAO/tests/Bug_1551_Regression/Hello.cpp @@ -11,7 +11,7 @@ Hello::Hello( } void -Hello::short_sleep (void) +Hello::short_sleep () { long count = atomic_counter_--; diff --git a/TAO/tests/Bug_1551_Regression/Hello.h b/TAO/tests/Bug_1551_Regression/Hello.h index 20e535f3c6d..1e6d6718e61 100644 --- a/TAO/tests/Bug_1551_Regression/Hello.h +++ b/TAO/tests/Bug_1551_Regression/Hello.h @@ -13,7 +13,7 @@ public: /// Constructor Hello(CORBA::ORB_ptr orb, bool simulate_crashes); - virtual void short_sleep (void); + virtual void short_sleep (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp index 5da7ffbe20b..0bb1faffc82 100644 --- a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp +++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp @@ -9,7 +9,7 @@ Reply_Handler::Reply_Handler ( } void -Reply_Handler::short_sleep (void) +Reply_Handler::short_sleep () { check_counter(); @@ -54,7 +54,7 @@ Reply_Handler::short_sleep_excep ( } void Reply_Handler:: -check_counter(void) +check_counter() { long const count = --counter_; if(count == 0) diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.h b/TAO/tests/Bug_1551_Regression/Reply_Handler.h index 9b27bd8f04e..f71041cbf9b 100644 --- a/TAO/tests/Bug_1551_Regression/Reply_Handler.h +++ b/TAO/tests/Bug_1551_Regression/Reply_Handler.h @@ -14,12 +14,12 @@ public: Test::Hello_ptr hello, CORBA::ORB_ptr orb); - void short_sleep (void); + void short_sleep (); void short_sleep_excep (::Messaging::ExceptionHolder * excep_holder); private: - void check_counter(void); + void check_counter(); private: ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> counter_; diff --git a/TAO/tests/Bug_1551_Regression/Server_Task.cpp b/TAO/tests/Bug_1551_Regression/Server_Task.cpp index 75038ceb12a..b98d1fe56ca 100644 --- a/TAO/tests/Bug_1551_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_1551_Regression/Server_Task.cpp @@ -8,7 +8,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb, } int -Server_Task::svc (void) +Server_Task::svc () { // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n")); try diff --git a/TAO/tests/Bug_1551_Regression/Server_Task.h b/TAO/tests/Bug_1551_Regression/Server_Task.h index a35c3689b07..e0ae5464042 100644 --- a/TAO/tests/Bug_1551_Regression/Server_Task.h +++ b/TAO/tests/Bug_1551_Regression/Server_Task.h @@ -12,7 +12,7 @@ public: Server_Task (CORBA::ORB_ptr orb, ACE_Thread_Manager *thr_mgr); - int svc (void); + int svc (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_1627_Regression/Test_i.cpp b/TAO/tests/Bug_1627_Regression/Test_i.cpp index ef59e84556d..6a328d65bac 100644 --- a/TAO/tests/Bug_1627_Regression/Test_i.cpp +++ b/TAO/tests/Bug_1627_Regression/Test_i.cpp @@ -11,7 +11,7 @@ Test_i::~Test_i() } void -Test_i::test_method (void) +Test_i::test_method () { // Noop } diff --git a/TAO/tests/Bug_1627_Regression/Test_i.h b/TAO/tests/Bug_1627_Regression/Test_i.h index 80649bd8994..385f5730315 100644 --- a/TAO/tests/Bug_1627_Regression/Test_i.h +++ b/TAO/tests/Bug_1627_Regression/Test_i.h @@ -9,13 +9,13 @@ class Test_i: public POA_Test { public: /// Constructor - Test_i (void); + Test_i (); /// Destructor - ~Test_i (void); + ~Test_i (); /// A method - void test_method(void); + void test_method(); }; #endif /* ! BUG_1330_REGRESSION_TEST_I_H */ diff --git a/TAO/tests/Bug_1676_Regression/Hello.cpp b/TAO/tests/Bug_1676_Regression/Hello.cpp index 04cf5fc9b90..922415c6766 100644 --- a/TAO/tests/Bug_1676_Regression/Hello.cpp +++ b/TAO/tests/Bug_1676_Regression/Hello.cpp @@ -7,7 +7,7 @@ Hello::Hello (CORBA::ORB_ptr orb) #if 0 char * -Hello::get_string (void) +Hello::get_string () { return CORBA::string_dup ("Hello there!"); } @@ -69,7 +69,7 @@ Hello::mod_stringList (::Test::StringList & iosl) } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_1676_Regression/Hello.h b/TAO/tests/Bug_1676_Regression/Hello.h index 53449753f89..1c305d970a6 100644 --- a/TAO/tests/Bug_1676_Regression/Hello.h +++ b/TAO/tests/Bug_1676_Regression/Hello.h @@ -20,7 +20,7 @@ public: virtual void mod_stringList (::Test::StringList & iosl); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.cpp b/TAO/tests/Bug_2084_Regression/Client_Task.cpp index 19d263e57b2..498f02b387a 100644 --- a/TAO/tests/Bug_2084_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_2084_Regression/Client_Task.cpp @@ -16,7 +16,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { try { diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.h b/TAO/tests/Bug_2084_Regression/Client_Task.h index b6ea6957134..15511cd7a02 100644 --- a/TAO/tests/Bug_2084_Regression/Client_Task.h +++ b/TAO/tests/Bug_2084_Regression/Client_Task.h @@ -20,7 +20,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: const ACE_TCHAR *input_; diff --git a/TAO/tests/Bug_2084_Regression/EventNode.cpp b/TAO/tests/Bug_2084_Regression/EventNode.cpp index cc6680548c3..f2eeb79b35f 100644 --- a/TAO/tests/Bug_2084_Regression/EventNode.cpp +++ b/TAO/tests/Bug_2084_Regression/EventNode.cpp @@ -52,7 +52,7 @@ void EventNode::registerHello ( ::Test::Hello_ptr h ) } void -EventNode::shutdown (void) +EventNode::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2084_Regression/EventNode.h b/TAO/tests/Bug_2084_Regression/EventNode.h index 768200dd39e..af70fd55ddc 100644 --- a/TAO/tests/Bug_2084_Regression/EventNode.h +++ b/TAO/tests/Bug_2084_Regression/EventNode.h @@ -20,7 +20,7 @@ public: // = The skeleton methods virtual void registerHello ( ::Test::Hello_ptr h); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Bug_2084_Regression/Hello.cpp b/TAO/tests/Bug_2084_Regression/Hello.cpp index 654d838d4d4..8c20571d7dc 100644 --- a/TAO/tests/Bug_2084_Regression/Hello.cpp +++ b/TAO/tests/Bug_2084_Regression/Hello.cpp @@ -52,7 +52,7 @@ Hello::get_string (::Test::ThreadId caller_threadid) } 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/tests/Bug_2084_Regression/Hello.h b/TAO/tests/Bug_2084_Regression/Hello.h index f7d4bc3b661..65fba82d8f0 100644 --- a/TAO/tests/Bug_2084_Regression/Hello.h +++ b/TAO/tests/Bug_2084_Regression/Hello.h @@ -20,7 +20,7 @@ public: // = The skeleton methods virtual char * get_string ( ::Test::ThreadId caller_threadid); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Bug_2084_Regression/Server_Task.cpp b/TAO/tests/Bug_2084_Regression/Server_Task.cpp index 714d91a81e1..37ef71e01a6 100644 --- a/TAO/tests/Bug_2084_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_2084_Regression/Server_Task.cpp @@ -17,7 +17,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output, } int -Server_Task::svc (void) +Server_Task::svc () { try { diff --git a/TAO/tests/Bug_2084_Regression/Server_Task.h b/TAO/tests/Bug_2084_Regression/Server_Task.h index cea47faeb95..9f6a4ffa912 100644 --- a/TAO/tests/Bug_2084_Regression/Server_Task.h +++ b/TAO/tests/Bug_2084_Regression/Server_Task.h @@ -27,7 +27,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Output file for IOR diff --git a/TAO/tests/Bug_2174_Regression/test_i.cpp b/TAO/tests/Bug_2174_Regression/test_i.cpp index 63840f67d39..09cf9b1346c 100644 --- a/TAO/tests/Bug_2174_Regression/test_i.cpp +++ b/TAO/tests/Bug_2174_Regression/test_i.cpp @@ -20,7 +20,7 @@ Simple_Server_i::echo (CORBA::Long x, } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "server (%P) Received shutdown request from client\n")); diff --git a/TAO/tests/Bug_2174_Regression/test_i.h b/TAO/tests/Bug_2174_Regression/test_i.h index 32129102136..a175271fcd8 100644 --- a/TAO/tests/Bug_2174_Regression/test_i.h +++ b/TAO/tests/Bug_2174_Regression/test_i.h @@ -29,7 +29,7 @@ public: // = The Simple_Server methods. CORBA::Long echo (CORBA::Long x, CORBA::Long msecs); - void shutdown (void); + void shutdown (); private: /// The ORB diff --git a/TAO/tests/Bug_2183_Regression/Hello.cpp b/TAO/tests/Bug_2183_Regression/Hello.cpp index 0d000b9f195..bdfcac050fb 100644 --- a/TAO/tests/Bug_2183_Regression/Hello.cpp +++ b/TAO/tests/Bug_2183_Regression/Hello.cpp @@ -6,13 +6,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/tests/Bug_2183_Regression/Hello.h b/TAO/tests/Bug_2183_Regression/Hello.h index 9806cdd133d..f5d4054e05f 100644 --- a/TAO/tests/Bug_2183_Regression/Hello.h +++ b/TAO/tests/Bug_2183_Regression/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/tests/Bug_2186_Regression/Hello.cpp b/TAO/tests/Bug_2186_Regression/Hello.cpp index 6cf8290cbb1..2bf8ddb2538 100644 --- a/TAO/tests/Bug_2186_Regression/Hello.cpp +++ b/TAO/tests/Bug_2186_Regression/Hello.cpp @@ -6,14 +6,14 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (void) +Hello::get_string () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Received call back !!!\n")); return CORBA::string_dup ("Hello there!"); } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2186_Regression/Hello.h b/TAO/tests/Bug_2186_Regression/Hello.h index 46d192e5166..c53a05c1616 100644 --- a/TAO/tests/Bug_2186_Regression/Hello.h +++ b/TAO/tests/Bug_2186_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 (); virtual void request_callback (Test::Hello_ptr call_me); diff --git a/TAO/tests/Bug_2188_Regression/broken_i.cpp b/TAO/tests/Bug_2188_Regression/broken_i.cpp index f3b4230cd4c..4c5bd4ec6b6 100644 --- a/TAO/tests/Bug_2188_Regression/broken_i.cpp +++ b/TAO/tests/Bug_2188_Regression/broken_i.cpp @@ -33,18 +33,18 @@ ServerAdmin_i::ServerAdmin_i (ArrayTest_ptr target) { } -ServerAdmin_i::~ServerAdmin_i (void) +ServerAdmin_i::~ServerAdmin_i () { } ArrayTest_ptr -ServerAdmin_i::target(void) +ServerAdmin_i::target() { return ArrayTest::_duplicate(target_.in()); } void -ServerAdmin_i::shutdown (void) +ServerAdmin_i::shutdown () { int argc = 0; char ** argv = 0; @@ -53,7 +53,7 @@ ServerAdmin_i::shutdown (void) } // Implementation skeleton constructor -ArrayTest_i::ArrayTest_i (void) +ArrayTest_i::ArrayTest_i () :longArray_ (LongArray_alloc()), ulongArray_ (ULongArray_alloc()), stringArray_ (StringArray_alloc()), @@ -72,7 +72,7 @@ ArrayTest_i::ArrayTest_i (void) } // Implementation skeleton destructor -ArrayTest_i::~ArrayTest_i (void) +ArrayTest_i::~ArrayTest_i () { LongArray_free (longArray_); ULongArray_free (ulongArray_); diff --git a/TAO/tests/Bug_2188_Regression/broken_i.h b/TAO/tests/Bug_2188_Regression/broken_i.h index 4ecaf93f43d..aec85dd444e 100644 --- a/TAO/tests/Bug_2188_Regression/broken_i.h +++ b/TAO/tests/Bug_2188_Regression/broken_i.h @@ -38,10 +38,10 @@ class ServerAdmin_i : public virtual POA_ServerAdmin { public: ServerAdmin_i (ArrayTest_ptr target); - virtual ~ServerAdmin_i (void); - ArrayTest_ptr target(void); + virtual ~ServerAdmin_i (); + ArrayTest_ptr target(); - void shutdown (void); + void shutdown (); private: ArrayTest_var target_; }; @@ -67,10 +67,10 @@ private: CORBA::Char char_; public: //Constructor - ArrayTest_i (void); + ArrayTest_i (); //Destructor - virtual ~ArrayTest_i (void); + virtual ~ArrayTest_i (); virtual ::LongArray_slice * longArrayOp ( diff --git a/TAO/tests/Bug_2241_Regression/Client_Task.cpp b/TAO/tests/Bug_2241_Regression/Client_Task.cpp index 511b3d75bac..f0a1d3f3180 100644 --- a/TAO/tests/Bug_2241_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_2241_Regression/Client_Task.cpp @@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { CORBA::Boolean exception = false; try diff --git a/TAO/tests/Bug_2241_Regression/Client_Task.h b/TAO/tests/Bug_2241_Regression/Client_Task.h index b6ea6957134..15511cd7a02 100644 --- a/TAO/tests/Bug_2241_Regression/Client_Task.h +++ b/TAO/tests/Bug_2241_Regression/Client_Task.h @@ -20,7 +20,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: const ACE_TCHAR *input_; diff --git a/TAO/tests/Bug_2241_Regression/Hello.cpp b/TAO/tests/Bug_2241_Regression/Hello.cpp index 69ad5eda998..1c70ca33855 100644 --- a/TAO/tests/Bug_2241_Regression/Hello.cpp +++ b/TAO/tests/Bug_2241_Regression/Hello.cpp @@ -11,7 +11,7 @@ } char * -Hello::get_string (void) +Hello::get_string () { ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR: Unexpected Upcall in process ..\n")); @@ -20,7 +20,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/tests/Bug_2241_Regression/Hello.h b/TAO/tests/Bug_2241_Regression/Hello.h index 043a6968853..e9c0f470f49 100644 --- a/TAO/tests/Bug_2241_Regression/Hello.h +++ b/TAO/tests/Bug_2241_Regression/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/tests/Bug_2241_Regression/Server_Task.cpp b/TAO/tests/Bug_2241_Regression/Server_Task.cpp index 7a26f5fcf0c..0a0d94fee37 100644 --- a/TAO/tests/Bug_2241_Regression/Server_Task.cpp +++ b/TAO/tests/Bug_2241_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/tests/Bug_2241_Regression/Server_Task.h b/TAO/tests/Bug_2241_Regression/Server_Task.h index cea47faeb95..9f6a4ffa912 100644 --- a/TAO/tests/Bug_2241_Regression/Server_Task.h +++ b/TAO/tests/Bug_2241_Regression/Server_Task.h @@ -27,7 +27,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Output file for IOR diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp index ce6a65d029a..fedb6b515bf 100644 --- a/TAO/tests/Bug_2319_Regression/server.cpp +++ b/TAO/tests/Bug_2319_Regression/server.cpp @@ -43,7 +43,7 @@ protected: class ST_AMH_Server { public: - ST_AMH_Server (void); + ST_AMH_Server (); virtual ~ST_AMH_Server (); /// ORB inititalisation stuff @@ -123,7 +123,7 @@ ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr, // ------------------------------------------------------------------------ // -ST_AMH_Server::ST_AMH_Server (void) +ST_AMH_Server::ST_AMH_Server () { } diff --git a/TAO/tests/Bug_2328_Regression/Hello.cpp b/TAO/tests/Bug_2328_Regression/Hello.cpp index fbe2727b368..5e12c81c450 100644 --- a/TAO/tests/Bug_2328_Regression/Hello.cpp +++ b/TAO/tests/Bug_2328_Regression/Hello.cpp @@ -13,7 +13,7 @@ Hello::get_string (const char * A, const char * B, const char * C) } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2328_Regression/Hello.h b/TAO/tests/Bug_2328_Regression/Hello.h index 14f9189feb0..6d6ec0fc1ef 100644 --- a/TAO/tests/Bug_2328_Regression/Hello.h +++ b/TAO/tests/Bug_2328_Regression/Hello.h @@ -16,7 +16,7 @@ public: // = The skeleton methods virtual char * get_string (const char * A, const char * B, const char * C); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Bug_2356_Regression/ami_test_i.cpp b/TAO/tests/Bug_2356_Regression/ami_test_i.cpp index 73cea2da610..364d105983d 100644 --- a/TAO/tests/Bug_2356_Regression/ami_test_i.cpp +++ b/TAO/tests/Bug_2356_Regression/ami_test_i.cpp @@ -36,7 +36,7 @@ AMI_Test_i::foo (CORBA::Long value) } void -AMI_Test_i::shutdown (void) +AMI_Test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2356_Regression/ami_test_i.h b/TAO/tests/Bug_2356_Regression/ami_test_i.h index 1df67e21f06..8b94350193b 100644 --- a/TAO/tests/Bug_2356_Regression/ami_test_i.h +++ b/TAO/tests/Bug_2356_Regression/ami_test_i.h @@ -29,7 +29,7 @@ public: // The AMI_Test methods. void foo (CORBA::Long value); - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_2356_Regression/client.cpp b/TAO/tests/Bug_2356_Regression/client.cpp index f89bb7b3545..d7531e925e7 100644 --- a/TAO/tests/Bug_2356_Regression/client.cpp +++ b/TAO/tests/Bug_2356_Regression/client.cpp @@ -59,7 +59,7 @@ public: /// Destructor. ~Handler (void) {}; - void foo (void) + void foo () { }; diff --git a/TAO/tests/Bug_2417_Regression/client.cpp b/TAO/tests/Bug_2417_Regression/client.cpp index afa4ffda9d5..c20afbb4460 100644 --- a/TAO/tests/Bug_2417_Regression/client.cpp +++ b/TAO/tests/Bug_2417_Regression/client.cpp @@ -104,7 +104,7 @@ ThreadPool::ThreadPool(CORBA::ORB_ptr orb) { } -int ThreadPool::svc (void) +int ThreadPool::svc () { try { diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp index b7d1239cf03..19e887398db 100644 --- a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp +++ b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp @@ -50,7 +50,7 @@ void Publisher_impl::Worker::addSubscriber(Subscriber_ptr subscriber) s.count = 0; } -int Publisher_impl::Worker::svc (void) +int Publisher_impl::Worker::svc () { double data = 0.0; bool doShutdown = false; diff --git a/TAO/tests/Bug_2417_Regression/server.cpp b/TAO/tests/Bug_2417_Regression/server.cpp index 246554ac593..a0f37b7afa2 100644 --- a/TAO/tests/Bug_2417_Regression/server.cpp +++ b/TAO/tests/Bug_2417_Regression/server.cpp @@ -122,7 +122,7 @@ ThreadPool::ThreadPool(CORBA::ORB_ptr orb) { } -int ThreadPool::svc (void) +int ThreadPool::svc () { try { diff --git a/TAO/tests/Bug_2429_Regression/client.cpp b/TAO/tests/Bug_2429_Regression/client.cpp index bdce1f67b07..c9c57ac2e8b 100644 --- a/TAO/tests/Bug_2429_Regression/client.cpp +++ b/TAO/tests/Bug_2429_Regression/client.cpp @@ -13,7 +13,7 @@ class Reply_Handler } virtual void - childMethod (void) + childMethod () { } @@ -32,7 +32,7 @@ class Reply_Handler } virtual void - parentMethod (void) + parentMethod () { ACE_DEBUG ((LM_DEBUG, "client: parentMethod reply %d @ %T\n", diff --git a/TAO/tests/Bug_2494_Regression/server.cpp b/TAO/tests/Bug_2494_Regression/server.cpp index 710fdc31597..95e93bbebc2 100644 --- a/TAO/tests/Bug_2494_Regression/server.cpp +++ b/TAO/tests/Bug_2494_Regression/server.cpp @@ -143,7 +143,7 @@ Worker::Worker (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { try { diff --git a/TAO/tests/Bug_2503_Regression/test_i.cpp b/TAO/tests/Bug_2503_Regression/test_i.cpp index c95290efda2..93e443fc1f7 100644 --- a/TAO/tests/Bug_2503_Regression/test_i.cpp +++ b/TAO/tests/Bug_2503_Regression/test_i.cpp @@ -36,7 +36,7 @@ create_and_activate_server() } void -test_i::shutdown (void) +test_i::shutdown () { if (!CORBA::is_nil (this->orb_.in ())) this->orb_->shutdown (false); diff --git a/TAO/tests/Bug_2503_Regression/test_i.h b/TAO/tests/Bug_2503_Regression/test_i.h index d4d4131ed76..5750eec636c 100644 --- a/TAO/tests/Bug_2503_Regression/test_i.h +++ b/TAO/tests/Bug_2503_Regression/test_i.h @@ -11,9 +11,9 @@ public: virtual void the_operation(CORBA::Long & x); - virtual void shutdown (void); + virtual void shutdown (); - char * create_and_activate_server(void); + char * create_and_activate_server(); private: CORBA::ORB_var orb_; }; diff --git a/TAO/tests/Bug_2593_Regression/Hello.cpp b/TAO/tests/Bug_2593_Regression/Hello.cpp index 0d000b9f195..bdfcac050fb 100644 --- a/TAO/tests/Bug_2593_Regression/Hello.cpp +++ b/TAO/tests/Bug_2593_Regression/Hello.cpp @@ -6,13 +6,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/tests/Bug_2593_Regression/Hello.h b/TAO/tests/Bug_2593_Regression/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/Bug_2593_Regression/Hello.h +++ b/TAO/tests/Bug_2593_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/tests/Bug_2595_Regression/Hello.cpp b/TAO/tests/Bug_2595_Regression/Hello.cpp index b37ab6fb634..a3c0d15f54d 100644 --- a/TAO/tests/Bug_2595_Regression/Hello.cpp +++ b/TAO/tests/Bug_2595_Regression/Hello.cpp @@ -17,7 +17,7 @@ Hello::op ( } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2595_Regression/Hello.h b/TAO/tests/Bug_2595_Regression/Hello.h index 4274d994541..bda9c7d4f53 100644 --- a/TAO/tests/Bug_2595_Regression/Hello.h +++ b/TAO/tests/Bug_2595_Regression/Hello.h @@ -17,7 +17,7 @@ public: ::Test::Fls_out fstruct, ::Test::Vls_out vstruct); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Bug_2654_Regression/client.cpp b/TAO/tests/Bug_2654_Regression/client.cpp index 22b5f692ac5..f4cefb31674 100644 --- a/TAO/tests/Bug_2654_Regression/client.cpp +++ b/TAO/tests/Bug_2654_Regression/client.cpp @@ -23,7 +23,7 @@ const ACE_TCHAR *ior = ACE_TEXT("file://test.ior"); class Callback_i : public POA_Test::CallBack { public: - void method2(void) + void method2() { ACE_DEBUG ((LM_DEBUG,"(%t) Callback_i::method2 called\n")); } @@ -43,12 +43,12 @@ private: int busy_threads_; CORBA::Short message_counter_; - int run_test (void); + int run_test (); public: Worker( int ot); ~Worker(); - int svc (void); + int svc (); }; Worker::Worker(int ot) diff --git a/TAO/tests/Bug_2677_Regression/DllORB.cpp b/TAO/tests/Bug_2677_Regression/DllORB.cpp index 2df14afddd0..ab2b7bb796e 100644 --- a/TAO/tests/Bug_2677_Regression/DllORB.cpp +++ b/TAO/tests/Bug_2677_Regression/DllORB.cpp @@ -4,14 +4,14 @@ #include "ace/OS_NS_unistd.h" #include "tao/TAO_Singleton_Manager.h" -DllORB::DllORB (void) +DllORB::DllORB () : failPrePostInit_ (3), mv_orb_ (), mv_rootPOA_ () { } -DllORB::~DllORB (void) +DllORB::~DllORB () { } @@ -103,7 +103,7 @@ DllORB::init (int argc, ACE_TCHAR *argv[]) int -DllORB::fini (void) +DllORB::fini () { try { diff --git a/TAO/tests/Bug_2677_Regression/DllORB.h b/TAO/tests/Bug_2677_Regression/DllORB.h index fc561ccfdd4..93ba2a11f46 100644 --- a/TAO/tests/Bug_2677_Regression/DllORB.h +++ b/TAO/tests/Bug_2677_Regression/DllORB.h @@ -9,8 +9,8 @@ class bug_2677_regression_Export DllORB: public ACE_Service_Object { public: - DllORB (void); - virtual ~DllORB (void); + DllORB (); + virtual ~DllORB (); CORBA::ORB_ptr orb () const; diff --git a/TAO/tests/Bug_2678_Regression/server.cpp b/TAO/tests/Bug_2678_Regression/server.cpp index da4ec179b1e..f1b3a445bd8 100644 --- a/TAO/tests/Bug_2678_Regression/server.cpp +++ b/TAO/tests/Bug_2678_Regression/server.cpp @@ -9,7 +9,7 @@ public: virtual AnySeq *RunTest(const AnySeq ¶ms); //FUZZ: disable check_for_lack_ACE_OS - virtual void shutdown (void); + virtual void shutdown (); //FUZZ: enable check_for_lack_ACE_OS private: CORBA::ORB_var orb_; @@ -20,7 +20,7 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) } void -Test_impl::shutdown(void) +Test_impl::shutdown() { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2683_Regression/client.cpp b/TAO/tests/Bug_2683_Regression/client.cpp index cdba93ea310..b2204a920f1 100644 --- a/TAO/tests/Bug_2683_Regression/client.cpp +++ b/TAO/tests/Bug_2683_Regression/client.cpp @@ -20,7 +20,7 @@ public: { } - int svc (void) + int svc () { bool keep_going = true; while (keep_going && !this->stop_) diff --git a/TAO/tests/Bug_2683_Regression/server.cpp b/TAO/tests/Bug_2683_Regression/server.cpp index 8115009818b..5b508e5c809 100644 --- a/TAO/tests/Bug_2683_Regression/server.cpp +++ b/TAO/tests/Bug_2683_Regression/server.cpp @@ -45,7 +45,7 @@ public: { } - int svc (void) + int svc () { try { diff --git a/TAO/tests/Bug_2683_Regression/test_i.cpp b/TAO/tests/Bug_2683_Regression/test_i.cpp index cd37313afd3..11c4d65deeb 100644 --- a/TAO/tests/Bug_2683_Regression/test_i.cpp +++ b/TAO/tests/Bug_2683_Regression/test_i.cpp @@ -7,12 +7,12 @@ test_i::test_i (ORB_Killer *k) } void -test_i::ping (void) +test_i::ping () { } void -test_i::shutdown (void) +test_i::shutdown () { ACE_DEBUG ((LM_DEBUG,"(%P|%t) requesting shutdown\n")); this->killer_->activate (); diff --git a/TAO/tests/Bug_2683_Regression/test_i.h b/TAO/tests/Bug_2683_Regression/test_i.h index 61ceecfc642..8809d548b0d 100644 --- a/TAO/tests/Bug_2683_Regression/test_i.h +++ b/TAO/tests/Bug_2683_Regression/test_i.h @@ -26,9 +26,9 @@ public: test_i (ORB_Killer *k); // = The skeleton methods - virtual void ping (void); + virtual void ping (); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Bug_2734_Regression/test_i.cpp b/TAO/tests/Bug_2734_Regression/test_i.cpp index d615af9689d..a240a7d9e6c 100644 --- a/TAO/tests/Bug_2734_Regression/test_i.cpp +++ b/TAO/tests/Bug_2734_Regression/test_i.cpp @@ -33,7 +33,7 @@ Simple_Server_i::echo (CORBA::Long x, } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "server (%P) Received shutdown request from client\n")); diff --git a/TAO/tests/Bug_2734_Regression/test_i.h b/TAO/tests/Bug_2734_Regression/test_i.h index 32129102136..a175271fcd8 100644 --- a/TAO/tests/Bug_2734_Regression/test_i.h +++ b/TAO/tests/Bug_2734_Regression/test_i.h @@ -29,7 +29,7 @@ public: // = The Simple_Server methods. CORBA::Long echo (CORBA::Long x, CORBA::Long msecs); - void shutdown (void); + void shutdown (); private: /// The ORB diff --git a/TAO/tests/Bug_2768_Regression/Messenger_i.cpp b/TAO/tests/Bug_2768_Regression/Messenger_i.cpp index c8370491fd3..11fd77533fc 100644 --- a/TAO/tests/Bug_2768_Regression/Messenger_i.cpp +++ b/TAO/tests/Bug_2768_Regression/Messenger_i.cpp @@ -5,7 +5,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) { } -void Messenger_i::send (void) +void Messenger_i::send () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2768_Regression/Messenger_i.h b/TAO/tests/Bug_2768_Regression/Messenger_i.h index de582704c66..221ba2054d7 100644 --- a/TAO/tests/Bug_2768_Regression/Messenger_i.h +++ b/TAO/tests/Bug_2768_Regression/Messenger_i.h @@ -7,7 +7,7 @@ class Messenger_i : public POA_SimpleMessenger::Messenger { public: Messenger_i (CORBA::ORB_ptr orb); - virtual void send (void); + virtual void send (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Bug_2791_Regression/Message_i.cpp b/TAO/tests/Bug_2791_Regression/Message_i.cpp index 2a1af32e41a..3362d2b30e3 100644 --- a/TAO/tests/Bug_2791_Regression/Message_i.cpp +++ b/TAO/tests/Bug_2791_Regression/Message_i.cpp @@ -12,7 +12,7 @@ MessageImpl::MessageImpl (const char *user, const char *subject, const char *tex } ::CORBA::ValueBase * -MessageImpl::_copy_value (void) +MessageImpl::_copy_value () { ::CORBA::ValueBase *ret_val= 0; ACE_NEW_THROW_EX ( diff --git a/TAO/tests/Bug_2791_Regression/Message_i.h b/TAO/tests/Bug_2791_Regression/Message_i.h index ecf5ed5958b..055640bd849 100644 --- a/TAO/tests/Bug_2791_Regression/Message_i.h +++ b/TAO/tests/Bug_2791_Regression/Message_i.h @@ -7,7 +7,7 @@ class MessageImpl : public virtual OBV_Message, public: MessageImpl (); MessageImpl (const char *user, const char *subject, const char *text); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); virtual char *user (); virtual void user (const char *); diff --git a/TAO/tests/Bug_2804_Regression/Hello.cpp b/TAO/tests/Bug_2804_Regression/Hello.cpp index b1013a6061c..82d4b4724db 100644 --- a/TAO/tests/Bug_2804_Regression/Hello.cpp +++ b/TAO/tests/Bug_2804_Regression/Hello.cpp @@ -19,7 +19,7 @@ Hello::get_any (CORBA::Any const & the_any) void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2804_Regression/Hello.h b/TAO/tests/Bug_2804_Regression/Hello.h index d8ef497e2e9..97d878316d8 100644 --- a/TAO/tests/Bug_2804_Regression/Hello.h +++ b/TAO/tests/Bug_2804_Regression/Hello.h @@ -26,7 +26,7 @@ public: // Return the any provide as an "in" argument. virtual CORBA::Any * get_any (CORBA::Any const & the_any); - virtual void shutdown (void); + virtual void shutdown (); private: /// The ORB which will be shutdown by Hello::shutdown(). diff --git a/TAO/tests/Bug_2805_Regression/ami_test_i.cpp b/TAO/tests/Bug_2805_Regression/ami_test_i.cpp index 08ca555dd4e..4824a2e1156 100644 --- a/TAO/tests/Bug_2805_Regression/ami_test_i.cpp +++ b/TAO/tests/Bug_2805_Regression/ami_test_i.cpp @@ -62,14 +62,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/tests/Bug_2805_Regression/ami_test_i.h b/TAO/tests/Bug_2805_Regression/ami_test_i.h index a019bf37775..190bddd3294 100644 --- a/TAO/tests/Bug_2805_Regression/ami_test_i.h +++ b/TAO/tests/Bug_2805_Regression/ami_test_i.h @@ -33,9 +33,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/tests/Bug_2805_Regression/client.cpp b/TAO/tests/Bug_2805_Regression/client.cpp index 84297478797..74262da89be 100644 --- a/TAO/tests/Bug_2805_Regression/client.cpp +++ b/TAO/tests/Bug_2805_Regression/client.cpp @@ -96,7 +96,7 @@ public: class Handler : public POA_A::AMI_AMI_TestHandler { public: - Handler (void) + Handler () { }; @@ -149,7 +149,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")); @@ -160,7 +160,7 @@ public: ACE_DEBUG ((LM_DEBUG, "Callback method <set_yadda_excep> called:\n")); }; - ~Handler (void) + ~Handler () { }; @@ -295,7 +295,7 @@ Client::Client (A::AMI_Test_ptr server, } int -Client::svc (void) +Client::svc () { try { diff --git a/TAO/tests/Bug_2844_Regression/Hello.cpp b/TAO/tests/Bug_2844_Regression/Hello.cpp index b1013a6061c..82d4b4724db 100644 --- a/TAO/tests/Bug_2844_Regression/Hello.cpp +++ b/TAO/tests/Bug_2844_Regression/Hello.cpp @@ -19,7 +19,7 @@ Hello::get_any (CORBA::Any const & the_any) void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2844_Regression/Hello.h b/TAO/tests/Bug_2844_Regression/Hello.h index d8ef497e2e9..97d878316d8 100644 --- a/TAO/tests/Bug_2844_Regression/Hello.h +++ b/TAO/tests/Bug_2844_Regression/Hello.h @@ -26,7 +26,7 @@ public: // Return the any provide as an "in" argument. virtual CORBA::Any * get_any (CORBA::Any const & the_any); - virtual void shutdown (void); + virtual void shutdown (); private: /// The ORB which will be shutdown by Hello::shutdown(). diff --git a/TAO/tests/Bug_2909_Regression/ami_test_i.cpp b/TAO/tests/Bug_2909_Regression/ami_test_i.cpp index 3e9f7c047f6..1626a15b166 100644 --- a/TAO/tests/Bug_2909_Regression/ami_test_i.cpp +++ b/TAO/tests/Bug_2909_Regression/ami_test_i.cpp @@ -38,7 +38,7 @@ AMI_Test_i::foo (CORBA::Long value) } void -AMI_Test_i::shutdown (void) +AMI_Test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2909_Regression/ami_test_i.h b/TAO/tests/Bug_2909_Regression/ami_test_i.h index 1df67e21f06..8b94350193b 100644 --- a/TAO/tests/Bug_2909_Regression/ami_test_i.h +++ b/TAO/tests/Bug_2909_Regression/ami_test_i.h @@ -29,7 +29,7 @@ public: // The AMI_Test methods. void foo (CORBA::Long value); - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_2909_Regression/client.cpp b/TAO/tests/Bug_2909_Regression/client.cpp index ccdafd2ecb5..05f6a9188bd 100644 --- a/TAO/tests/Bug_2909_Regression/client.cpp +++ b/TAO/tests/Bug_2909_Regression/client.cpp @@ -97,7 +97,7 @@ public: { }; - void foo (void) + void foo () { int const reply = --number_of_replies; @@ -152,7 +152,7 @@ public: ++request_; }; - ~Handler (void) + ~Handler () { }; private: @@ -279,7 +279,7 @@ Client::Client (A::AMI_Test_ptr server, } int -Client::svc (void) +Client::svc () { try { diff --git a/TAO/tests/Bug_2918_Regression/Hello.cpp b/TAO/tests/Bug_2918_Regression/Hello.cpp index b1013a6061c..82d4b4724db 100644 --- a/TAO/tests/Bug_2918_Regression/Hello.cpp +++ b/TAO/tests/Bug_2918_Regression/Hello.cpp @@ -19,7 +19,7 @@ Hello::get_any (CORBA::Any const & the_any) void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_2918_Regression/Hello.h b/TAO/tests/Bug_2918_Regression/Hello.h index d8ef497e2e9..97d878316d8 100644 --- a/TAO/tests/Bug_2918_Regression/Hello.h +++ b/TAO/tests/Bug_2918_Regression/Hello.h @@ -26,7 +26,7 @@ public: // Return the any provide as an "in" argument. virtual CORBA::Any * get_any (CORBA::Any const & the_any); - virtual void shutdown (void); + virtual void shutdown (); private: /// The ORB which will be shutdown by Hello::shutdown(). diff --git a/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp b/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp index 1c54c14eb97..914a0b54ec0 100644 --- a/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp +++ b/TAO/tests/Bug_2936_Regression/PersistentPOA.cpp @@ -116,7 +116,7 @@ int PersistentPoa::init (int argc, ACE_TCHAR *argv[]) } /* end of PersistentPoa::init ( ) */ -int PersistentPoa::fini (void) +int PersistentPoa::fini () { int result = 0; diff --git a/TAO/tests/Bug_2953_Regression/Client_Task.cpp b/TAO/tests/Bug_2953_Regression/Client_Task.cpp index 48327cc41ca..db5bae4319d 100644 --- a/TAO/tests/Bug_2953_Regression/Client_Task.cpp +++ b/TAO/tests/Bug_2953_Regression/Client_Task.cpp @@ -8,14 +8,14 @@ Client_Task::Client_Task (CORBA::ORB_ptr orb) } void -Client_Task::terminate_loop (void) +Client_Task::terminate_loop () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->terminate_loop_ = 1; } int -Client_Task::svc (void) +Client_Task::svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); try diff --git a/TAO/tests/Bug_2953_Regression/Client_Task.h b/TAO/tests/Bug_2953_Regression/Client_Task.h index 631aae096d2..b4b64869a89 100644 --- a/TAO/tests/Bug_2953_Regression/Client_Task.h +++ b/TAO/tests/Bug_2953_Regression/Client_Task.h @@ -18,10 +18,10 @@ public: Client_Task (CORBA::ORB_ptr orb); /// Terminate the loop - void terminate_loop (void); + void terminate_loop (); /// Thread entry point - int svc (void); + int svc (); private: /// Reference to the ORB diff --git a/TAO/tests/Bug_2966_Regression/Hello.cpp b/TAO/tests/Bug_2966_Regression/Hello.cpp index cd0f84a435b..6d827808c88 100644 --- a/TAO/tests/Bug_2966_Regression/Hello.cpp +++ b/TAO/tests/Bug_2966_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/tests/Bug_2966_Regression/Hello.h b/TAO/tests/Bug_2966_Regression/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/Bug_2966_Regression/Hello.h +++ b/TAO/tests/Bug_2966_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/tests/Bug_3000_Regression/Callback.cpp b/TAO/tests/Bug_3000_Regression/Callback.cpp index fbf466a8735..93de0784405 100644 --- a/TAO/tests/Bug_3000_Regression/Callback.cpp +++ b/TAO/tests/Bug_3000_Regression/Callback.cpp @@ -1,12 +1,12 @@ #include "Callback.h" -Callback::Callback (void) +Callback::Callback () : received_callback_ (false) { } void -Callback::test_oneway (void) +Callback::test_oneway () { received_callback_ = true; @@ -15,7 +15,7 @@ Callback::test_oneway (void) } bool -Callback::received_callback (void) +Callback::received_callback () { return received_callback_; } diff --git a/TAO/tests/Bug_3000_Regression/Callback.h b/TAO/tests/Bug_3000_Regression/Callback.h index e667bd5f4ff..178b4ff21dd 100644 --- a/TAO/tests/Bug_3000_Regression/Callback.h +++ b/TAO/tests/Bug_3000_Regression/Callback.h @@ -11,11 +11,11 @@ class Callback { public: /// Constructor - Callback (void); + Callback (); - virtual void test_oneway (void); + virtual void test_oneway (); - bool received_callback (void); + bool received_callback (); private: bool received_callback_; diff --git a/TAO/tests/Bug_3000_Regression/Service.cpp b/TAO/tests/Bug_3000_Regression/Service.cpp index db024beb115..53b0f4ec0d7 100644 --- a/TAO/tests/Bug_3000_Regression/Service.cpp +++ b/TAO/tests/Bug_3000_Regression/Service.cpp @@ -12,7 +12,7 @@ Service::run_test (Test::Callback_ptr callback) } void -Service::shutdown (void) +Service::shutdown () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Shuting down self (server)\n")); diff --git a/TAO/tests/Bug_3000_Regression/Service.h b/TAO/tests/Bug_3000_Regression/Service.h index c34df5a9f97..cf310f3a4bc 100644 --- a/TAO/tests/Bug_3000_Regression/Service.h +++ b/TAO/tests/Bug_3000_Regression/Service.h @@ -16,7 +16,7 @@ public: // = The skeleton methods virtual void run_test (Test::Callback_ptr callback); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to shutdown the application. diff --git a/TAO/tests/Bug_3108_Regression/client.cpp b/TAO/tests/Bug_3108_Regression/client.cpp index 3a34daed57b..8e63098454f 100644 --- a/TAO/tests/Bug_3108_Regression/client.cpp +++ b/TAO/tests/Bug_3108_Regression/client.cpp @@ -60,7 +60,7 @@ Client::Client (test_ptr server) } int -Client::svc (void) +Client::svc () { try { diff --git a/TAO/tests/Bug_3108_Regression/test_i.cpp b/TAO/tests/Bug_3108_Regression/test_i.cpp index cebacc2a5a4..79a511af2f3 100644 --- a/TAO/tests/Bug_3108_Regression/test_i.cpp +++ b/TAO/tests/Bug_3108_Regression/test_i.cpp @@ -14,7 +14,7 @@ test_i::test_method () } void -test_i::shutdown (void) +test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3108_Regression/test_i.h b/TAO/tests/Bug_3108_Regression/test_i.h index a81166bf3e3..7d68c511511 100644 --- a/TAO/tests/Bug_3108_Regression/test_i.h +++ b/TAO/tests/Bug_3108_Regression/test_i.h @@ -11,7 +11,7 @@ public: /// Test method. CORBA::Long test_method (); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_3163_Regression/server.cpp b/TAO/tests/Bug_3163_Regression/server.cpp index 987ec1ea579..3085980d408 100644 --- a/TAO/tests/Bug_3163_Regression/server.cpp +++ b/TAO/tests/Bug_3163_Regression/server.cpp @@ -51,7 +51,7 @@ public: return 0; } - void shutdown (void) + void shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3171_Regression/server.cpp b/TAO/tests/Bug_3171_Regression/server.cpp index dbdebb13338..4fd51bacac3 100644 --- a/TAO/tests/Bug_3171_Regression/server.cpp +++ b/TAO/tests/Bug_3171_Regression/server.cpp @@ -138,7 +138,7 @@ Worker::Worker () } int -Worker::svc (void) +Worker::svc () { static int threadID = 0; diff --git a/TAO/tests/Bug_3251_Regression/DllOrb.cpp b/TAO/tests/Bug_3251_Regression/DllOrb.cpp index 85a1701db36..89d43fcdab9 100644 --- a/TAO/tests/Bug_3251_Regression/DllOrb.cpp +++ b/TAO/tests/Bug_3251_Regression/DllOrb.cpp @@ -5,7 +5,7 @@ #include "tao/TAO_Singleton_Manager.h" -DllOrb::DllOrb (void) +DllOrb::DllOrb () : ma_barrier_(), mv_orb_ (), @@ -14,7 +14,7 @@ DllOrb::DllOrb (void) } -DllOrb::~DllOrb (void) +DllOrb::~DllOrb () { } @@ -89,7 +89,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[]) int -DllOrb::fini (void) +DllOrb::fini () { try { @@ -129,7 +129,7 @@ DllOrb::fini (void) } -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/tests/Bug_3251_Regression/DllOrb.h b/TAO/tests/Bug_3251_Regression/DllOrb.h index d057b189e85..a13e85e847d 100644 --- a/TAO/tests/Bug_3251_Regression/DllOrb.h +++ b/TAO/tests/Bug_3251_Regression/DllOrb.h @@ -13,8 +13,8 @@ class bug_3251_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/tests/Bug_3251_Regression/PersistentPoa.cpp b/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp index fa78847117a..9d889930228 100644 --- a/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp +++ b/TAO/tests/Bug_3251_Regression/PersistentPoa.cpp @@ -63,7 +63,7 @@ int PersistentPoa::init (int argc, ACE_TCHAR *argv[]) } /* end of PersistentPoa::init ( ) */ -int PersistentPoa::fini (void) +int PersistentPoa::fini () { try { diff --git a/TAO/tests/Bug_3276_Regression/Manager.cpp b/TAO/tests/Bug_3276_Regression/Manager.cpp index 835c6b05060..aca19bf2b19 100644 --- a/TAO/tests/Bug_3276_Regression/Manager.cpp +++ b/TAO/tests/Bug_3276_Regression/Manager.cpp @@ -103,26 +103,26 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return 0; } -Manager::Manager (void) +Manager::Manager () : orb_ (0), new_poa_var_ (0) { //no-op } -Manager::~Manager (void) +Manager::~Manager () { this->orb_->destroy (); } CORBA::ORB_ptr -Manager::orb (void) +Manager::orb () { return CORBA::ORB::_duplicate (this->orb_.in ()); } CORBA::Object_ptr -Manager::server (void) +Manager::server () { return CORBA::Object::_duplicate (this->server_.in ()); } diff --git a/TAO/tests/Bug_3276_Regression/Manager.h b/TAO/tests/Bug_3276_Regression/Manager.h index abf99ba5968..c6fbcdc80de 100644 --- a/TAO/tests/Bug_3276_Regression/Manager.h +++ b/TAO/tests/Bug_3276_Regression/Manager.h @@ -6,24 +6,24 @@ class Manager { public: - Manager (void); + Manager (); // Ctor - ~Manager (void); + ~Manager (); int init (int argc, ACE_TCHAR *argv[]); // Initialize the ORB, POA etc. - int activate_servant (void); + int activate_servant (); // Activate the servant etc. - int run (void); + int run (); // Run the ORB's event loop. - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); // ORB's accessor. - CORBA::Object_ptr server (void); + CORBA::Object_ptr server (); // Server's accessor. private: diff --git a/TAO/tests/Bug_3299_Regression/Hello.cpp b/TAO/tests/Bug_3299_Regression/Hello.cpp index 0f49115aca0..ff1b7c0678c 100644 --- a/TAO/tests/Bug_3299_Regression/Hello.cpp +++ b/TAO/tests/Bug_3299_Regression/Hello.cpp @@ -6,7 +6,7 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (void) +Hello::get_string () { static int our_count = 0; @@ -21,7 +21,7 @@ Hello::get_string (void) } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3299_Regression/Hello.h b/TAO/tests/Bug_3299_Regression/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/Bug_3299_Regression/Hello.h +++ b/TAO/tests/Bug_3299_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/tests/Bug_3384_Regression/client.cpp b/TAO/tests/Bug_3384_Regression/client.cpp index 70a5ed3f812..5cc5cd4a1f3 100644 --- a/TAO/tests/Bug_3384_Regression/client.cpp +++ b/TAO/tests/Bug_3384_Regression/client.cpp @@ -197,7 +197,7 @@ Worker::Worker (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { try { diff --git a/TAO/tests/Bug_3430_Regression/Hello.cpp b/TAO/tests/Bug_3430_Regression/Hello.cpp index 2e2666c0c72..5da11424d96 100644 --- a/TAO/tests/Bug_3430_Regression/Hello.cpp +++ b/TAO/tests/Bug_3430_Regression/Hello.cpp @@ -13,7 +13,7 @@ Hello::method(Test::Hello_out r) } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3430_Regression/Hello.h b/TAO/tests/Bug_3430_Regression/Hello.h index e7318b30deb..c32a65ae46d 100644 --- a/TAO/tests/Bug_3430_Regression/Hello.h +++ b/TAO/tests/Bug_3430_Regression/Hello.h @@ -16,7 +16,7 @@ public: // = The skeleton methods virtual void method (Test::Hello_out r); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Bug_3471_Regression/Hello.cpp b/TAO/tests/Bug_3471_Regression/Hello.cpp index 383b6049261..1a29e8a8844 100644 --- a/TAO/tests/Bug_3471_Regression/Hello.cpp +++ b/TAO/tests/Bug_3471_Regression/Hello.cpp @@ -6,7 +6,7 @@ Hello::Hello (CORBA::ORB_ptr orb) } Test::ObjectSeq* -Hello::get_objects (void) +Hello::get_objects () { Test::ObjectSeq_var my_seq = new Test::ObjectSeq (1); my_seq->length (1); @@ -16,7 +16,7 @@ Hello::get_objects (void) } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3471_Regression/Hello.h b/TAO/tests/Bug_3471_Regression/Hello.h index 5235bc0fe8f..786fca746de 100644 --- a/TAO/tests/Bug_3471_Regression/Hello.h +++ b/TAO/tests/Bug_3471_Regression/Hello.h @@ -14,9 +14,9 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual Test::ObjectSeq* get_objects (void); + virtual Test::ObjectSeq* get_objects (); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_3479_Regression/Hello.cpp b/TAO/tests/Bug_3479_Regression/Hello.cpp index 674e81b64e0..06899bdaadc 100644 --- a/TAO/tests/Bug_3479_Regression/Hello.cpp +++ b/TAO/tests/Bug_3479_Regression/Hello.cpp @@ -12,7 +12,7 @@ Hello::get_string (CORBA::String_out string_out) } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3479_Regression/Hello.h b/TAO/tests/Bug_3479_Regression/Hello.h index bdce42f931d..f92e1ee2fb6 100644 --- a/TAO/tests/Bug_3479_Regression/Hello.h +++ b/TAO/tests/Bug_3479_Regression/Hello.h @@ -16,7 +16,7 @@ public: // = The skeleton methods virtual void get_string (CORBA::String_out string_out); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service.cpp b/TAO/tests/Bug_3499_Regression/DLL_Service.cpp index a4df1715d6c..7f05a4ce4da 100644 --- a/TAO/tests/Bug_3499_Regression/DLL_Service.cpp +++ b/TAO/tests/Bug_3499_Regression/DLL_Service.cpp @@ -1,10 +1,10 @@ #include "DLL_Service.h" -ACE_DLL_Service::ACE_DLL_Service (void) +ACE_DLL_Service::ACE_DLL_Service () { } -ACE_DLL_Service::~ACE_DLL_Service (void) +ACE_DLL_Service::~ACE_DLL_Service () { } @@ -13,12 +13,12 @@ int ACE_DLL_Service::init (int, ACE_TCHAR *[]) return 0; } -int ACE_DLL_Service::fini (void) +int ACE_DLL_Service::fini () { return 0; } -void ACE_DLL_Service::destroy (void) +void ACE_DLL_Service::destroy () { delete this; } diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service.h b/TAO/tests/Bug_3499_Regression/DLL_Service.h index 801ead231da..29e9cb90bbf 100644 --- a/TAO/tests/Bug_3499_Regression/DLL_Service.h +++ b/TAO/tests/Bug_3499_Regression/DLL_Service.h @@ -6,20 +6,20 @@ class ACE_DLL_SERVICE_Export ACE_DLL_Service { public: - ACE_DLL_Service (void); + ACE_DLL_Service (); - virtual ~ACE_DLL_Service (void); + virtual ~ACE_DLL_Service (); virtual int init (int , ACE_TCHAR * []); virtual int fini (); /// This is only here for destruction purposes - virtual void destroy (void); + virtual void destroy (); }; #define ACE_DLL_SERVICE_DECL(export_macro, symbol) \ - extern "C" export_macro ACE_DLL_Service * symbol (void) + extern "C" export_macro ACE_DLL_Service * symbol () #define ACE_DLL_SERVICE_IMPL(classname, symbol) \ ACE_DLL_Service * symbol (void) \ diff --git a/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp b/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp index 52ea597f868..d1c4ae09bba 100644 --- a/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp +++ b/TAO/tests/Bug_3499_Regression/DLL_Service_Host.cpp @@ -43,7 +43,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR * argv []) -1); } - typedef ACE_DLL_Service * (*factory_type) (void); + typedef ACE_DLL_Service * (*factory_type) (); ptrdiff_t tmp_ptr = reinterpret_cast <ptrdiff_t> (symbol); factory_type f = reinterpret_cast <factory_type> (tmp_ptr); diff --git a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp index c1b1b21511a..8fd0c4487bb 100644 --- a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp +++ b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.cpp @@ -2,12 +2,12 @@ ACE_DLL_SERVICE_IMPL (ACE_DLL_TAO_Service, _make_ACE_DLL_TAO_Service) -ACE_DLL_TAO_Service::ACE_DLL_TAO_Service (void) +ACE_DLL_TAO_Service::ACE_DLL_TAO_Service () { ACE_DLL_TAO_SERVICE_TRACE (ACE_TEXT ("ACE_DLL_TAO_Service::ACE_DLL_TAO_Service (void)")); } -ACE_DLL_TAO_Service::~ACE_DLL_TAO_Service (void) +ACE_DLL_TAO_Service::~ACE_DLL_TAO_Service () { ACE_DLL_TAO_SERVICE_TRACE (ACE_TEXT ("ACE_DLL_TAO_Service::~ACE_DLL_TAO_Service (void)")); } @@ -42,7 +42,7 @@ int ACE_DLL_TAO_Service::init (int argc, ACE_TCHAR * argv []) return 0; } -int ACE_DLL_TAO_Service::fini (void) +int ACE_DLL_TAO_Service::fini () { ACE_DLL_TAO_SERVICE_TRACE (ACE_TEXT ("ACE_DLL_TAO_Service::fini (void)")); diff --git a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h index f2d26f5d3db..85f7f4f62d9 100644 --- a/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h +++ b/TAO/tests/Bug_3499_Regression/DLL_TAO_Service.h @@ -8,9 +8,9 @@ class ACE_DLL_TAO_Service : public ACE_DLL_Service { public: - ACE_DLL_TAO_Service (void); + ACE_DLL_TAO_Service (); - virtual ~ACE_DLL_TAO_Service (void); + virtual ~ACE_DLL_TAO_Service (); virtual int init (int argc, ACE_TCHAR * argv []); diff --git a/TAO/tests/Bug_3531_Regression/client.cpp b/TAO/tests/Bug_3531_Regression/client.cpp index 37ed18ee226..76f08066378 100644 --- a/TAO/tests/Bug_3531_Regression/client.cpp +++ b/TAO/tests/Bug_3531_Regression/client.cpp @@ -186,7 +186,7 @@ Worker::Worker (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { try { diff --git a/TAO/tests/Bug_3531_Regression/server.cpp b/TAO/tests/Bug_3531_Regression/server.cpp index 0988c258929..21abfe9d5c9 100644 --- a/TAO/tests/Bug_3531_Regression/server.cpp +++ b/TAO/tests/Bug_3531_Regression/server.cpp @@ -149,7 +149,7 @@ Worker::Worker (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { try { diff --git a/TAO/tests/Bug_3531b_Regression/server.cpp b/TAO/tests/Bug_3531b_Regression/server.cpp index 490190d3a57..43806234818 100644 --- a/TAO/tests/Bug_3531b_Regression/server.cpp +++ b/TAO/tests/Bug_3531b_Regression/server.cpp @@ -72,16 +72,16 @@ public: class Worker: public ACE_Task<ACE_SYNCH> { public: - Worker (void) + Worker () : shutdown_ (false) {} virtual int svc (); virtual int close (u_long = 0); virtual int put (ACE_Message_Block * mblk, ACE_Time_Value * tv = 0); - int process_cmd (void); + int process_cmd (); void shutdown (bool do_shutdown); - bool shutdown (void); + bool shutdown (); private: bool shutdown_; @@ -90,7 +90,7 @@ private: ACE_TSS<Worker> *workers_p = 0; #define workers (*workers_p) -int Worker::svc (void) +int Worker::svc () { if (debug) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%P|%t) Worker thread starting up.\n"))); @@ -118,7 +118,7 @@ int Worker::put (ACE_Message_Block * mblk, ACE_Time_Value * tv) return this->putq (mblk, tv); } -int Worker::process_cmd (void) +int Worker::process_cmd () { ACE_Message_Block *mb = 0; if (this->getq (mb, 0) == -1) @@ -141,7 +141,7 @@ void Worker::shutdown (bool do_shutdown) shutdown_ = do_shutdown; } -bool Worker::shutdown (void) +bool Worker::shutdown () { return shutdown_; } @@ -310,13 +310,13 @@ public: return 0; } - virtual ACE_Event_Handler * event_handler_i (void) + virtual ACE_Event_Handler * event_handler_i () { return 0; } protected: - virtual TAO_Connection_Handler * connection_handler_i (void) + virtual TAO_Connection_Handler * connection_handler_i () { return 0; } @@ -425,7 +425,7 @@ public: { return cond_; } - virtual ACE_Message_Block *release (void) + virtual ACE_Message_Block *release () { // we need to only release once both the main and worker thread // are done with this object - each signals this by calling this diff --git a/TAO/tests/Bug_3542_Regression/DllOrb.cpp b/TAO/tests/Bug_3542_Regression/DllOrb.cpp index e16dcfc4acb..d06d663db41 100644 --- a/TAO/tests/Bug_3542_Regression/DllOrb.cpp +++ b/TAO/tests/Bug_3542_Regression/DllOrb.cpp @@ -4,7 +4,7 @@ #include "ace/OS_NS_unistd.h" #include "tao/TAO_Singleton_Manager.h" -DllOrb::DllOrb (void) +DllOrb::DllOrb () : ma_barrier_(), mv_orb_ (), @@ -12,7 +12,7 @@ DllOrb::DllOrb (void) { } -DllOrb::~DllOrb (void) +DllOrb::~DllOrb () { } @@ -86,7 +86,7 @@ DllOrb::init (int argc, ACE_TCHAR *argv[]) int -DllOrb::fini (void) +DllOrb::fini () { try { @@ -126,7 +126,7 @@ DllOrb::fini (void) } -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/tests/Bug_3542_Regression/DllOrb.h b/TAO/tests/Bug_3542_Regression/DllOrb.h index 1824980a125..a7d44a51a05 100644 --- a/TAO/tests/Bug_3542_Regression/DllOrb.h +++ b/TAO/tests/Bug_3542_Regression/DllOrb.h @@ -13,8 +13,8 @@ class bug_3542_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/tests/Bug_3543_Regression/master.cpp b/TAO/tests/Bug_3543_Regression/master.cpp index a9a80b01d2e..382fe3bd19c 100644 --- a/TAO/tests/Bug_3543_Regression/master.cpp +++ b/TAO/tests/Bug_3543_Regression/master.cpp @@ -74,7 +74,7 @@ public: } }; -void Dispatcher_shutdown(void) +void Dispatcher_shutdown() { std::list<MasterClient::Server_var> copiedlist; { diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp index 4e2e4cdaba3..17cdb2bfd72 100644 --- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp +++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.cpp @@ -11,7 +11,7 @@ Stock_Quoter_i::~Stock_Quoter_i () } void -Stock_Quoter_i::shutdown (void) +Stock_Quoter_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h index 554f6985a87..17f37c59924 100644 --- a/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h +++ b/TAO/tests/Bug_3547_Regression/Stock_Quoter_i.h @@ -12,7 +12,7 @@ public: CORBA::Float get_quote (const char* stock_id); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Bug_3553_Regression/Hello.cpp b/TAO/tests/Bug_3553_Regression/Hello.cpp index 0d000b9f195..bdfcac050fb 100644 --- a/TAO/tests/Bug_3553_Regression/Hello.cpp +++ b/TAO/tests/Bug_3553_Regression/Hello.cpp @@ -6,13 +6,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/tests/Bug_3553_Regression/Hello.h b/TAO/tests/Bug_3553_Regression/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/Bug_3553_Regression/Hello.h +++ b/TAO/tests/Bug_3553_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/tests/Bug_3558_Regression/Hello.cpp b/TAO/tests/Bug_3558_Regression/Hello.cpp index 789e72c09a4..95810f9386f 100644 --- a/TAO/tests/Bug_3558_Regression/Hello.cpp +++ b/TAO/tests/Bug_3558_Regression/Hello.cpp @@ -7,7 +7,7 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (void) +Hello::get_string () { ACE_DEBUG((LM_DEBUG, ACE_TEXT("%D get_string: sleep 5 seconds before returning\n"))); ACE_OS::sleep (5); @@ -15,7 +15,7 @@ Hello::get_string (void) } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3558_Regression/Hello.h b/TAO/tests/Bug_3558_Regression/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/Bug_3558_Regression/Hello.h +++ b/TAO/tests/Bug_3558_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/tests/Bug_3567_Regression/ami_test_i.cpp b/TAO/tests/Bug_3567_Regression/ami_test_i.cpp index 6dbdd973f19..f356ef712c3 100644 --- a/TAO/tests/Bug_3567_Regression/ami_test_i.cpp +++ b/TAO/tests/Bug_3567_Regression/ami_test_i.cpp @@ -63,14 +63,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/tests/Bug_3567_Regression/ami_test_i.h b/TAO/tests/Bug_3567_Regression/ami_test_i.h index 22f9b58728f..d6a316e2232 100644 --- a/TAO/tests/Bug_3567_Regression/ami_test_i.h +++ b/TAO/tests/Bug_3567_Regression/ami_test_i.h @@ -34,9 +34,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/tests/Bug_3567_Regression/client.cpp b/TAO/tests/Bug_3567_Regression/client.cpp index e547de1ee14..c6b77137254 100644 --- a/TAO/tests/Bug_3567_Regression/client.cpp +++ b/TAO/tests/Bug_3567_Regression/client.cpp @@ -112,7 +112,7 @@ public: class Handler : public POA_A::AMI_AMI_TestHandler { public: - Handler (void) + Handler () { } @@ -170,7 +170,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")); @@ -181,7 +181,7 @@ public: ACE_DEBUG ((LM_DEBUG, "Callback method <set_yadda_excep> called:\n")); } - ~Handler (void) + ~Handler () { } @@ -325,7 +325,7 @@ Client::~Client () } int -Client::svc (void) +Client::svc () { try { @@ -353,7 +353,7 @@ Worker::Worker (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { while (number_of_replies > 0) { diff --git a/TAO/tests/Bug_3567_Regression/server.cpp b/TAO/tests/Bug_3567_Regression/server.cpp index 63e4c806ef1..ac8c904bb95 100644 --- a/TAO/tests/Bug_3567_Regression/server.cpp +++ b/TAO/tests/Bug_3567_Regression/server.cpp @@ -153,7 +153,7 @@ Worker::Worker (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { try { diff --git a/TAO/tests/Bug_3597_Regression/server.cpp b/TAO/tests/Bug_3597_Regression/server.cpp index 23276610023..355db9e5c56 100644 --- a/TAO/tests/Bug_3597_Regression/server.cpp +++ b/TAO/tests/Bug_3597_Regression/server.cpp @@ -13,9 +13,9 @@ public: virtual int open (const ACE_TCHAR *logger_key); - virtual int reset (void); + virtual int reset (); - virtual int close (void); + virtual int close (); virtual ssize_t log (ACE_Log_Record &log_record); @@ -34,13 +34,13 @@ Backend::open (const ACE_TCHAR *key) } int -Backend::reset (void) +Backend::reset () { return 0; } int -Backend::close (void) +Backend::close () { return 0; } diff --git a/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp b/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp index 520d8bb3495..2a7e8712c25 100644 --- a/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.cpp +++ b/TAO/tests/Bug_3598a_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/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h b/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h index 36235e54b3a..1ba41d68aba 100644 --- a/TAO/tests/Bug_3598a_Regression/ClientRequest_Interceptor.h +++ b/TAO/tests/Bug_3598a_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/tests/Bug_3636_Regression/Hello.cpp b/TAO/tests/Bug_3636_Regression/Hello.cpp index 0d000b9f195..bdfcac050fb 100644 --- a/TAO/tests/Bug_3636_Regression/Hello.cpp +++ b/TAO/tests/Bug_3636_Regression/Hello.cpp @@ -6,13 +6,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/tests/Bug_3636_Regression/Hello.h b/TAO/tests/Bug_3636_Regression/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/Bug_3636_Regression/Hello.h +++ b/TAO/tests/Bug_3636_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/tests/Bug_3672_Regression/ami_test_i.cpp b/TAO/tests/Bug_3672_Regression/ami_test_i.cpp index 4c15a619ad5..6b5a75c0f35 100644 --- a/TAO/tests/Bug_3672_Regression/ami_test_i.cpp +++ b/TAO/tests/Bug_3672_Regression/ami_test_i.cpp @@ -31,7 +31,7 @@ AMI_Test_i::foo (CORBA::Long_out out_l) } void -AMI_Test_i::shutdown (void) +AMI_Test_i::shutdown () { ACE_OS::sleep (5); diff --git a/TAO/tests/Bug_3672_Regression/ami_test_i.h b/TAO/tests/Bug_3672_Regression/ami_test_i.h index f648ca5fe34..167b2b062dc 100644 --- a/TAO/tests/Bug_3672_Regression/ami_test_i.h +++ b/TAO/tests/Bug_3672_Regression/ami_test_i.h @@ -29,7 +29,7 @@ public: // The AMI_Test methods. CORBA::Long foo (CORBA::Long_out out_l); - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_3672_Regression/client.cpp b/TAO/tests/Bug_3672_Regression/client.cpp index 8f83f1a53d4..4e4ee1ddf23 100644 --- a/TAO/tests/Bug_3672_Regression/client.cpp +++ b/TAO/tests/Bug_3672_Regression/client.cpp @@ -96,7 +96,7 @@ private: class Handler : public POA_A::AMI_AMI_TestHandler { public: - Handler (void) + Handler () { }; @@ -134,7 +134,7 @@ public: } }; - ~Handler (void) + ~Handler () { }; }; @@ -293,7 +293,7 @@ Client::Client (A::AMI_Test_ptr server, } int -Client::svc (void) +Client::svc () { try { diff --git a/TAO/tests/Bug_3676_Regression/Hello.cpp b/TAO/tests/Bug_3676_Regression/Hello.cpp index 0d000b9f195..bdfcac050fb 100644 --- a/TAO/tests/Bug_3676_Regression/Hello.cpp +++ b/TAO/tests/Bug_3676_Regression/Hello.cpp @@ -6,13 +6,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/tests/Bug_3676_Regression/Hello.h b/TAO/tests/Bug_3676_Regression/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/Bug_3676_Regression/Hello.h +++ b/TAO/tests/Bug_3676_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/tests/Bug_3683_Regression/Echo_Client_i.cpp b/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp index 456ee812712..a6ad523e6fb 100644 --- a/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp +++ b/TAO/tests/Bug_3683_Regression/Echo_Client_i.cpp @@ -13,7 +13,7 @@ Echo_Client_i::Echo_Client_i (void) : payload_length_ (0) } //Destructor. -Echo_Client_i::~Echo_Client_i (void) +Echo_Client_i::~Echo_Client_i () { //no-op } diff --git a/TAO/tests/Bug_3683_Regression/Echo_Client_i.h b/TAO/tests/Bug_3683_Regression/Echo_Client_i.h index 141a23106ed..c419bf51425 100644 --- a/TAO/tests/Bug_3683_Regression/Echo_Client_i.h +++ b/TAO/tests/Bug_3683_Regression/Echo_Client_i.h @@ -29,10 +29,10 @@ class Echo_Client_i { public: /// Constructor - Echo_Client_i (void); + Echo_Client_i (); /// Destructor - ~Echo_Client_i (void); + ~Echo_Client_i (); /// Execute the methods int run (const char *, int, ACE_TCHAR **); diff --git a/TAO/tests/Bug_3683_Regression/Echo_i.cpp b/TAO/tests/Bug_3683_Regression/Echo_i.cpp index 580c0547647..e0cfc3b3fc6 100644 --- a/TAO/tests/Bug_3683_Regression/Echo_i.cpp +++ b/TAO/tests/Bug_3683_Regression/Echo_i.cpp @@ -2,13 +2,13 @@ // Constructor. -Echo_i::Echo_i (void) +Echo_i::Echo_i () { } // Destructor. -Echo_i::~Echo_i (void) +Echo_i::~Echo_i () { } @@ -80,7 +80,7 @@ Echo_i::echo_string (const char *mesg) // Shutdown the server application. void -Echo_i::shutdown (void) +Echo_i::shutdown () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nThe echo server is shutting down\n"))); diff --git a/TAO/tests/Bug_3683_Regression/Echo_i.h b/TAO/tests/Bug_3683_Regression/Echo_i.h index 0cd222b57eb..6160644d8b9 100644 --- a/TAO/tests/Bug_3683_Regression/Echo_i.h +++ b/TAO/tests/Bug_3683_Regression/Echo_i.h @@ -30,10 +30,10 @@ class Echo_i : public POA_Echo { public: /// Constructor. - Echo_i (void); + Echo_i (); /// Destructor. - virtual ~Echo_i (void); + virtual ~Echo_i (); /// Return the mesg string back from the server. virtual Echo::List *echo_list (const char *mesg); @@ -42,7 +42,7 @@ public: virtual char *echo_string (const char *mesg); /// Shutdown the server. - virtual void shutdown (void); + virtual void shutdown (); /// Set the ORB pointer. void orb (CORBA::ORB_ptr o); diff --git a/TAO/tests/Bug_3683_Regression/Simple_util.cpp b/TAO/tests/Bug_3683_Regression/Simple_util.cpp index 8ecb7692921..186b561ecbf 100644 --- a/TAO/tests/Bug_3683_Regression/Simple_util.cpp +++ b/TAO/tests/Bug_3683_Regression/Simple_util.cpp @@ -11,7 +11,7 @@ // Constructor. template <class Servant> -Server<Servant>::Server (void) +Server<Servant>::Server () : servant_ (0) , ior_output_file_ (0) , ins_ (0) @@ -25,13 +25,13 @@ Server<Servant>::Server (void) // Destructor. template <class Servant> -Server<Servant>::~Server (void) +Server<Servant>::~Server () { } // Parse the command-line arguments and set options. template <class Servant> int -Server<Servant>::parse_args (void) +Server<Servant>::parse_args () { ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT ("do:i:"), 1, 0, @@ -165,7 +165,7 @@ Server<Servant>::init (const char *servant_name, } template <class Servant>int -Server<Servant>::run (void) +Server<Servant>::run () { // Run the main event loop for the ORB. if (this->orb_manager_.run () == -1) @@ -178,7 +178,7 @@ Server<Servant>::run (void) // Constructor. template <class ServerInterface> -Client<ServerInterface>::Client (void) +Client<ServerInterface>::Client () : ior_ ("") , do_shutdown_ (0) { @@ -218,7 +218,7 @@ Client<ServerInterface>::read_ior (ACE_TCHAR *filename) // Parses the command line arguments and returns an error status. template <class ServerInterface> int -Client<ServerInterface>::parse_args (void) +Client<ServerInterface>::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT ("df:nk:x"), 1, 0, @@ -265,7 +265,7 @@ Client<ServerInterface>::parse_args (void) } template <class ServerInterface> -Client<ServerInterface>::~Client (void) +Client<ServerInterface>::~Client () { this->orb_->destroy (); } @@ -320,7 +320,7 @@ Client<ServerInterface>::init (const char *, } template <class ServerInterface> int -Client<ServerInterface>::do_shutdown (void) +Client<ServerInterface>::do_shutdown () { // Returns the shutdwon flag return this->do_shutdown_; diff --git a/TAO/tests/Bug_3683_Regression/Simple_util.h b/TAO/tests/Bug_3683_Regression/Simple_util.h index 1dc1e1c70dc..244b5b66170 100644 --- a/TAO/tests/Bug_3683_Regression/Simple_util.h +++ b/TAO/tests/Bug_3683_Regression/Simple_util.h @@ -34,10 +34,10 @@ class Server { public: /// Constructor. - Server (void); + Server (); /// Destructor. - ~Server (void); + ~Server (); /// Initialize the Server state - parsing arguments and waiting. /// interface_name is the name used to register the Servant. @@ -46,7 +46,7 @@ public: ACE_TCHAR *argv[]); /// Run the orb. - int run (void); + int run (); /// Ignore this method if you are not testing the InterOperable /// Naming Service. @@ -54,7 +54,7 @@ public: private: /// Parses the commandline arguments. - int parse_args (void); + int parse_args (); /// A holder of the servant that does ref counting for him. typedef TAO_Intrusive_Ref_Count_Handle<Servant> Servant_var; @@ -94,10 +94,10 @@ class Client { public: /// Constructor. - Client (void); + Client (); /// Destructor. - ~Client (void); + ~Client (); /// Initialize the client communication endpoint with server. int init (const char *name, int argc, ACE_TCHAR *argv[]); @@ -106,7 +106,7 @@ public: ServerInterface *operator-> () { return server_.in (); } /// Returns the shutdown flag. - int do_shutdown (void); + int do_shutdown (); /// Fills in the shutdwon flag. void do_shutdown (int); @@ -114,7 +114,7 @@ public: /// Initialize naming service int obtain_initial_references (const char *name); - CORBA::ORB_ptr orb (void) + CORBA::ORB_ptr orb () { return CORBA::ORB::_duplicate (this->orb_.in ()); } @@ -124,7 +124,7 @@ private: int read_ior (ACE_TCHAR *filename); /// Parses the arguments passed on the command line. - int parse_args (void); + int parse_args (); /// Remember our orb. CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_3746_Regression/Test_i.cpp b/TAO/tests/Bug_3746_Regression/Test_i.cpp index 0bc3f69157e..e79b7e4871b 100644 --- a/TAO/tests/Bug_3746_Regression/Test_i.cpp +++ b/TAO/tests/Bug_3746_Regression/Test_i.cpp @@ -15,7 +15,7 @@ BoundSequences::BoundSequences (CORBA::ORB_ptr orb) } void -BoundSequences::shutdown (void) +BoundSequences::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3746_Regression/Test_i.h b/TAO/tests/Bug_3746_Regression/Test_i.h index 370f09f3aba..296c9febd5d 100644 --- a/TAO/tests/Bug_3746_Regression/Test_i.h +++ b/TAO/tests/Bug_3746_Regression/Test_i.h @@ -19,7 +19,7 @@ public: const ::Test::BoundSequences::SequenceOf10Long &inSeq ); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Bug_3748_Regression/Hello.cpp b/TAO/tests/Bug_3748_Regression/Hello.cpp index 0d000b9f195..bdfcac050fb 100644 --- a/TAO/tests/Bug_3748_Regression/Hello.cpp +++ b/TAO/tests/Bug_3748_Regression/Hello.cpp @@ -6,13 +6,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/tests/Bug_3748_Regression/Hello.h b/TAO/tests/Bug_3748_Regression/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/Bug_3748_Regression/Hello.h +++ b/TAO/tests/Bug_3748_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/tests/Bug_3748_Regression/Server_ORBInitializer.cpp b/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.cpp index 4242dc7a94c..cfd8fc63c18 100644 --- a/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.cpp +++ b/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.cpp @@ -5,7 +5,7 @@ #include "tao/ORB_Core.h" #include "tao/PI/ORBInitInfo.h" -Server_ORBInitializer::Server_ORBInitializer (void) +Server_ORBInitializer::Server_ORBInitializer () { } diff --git a/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.h b/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.h index 9554057647d..e3d1af0b6df 100644 --- a/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.h +++ b/TAO/tests/Bug_3748_Regression/Server_ORBInitializer.h @@ -26,7 +26,7 @@ class Server_ORBInitializer : { public: /// Constructor - Server_ORBInitializer (void); + Server_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp b/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp index 4782e4214e5..7cef6cdf217 100644 --- a/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp +++ b/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.cpp @@ -3,13 +3,13 @@ #include "Test_Protocols_Hooks.h" #include "TestC.h" -Test_Protocols_Hooks::Test_Protocols_Hooks (void) +Test_Protocols_Hooks::Test_Protocols_Hooks () : failure_count_ (0) { } -Test_Protocols_Hooks::~Test_Protocols_Hooks (void) +Test_Protocols_Hooks::~Test_Protocols_Hooks () { } @@ -105,7 +105,7 @@ Test_Protocols_Hooks::client_protocol_properties_at_orb_level ( } CORBA::Long -Test_Protocols_Hooks::get_dscp_codepoint (void) +Test_Protocols_Hooks::get_dscp_codepoint () { return -1; } diff --git a/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.h b/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.h index e2adfb45ba3..222eabd6bc4 100644 --- a/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.h +++ b/TAO/tests/Bug_3748_Regression/Test_Protocols_Hooks.h @@ -17,10 +17,10 @@ class Test_Protocols_Hooks : public TAO_Protocols_Hooks { public: /// Constructor - Test_Protocols_Hooks (void); + Test_Protocols_Hooks (); /// Destructor - virtual ~Test_Protocols_Hooks (void); + virtual ~Test_Protocols_Hooks (); /// Initialize the protocols hooks instance. void init_hooks (TAO_ORB_Core *orb_core); @@ -61,7 +61,7 @@ public: void client_protocol_properties_at_orb_level ( TAO_SCIOP_Protocol_Properties &protocol_properties); - CORBA::Long get_dscp_codepoint (void); + CORBA::Long get_dscp_codepoint (); void get_selector_hook (CORBA::Policy *model_policy, CORBA::Boolean diff --git a/TAO/tests/Bug_3755_Ext_Regression/common.h b/TAO/tests/Bug_3755_Ext_Regression/common.h index 023c2784466..35f2803c2fe 100644 --- a/TAO/tests/Bug_3755_Ext_Regression/common.h +++ b/TAO/tests/Bug_3755_Ext_Regression/common.h @@ -3,6 +3,6 @@ #define FIRST_ORB_NAME "first_orb" #define SECOND_ORB_NAME "second_orb" -typedef int (*orbs_check_callback)(void); +typedef int (*orbs_check_callback)(); int do_main (int argc, ACE_TCHAR *argv[], orbs_check_callback check); diff --git a/TAO/tests/Bug_3766_Regression/TestI.cpp b/TAO/tests/Bug_3766_Regression/TestI.cpp index 181c2886086..e732d7d0038 100644 --- a/TAO/tests/Bug_3766_Regression/TestI.cpp +++ b/TAO/tests/Bug_3766_Regression/TestI.cpp @@ -36,7 +36,7 @@ Test_i::Test_i (CORBA::ORB_ptr o) } // Implementation skeleton destructor -Test_i::~Test_i (void) +Test_i::~Test_i () { } @@ -60,7 +60,7 @@ void Test_i::do_something_VariableLength ( my_info->d = ::CORBA::string_dup("Howdy"); } -void Test_i::shutdown (void) +void Test_i::shutdown () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nThe server is shutting down\n"))); diff --git a/TAO/tests/Bug_3766_Regression/TestI.h b/TAO/tests/Bug_3766_Regression/TestI.h index b731c02c884..c398592e21c 100644 --- a/TAO/tests/Bug_3766_Regression/TestI.h +++ b/TAO/tests/Bug_3766_Regression/TestI.h @@ -44,7 +44,7 @@ public: Test_i (CORBA::ORB_ptr o); // Destructor - virtual ~Test_i (void); + virtual ~Test_i (); virtual void do_something_FixedLength ( @@ -54,7 +54,7 @@ public: void do_something_VariableLength ( ::VariableLengthInfo_out my_info); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Bug_3768_Regression/TestCallback.cpp b/TAO/tests/Bug_3768_Regression/TestCallback.cpp index 18cca5d1db8..03aac6b348a 100644 --- a/TAO/tests/Bug_3768_Regression/TestCallback.cpp +++ b/TAO/tests/Bug_3768_Regression/TestCallback.cpp @@ -7,7 +7,7 @@ TestCallback::TestCallback (CORBA::ORB_ptr orb) } void -TestCallback::start_threads_and_block (void) +TestCallback::start_threads_and_block () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - start_threads_and_block\n")); work_.activate(THR_NEW_LWP | THR_JOINABLE | THR_INHERIT_SCHED,10); @@ -15,13 +15,13 @@ TestCallback::start_threads_and_block (void) } void -TestCallback::test_call (void) +TestCallback::test_call () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test_call\n")); } void -TestCallback::shutdown (void) +TestCallback::shutdown () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test completed\n")); exit (0); diff --git a/TAO/tests/Bug_3768_Regression/TestCallback.h b/TAO/tests/Bug_3768_Regression/TestCallback.h index ada0da87940..30c6c9f41e9 100644 --- a/TAO/tests/Bug_3768_Regression/TestCallback.h +++ b/TAO/tests/Bug_3768_Regression/TestCallback.h @@ -12,7 +12,7 @@ public: { } - int svc(void) + int svc() { orb_->run(); return 0; @@ -31,9 +31,9 @@ public: TestCallback (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void start_threads_and_block (void); - virtual void test_call (void); - virtual void shutdown (void); + virtual void start_threads_and_block (); + virtual void test_call (); + virtual void shutdown (); private: Worker work_; diff --git a/TAO/tests/Bug_3768_Regression/TestServer.cpp b/TAO/tests/Bug_3768_Regression/TestServer.cpp index a3e89dca5e9..948e33a5f80 100644 --- a/TAO/tests/Bug_3768_Regression/TestServer.cpp +++ b/TAO/tests/Bug_3768_Regression/TestServer.cpp @@ -11,19 +11,19 @@ TestServer::pass_callback (Test::TestCallback_ptr test) } bool -TestServer::got_callback (void) +TestServer::got_callback () { return (callback_.in() != 0); } void -TestServer::make_callback (void) +TestServer::make_callback () { callback_->test_call(); } void -TestServer::shutdown_client (void) +TestServer::shutdown_client () { callback_->shutdown(); } diff --git a/TAO/tests/Bug_3768_Regression/TestServer.h b/TAO/tests/Bug_3768_Regression/TestServer.h index ab15dcf77c0..f3bfd06a415 100644 --- a/TAO/tests/Bug_3768_Regression/TestServer.h +++ b/TAO/tests/Bug_3768_Regression/TestServer.h @@ -12,9 +12,9 @@ public: // = The skeleton methods virtual void pass_callback (Test::TestCallback_ptr test); - bool got_callback (void); - void make_callback (void); - void shutdown_client (void); + bool got_callback (); + void make_callback (); + void shutdown_client (); private: Test::TestCallback_var callback_; diff --git a/TAO/tests/Bug_3768_Regression/server.cpp b/TAO/tests/Bug_3768_Regression/server.cpp index 2cdabc37c7d..4c4913109f1 100644 --- a/TAO/tests/Bug_3768_Regression/server.cpp +++ b/TAO/tests/Bug_3768_Regression/server.cpp @@ -12,7 +12,7 @@ public: { } - int svc(void) + int svc() { orb_->run(); return 0; diff --git a/TAO/tests/Bug_3790_Regression/simple_test_i.cpp b/TAO/tests/Bug_3790_Regression/simple_test_i.cpp index ff2df5d99e8..a2f552b0d77 100644 --- a/TAO/tests/Bug_3790_Regression/simple_test_i.cpp +++ b/TAO/tests/Bug_3790_Regression/simple_test_i.cpp @@ -7,7 +7,7 @@ Simple_Test_i::Simple_Test_i (CORBA::ORB_ptr orb) } void -Simple_Test_i::shutdown (void) +Simple_Test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3790_Regression/simple_test_i.h b/TAO/tests/Bug_3790_Regression/simple_test_i.h index 9918438def1..f005511d554 100644 --- a/TAO/tests/Bug_3790_Regression/simple_test_i.h +++ b/TAO/tests/Bug_3790_Regression/simple_test_i.h @@ -12,7 +12,7 @@ public: Simple_Test_i (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Bug_3801_Regression/ami_test_i.cpp b/TAO/tests/Bug_3801_Regression/ami_test_i.cpp index c01e37c4f96..63fb1d391e3 100644 --- a/TAO/tests/Bug_3801_Regression/ami_test_i.cpp +++ b/TAO/tests/Bug_3801_Regression/ami_test_i.cpp @@ -27,13 +27,13 @@ AMI_Test_i::inout_arg_test (char *&) } 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")); @@ -49,7 +49,7 @@ AMI_Test_i::yadda (CORBA::Long) } CORBA::Long -AMI_Test_i::dadda (void) +AMI_Test_i::dadda () { ACE_DEBUG ((LM_DEBUG, "%N:%l:(%P:%t):AMI_Test_i::(get_)dadda\n")); diff --git a/TAO/tests/Bug_3801_Regression/ami_test_i.h b/TAO/tests/Bug_3801_Regression/ami_test_i.h index 629f53a90f1..965d9e20481 100644 --- a/TAO/tests/Bug_3801_Regression/ami_test_i.h +++ b/TAO/tests/Bug_3801_Regression/ami_test_i.h @@ -26,13 +26,13 @@ public: /// ctor AMI_Test_i (CORBA::ORB_ptr orb); - void shutdown (void); + void shutdown (); - CORBA::Long yadda (void); + CORBA::Long yadda (); void yadda (CORBA::Long yadda); - CORBA::Long dadda (void); + CORBA::Long dadda (); void inout_arg_test (char *& str); diff --git a/TAO/tests/Bug_3801_Regression/simple_client.cpp b/TAO/tests/Bug_3801_Regression/simple_client.cpp index 94dd6d6b5c8..e40529c1a86 100644 --- a/TAO/tests/Bug_3801_Regression/simple_client.cpp +++ b/TAO/tests/Bug_3801_Regression/simple_client.cpp @@ -105,7 +105,7 @@ public: } }; - void set_yadda (void) + void set_yadda () { ACE_ERROR ((LM_ERROR, "Error: Callback method <set_yadda> called:\n")); diff --git a/TAO/tests/Bug_3827_Regression/test.cpp b/TAO/tests/Bug_3827_Regression/test.cpp index 1a8ebec6c85..94b828523ba 100644 --- a/TAO/tests/Bug_3827_Regression/test.cpp +++ b/TAO/tests/Bug_3827_Regression/test.cpp @@ -12,7 +12,7 @@ public: { } - virtual int svc (void) + virtual int svc () { try { @@ -38,7 +38,7 @@ public: { } - virtual int svc (void) + virtual int svc () { try { diff --git a/TAO/tests/Bug_3837_Regression/Hello.cpp b/TAO/tests/Bug_3837_Regression/Hello.cpp index 0d000b9f195..bdfcac050fb 100644 --- a/TAO/tests/Bug_3837_Regression/Hello.cpp +++ b/TAO/tests/Bug_3837_Regression/Hello.cpp @@ -6,13 +6,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/tests/Bug_3837_Regression/Hello.h b/TAO/tests/Bug_3837_Regression/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/Bug_3837_Regression/Hello.h +++ b/TAO/tests/Bug_3837_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/tests/Bug_3853_Regression/Hello_i.cpp b/TAO/tests/Bug_3853_Regression/Hello_i.cpp index f168b54de74..6c66d595335 100644 --- a/TAO/tests/Bug_3853_Regression/Hello_i.cpp +++ b/TAO/tests/Bug_3853_Regression/Hello_i.cpp @@ -8,7 +8,7 @@ Demo_HelloWorld_i::Demo_HelloWorld_i (CORBA::ORB_ptr orb) } // Implementation skeleton destructor -Demo_HelloWorld_i::~Demo_HelloWorld_i (void) +Demo_HelloWorld_i::~Demo_HelloWorld_i () { } diff --git a/TAO/tests/Bug_3853_Regression/Hello_i.h b/TAO/tests/Bug_3853_Regression/Hello_i.h index f7f361d02f1..9e46919a57f 100644 --- a/TAO/tests/Bug_3853_Regression/Hello_i.h +++ b/TAO/tests/Bug_3853_Regression/Hello_i.h @@ -16,7 +16,7 @@ public: Demo_HelloWorld_i (CORBA::ORB_ptr orb); // Destructor - virtual ~Demo_HelloWorld_i (void); + virtual ~Demo_HelloWorld_i (); virtual void sayHello (const char * msg); diff --git a/TAO/tests/Bug_3853_Regression/client.cpp b/TAO/tests/Bug_3853_Regression/client.cpp index a64e66818c1..9b9b3686862 100644 --- a/TAO/tests/Bug_3853_Regression/client.cpp +++ b/TAO/tests/Bug_3853_Regression/client.cpp @@ -29,7 +29,7 @@ public: ClientTask () {}; ~ ClientTask () {}; - virtual int svc (void) + virtual int svc () { CORBA::Object_var helloObj = orb->string_to_object(server1_ior); diff --git a/TAO/tests/Bug_3853_Regression/client_interceptor.cpp b/TAO/tests/Bug_3853_Regression/client_interceptor.cpp index 897099b003f..3a452de7465 100644 --- a/TAO/tests/Bug_3853_Regression/client_interceptor.cpp +++ b/TAO/tests/Bug_3853_Regression/client_interceptor.cpp @@ -16,18 +16,18 @@ Echo_Client_Request_Interceptor () { } -Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) +Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () { } char * -Echo_Client_Request_Interceptor::name (void) +Echo_Client_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (void) +Echo_Client_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Bug_3853_Regression/client_interceptor.h b/TAO/tests/Bug_3853_Regression/client_interceptor.h index 2042b5f9872..d6524e1e8a5 100644 --- a/TAO/tests/Bug_3853_Regression/client_interceptor.h +++ b/TAO/tests/Bug_3853_Regression/client_interceptor.h @@ -28,10 +28,10 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); diff --git a/TAO/tests/Bug_3896_Regression/Hello.cpp b/TAO/tests/Bug_3896_Regression/Hello.cpp index 1222840c1fc..8a95efcae15 100644 --- a/TAO/tests/Bug_3896_Regression/Hello.cpp +++ b/TAO/tests/Bug_3896_Regression/Hello.cpp @@ -7,7 +7,7 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (void) +Hello::get_string () { ACE_OS::sleep (10); @@ -15,7 +15,7 @@ Hello::get_string (void) } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3896_Regression/Hello.h b/TAO/tests/Bug_3896_Regression/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/Bug_3896_Regression/Hello.h +++ b/TAO/tests/Bug_3896_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/tests/Bug_3896_Regression/client.cpp b/TAO/tests/Bug_3896_Regression/client.cpp index 2f09cc510f4..5916bee8932 100644 --- a/TAO/tests/Bug_3896_Regression/client.cpp +++ b/TAO/tests/Bug_3896_Regression/client.cpp @@ -143,7 +143,7 @@ Client::Client (CORBA::ORB_ptr orb) } int -Client::svc (void) +Client::svc () { try { diff --git a/TAO/tests/Bug_3919_Regression/Hello.cpp b/TAO/tests/Bug_3919_Regression/Hello.cpp index b1013a6061c..82d4b4724db 100644 --- a/TAO/tests/Bug_3919_Regression/Hello.cpp +++ b/TAO/tests/Bug_3919_Regression/Hello.cpp @@ -19,7 +19,7 @@ Hello::get_any (CORBA::Any const & the_any) void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3919_Regression/Hello.h b/TAO/tests/Bug_3919_Regression/Hello.h index d8ef497e2e9..97d878316d8 100644 --- a/TAO/tests/Bug_3919_Regression/Hello.h +++ b/TAO/tests/Bug_3919_Regression/Hello.h @@ -26,7 +26,7 @@ public: // Return the any provide as an "in" argument. virtual CORBA::Any * get_any (CORBA::Any const & the_any); - virtual void shutdown (void); + virtual void shutdown (); private: /// The ORB which will be shutdown by Hello::shutdown(). diff --git a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp index bb010e4f324..b47883250cc 100644 --- a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp +++ b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.cpp @@ -21,7 +21,7 @@ Client_Request_Interceptor::name () } void -Client_Request_Interceptor::destroy (void) +Client_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h index 1a9705658c9..89c14c6f499 100644 --- a/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h +++ b/TAO/tests/Bug_3926_Regression/Client_Request_Interceptor.h @@ -33,9 +33,9 @@ public: */ //@{ /// Return the name of this ClientRequestinterceptor. - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void send_request ( PortableInterceptor::ClientRequestInfo_ptr ri); diff --git a/TAO/tests/Bug_3926_Regression/test_i.cpp b/TAO/tests/Bug_3926_Regression/test_i.cpp index ba410931390..aae2649e9ca 100644 --- a/TAO/tests/Bug_3926_Regression/test_i.cpp +++ b/TAO/tests/Bug_3926_Regression/test_i.cpp @@ -8,12 +8,12 @@ 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 () { ++this->number_; if (this->number_ == 3) @@ -35,7 +35,7 @@ test_i::number (void) } void -test_i::shutdown (void) +test_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "SERVER: Server is shutting down at %d.\n", diff --git a/TAO/tests/Bug_3926_Regression/test_i.h b/TAO/tests/Bug_3926_Regression/test_i.h index 9012612ca85..84d1a0fc050 100644 --- a/TAO/tests/Bug_3926_Regression/test_i.h +++ b/TAO/tests/Bug_3926_Regression/test_i.h @@ -31,13 +31,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/tests/Bug_3953_Regression/client.cpp b/TAO/tests/Bug_3953_Regression/client.cpp index 111fda81010..096b1866420 100644 --- a/TAO/tests/Bug_3953_Regression/client.cpp +++ b/TAO/tests/Bug_3953_Regression/client.cpp @@ -19,7 +19,7 @@ class Client_Task public: Client_Task (client_ptr c, server_ptr s); - int svc (void); + int svc (); bool exception () const; @@ -36,7 +36,7 @@ Client_Task::Client_Task (client_ptr c, } int -Client_Task::svc (void) +Client_Task::svc () { try { diff --git a/TAO/tests/Bug_3953_Regression/server.cpp b/TAO/tests/Bug_3953_Regression/server.cpp index 61e4e94f853..bc99303785f 100644 --- a/TAO/tests/Bug_3953_Regression/server.cpp +++ b/TAO/tests/Bug_3953_Regression/server.cpp @@ -17,7 +17,7 @@ class Server_Task : public ACE_Task_Base { public: Server_Task (CORBA::ORB_ptr orb); - int svc (void); + int svc (); private: CORBA::ORB_var orb_; @@ -29,7 +29,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb) } int -Server_Task::svc (void) +Server_Task::svc () { try { diff --git a/TAO/tests/Bug_3953_Regression/server_i.cpp b/TAO/tests/Bug_3953_Regression/server_i.cpp index 438203edd7f..5622dd31ddf 100644 --- a/TAO/tests/Bug_3953_Regression/server_i.cpp +++ b/TAO/tests/Bug_3953_Regression/server_i.cpp @@ -48,7 +48,7 @@ server_i::ping (CORBA::UShort time_to_live) } void -server_i::shutdown (void) +server_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_3953_Regression/server_i.h b/TAO/tests/Bug_3953_Regression/server_i.h index 7aa8275ab28..1ffab0f9437 100644 --- a/TAO/tests/Bug_3953_Regression/server_i.h +++ b/TAO/tests/Bug_3953_Regression/server_i.h @@ -11,7 +11,7 @@ public: void start (client_ptr c, CORBA::UShort time_to_live); - void shutdown (void); + void shutdown (); bool exception () const; private: diff --git a/TAO/tests/Bug_3954_Regression/Hello.cpp b/TAO/tests/Bug_3954_Regression/Hello.cpp index 0d000b9f195..bdfcac050fb 100644 --- a/TAO/tests/Bug_3954_Regression/Hello.cpp +++ b/TAO/tests/Bug_3954_Regression/Hello.cpp @@ -6,13 +6,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/tests/Bug_3954_Regression/Hello.h b/TAO/tests/Bug_3954_Regression/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/Bug_3954_Regression/Hello.h +++ b/TAO/tests/Bug_3954_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/tests/Bug_4010_Regression/Hello.cpp b/TAO/tests/Bug_4010_Regression/Hello.cpp index 0d000b9f195..bdfcac050fb 100644 --- a/TAO/tests/Bug_4010_Regression/Hello.cpp +++ b/TAO/tests/Bug_4010_Regression/Hello.cpp @@ -6,13 +6,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/tests/Bug_4010_Regression/Hello.h b/TAO/tests/Bug_4010_Regression/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/Bug_4010_Regression/Hello.h +++ b/TAO/tests/Bug_4010_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/tests/Bug_4059_Regression/Hello.cpp b/TAO/tests/Bug_4059_Regression/Hello.cpp index 0d000b9f195..bdfcac050fb 100644 --- a/TAO/tests/Bug_4059_Regression/Hello.cpp +++ b/TAO/tests/Bug_4059_Regression/Hello.cpp @@ -6,13 +6,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/tests/Bug_4059_Regression/Hello.h b/TAO/tests/Bug_4059_Regression/Hello.h index c39a60042d7..1d85db44633 100644 --- a/TAO/tests/Bug_4059_Regression/Hello.h +++ b/TAO/tests/Bug_4059_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 conver strings to objects and shutdown diff --git a/TAO/tests/Bug_4213_Regression/Hello.cpp b/TAO/tests/Bug_4213_Regression/Hello.cpp index 0d000b9f195..bdfcac050fb 100644 --- a/TAO/tests/Bug_4213_Regression/Hello.cpp +++ b/TAO/tests/Bug_4213_Regression/Hello.cpp @@ -6,13 +6,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/tests/Bug_4213_Regression/Hello.h b/TAO/tests/Bug_4213_Regression/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/Bug_4213_Regression/Hello.h +++ b/TAO/tests/Bug_4213_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/tests/Bug_933_Regression/Messenger_i.cpp b/TAO/tests/Bug_933_Regression/Messenger_i.cpp index 716c221810b..5c6be02450b 100644 --- a/TAO/tests/Bug_933_Regression/Messenger_i.cpp +++ b/TAO/tests/Bug_933_Regression/Messenger_i.cpp @@ -6,7 +6,7 @@ Messenger_i::Messenger_i (CORBA::ORB_ptr orb) { } -Messenger_i::~Messenger_i (void) +Messenger_i::~Messenger_i () { } @@ -52,7 +52,7 @@ Messenger_i::send_message (const CORBA::OctetSeq & user_name) } void -Messenger_i::shutdown (void) +Messenger_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Bug_933_Regression/Messenger_i.h b/TAO/tests/Bug_933_Regression/Messenger_i.h index d68b1b52673..7fde917d017 100644 --- a/TAO/tests/Bug_933_Regression/Messenger_i.h +++ b/TAO/tests/Bug_933_Regression/Messenger_i.h @@ -13,11 +13,11 @@ class Messenger_i : public virtual POA_Messenger public: Messenger_i (CORBA::ORB_ptr orb); - virtual ~Messenger_i (void); + virtual ~Messenger_i (); virtual void send_message (const CORBA::OctetSeq & user_name); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown /// the application. diff --git a/TAO/tests/CDR/allocator.cpp b/TAO/tests/CDR/allocator.cpp index 5ff11f23e7b..cb1b4c686de 100644 --- a/TAO/tests/CDR/allocator.cpp +++ b/TAO/tests/CDR/allocator.cpp @@ -40,7 +40,7 @@ public: int max_fragment_size); /// Destructor, releases any memory left behind. - ~Application_Simulator (void); + ~Application_Simulator (); /** * Simulate an upcall. The class allocates some memory and then @@ -214,7 +214,7 @@ Application_Simulator::Application_Simulator (int max_fragments, *i = 0; } -Application_Simulator::~Application_Simulator (void) +Application_Simulator::~Application_Simulator () { for (char** i = this->buffers_; i != this->buffers_ + this->max_fragments_; diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp index b698505919f..e804c73abb2 100644 --- a/TAO/tests/CDR/basic_types.cpp +++ b/TAO/tests/CDR/basic_types.cpp @@ -24,7 +24,7 @@ static int nloops = 100; struct CDR_Test_Types { - CDR_Test_Types (void); + CDR_Test_Types (); CORBA::Octet o; CORBA::Short s; @@ -40,7 +40,7 @@ struct CDR_Test_Types CORBA::Short a[ARRAY_SIZE]; }; -CDR_Test_Types::CDR_Test_Types (void) +CDR_Test_Types::CDR_Test_Types () : o (1), s (2), l (4), str ("abc"), d (8) { diff --git a/TAO/tests/COIOP/Client_Task.cpp b/TAO/tests/COIOP/Client_Task.cpp index 820404f4721..eca3d47e0bd 100644 --- a/TAO/tests/COIOP/Client_Task.cpp +++ b/TAO/tests/COIOP/Client_Task.cpp @@ -15,7 +15,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { try { diff --git a/TAO/tests/COIOP/Client_Task.h b/TAO/tests/COIOP/Client_Task.h index 6246c8e12c6..6d28b35b980 100644 --- a/TAO/tests/COIOP/Client_Task.h +++ b/TAO/tests/COIOP/Client_Task.h @@ -21,7 +21,7 @@ public: CORBA::Boolean result); /// Thread entry point - int svc (void); + int svc (); private: const ACE_TCHAR *input_; diff --git a/TAO/tests/COIOP/Hello.cpp b/TAO/tests/COIOP/Hello.cpp index 5874626a298..baa9705bec3 100644 --- a/TAO/tests/COIOP/Hello.cpp +++ b/TAO/tests/COIOP/Hello.cpp @@ -13,7 +13,7 @@ Hello::Hello (CORBA::ORB_ptr orb, } char * -Hello::get_string (void) +Hello::get_string () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Upcall in process ..\n")); @@ -56,7 +56,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/tests/COIOP/Hello.h b/TAO/tests/COIOP/Hello.h index 043a6968853..e9c0f470f49 100644 --- a/TAO/tests/COIOP/Hello.h +++ b/TAO/tests/COIOP/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/tests/COIOP/Server_Task.cpp b/TAO/tests/COIOP/Server_Task.cpp index 04abb027a27..5461b87cf73 100644 --- a/TAO/tests/COIOP/Server_Task.cpp +++ b/TAO/tests/COIOP/Server_Task.cpp @@ -17,7 +17,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output, } int -Server_Task::svc (void) +Server_Task::svc () { try { diff --git a/TAO/tests/COIOP/Server_Task.h b/TAO/tests/COIOP/Server_Task.h index cea47faeb95..9f6a4ffa912 100644 --- a/TAO/tests/COIOP/Server_Task.h +++ b/TAO/tests/COIOP/Server_Task.h @@ -27,7 +27,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Output file for IOR diff --git a/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp b/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp index d4c95c9aba1..eb85df7cc27 100644 --- a/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp +++ b/TAO/tests/CORBA_e_Implicit_Activation/Hello.cpp @@ -1,5 +1,5 @@ #include "Hello.h" -Hello::Hello (void) +Hello::Hello () { } diff --git a/TAO/tests/CORBA_e_Implicit_Activation/Hello.h b/TAO/tests/CORBA_e_Implicit_Activation/Hello.h index a2a5be4ab2d..3a8204314ae 100644 --- a/TAO/tests/CORBA_e_Implicit_Activation/Hello.h +++ b/TAO/tests/CORBA_e_Implicit_Activation/Hello.h @@ -11,7 +11,7 @@ class Hello { public: /// Constructor - Hello (void); + Hello (); }; #include /**/ "ace/post.h" diff --git a/TAO/tests/CSD_Collocation/Collocation_Tester.cpp b/TAO/tests/CSD_Collocation/Collocation_Tester.cpp index 6220eeda46c..4eb32c3e5a6 100644 --- a/TAO/tests/CSD_Collocation/Collocation_Tester.cpp +++ b/TAO/tests/CSD_Collocation/Collocation_Tester.cpp @@ -13,12 +13,12 @@ #include "Collocation_Tester.h" -Collocation_Test::Collocation_Test (void) +Collocation_Test::Collocation_Test () { } void -Collocation_Test::shutdown (void) +Collocation_Test::shutdown () { this->root_poa_->destroy (1, 1); this->orb_->destroy (); @@ -102,7 +102,7 @@ Collocation_Test::parse_args (int /*argc*/, } int -Collocation_Test::test_narrow (void) +Collocation_Test::test_narrow () { Diamond::Top_var top = Diamond::Top::_narrow (this->diamond_obj_.in ()); @@ -132,7 +132,7 @@ Collocation_Test::test_narrow (void) } int -Collocation_Test::run (void) +Collocation_Test::run () { this->poa_manager_->activate (); diff --git a/TAO/tests/CSD_Collocation/Collocation_Tester.h b/TAO/tests/CSD_Collocation/Collocation_Tester.h index 0f9650b9d2b..03fcf224538 100644 --- a/TAO/tests/CSD_Collocation/Collocation_Tester.h +++ b/TAO/tests/CSD_Collocation/Collocation_Tester.h @@ -22,9 +22,9 @@ class Collocation_Test { public: - Collocation_Test (void); + Collocation_Test (); - void shutdown (void); + void shutdown (); /// Initializing the Collocation_Test object. int init (int argc, ACE_TCHAR *argv[]); @@ -34,10 +34,10 @@ public: /// This test narrow an object reference to its base class and see /// if it works correctly. - int test_narrow (void); + int test_narrow (); /// Run the test. - int run (void); + int run (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/CSD_Collocation/Diamond_i.cpp b/TAO/tests/CSD_Collocation/Diamond_i.cpp index 8210bbff906..2f0b46d5406 100644 --- a/TAO/tests/CSD_Collocation/Diamond_i.cpp +++ b/TAO/tests/CSD_Collocation/Diamond_i.cpp @@ -9,7 +9,7 @@ Top_i::~Top_i () } char * -Top_i::shape (void) +Top_i::shape () { return CORBA::string_dup ("a point."); } @@ -25,13 +25,13 @@ Left_i::~Left_i () } char * -Left_i::shape (void) +Left_i::shape () { return CORBA::string_dup ("the left line"); } char * -Left_i::color (void) +Left_i::color () { return CORBA::string_dup ("black"); } @@ -45,20 +45,20 @@ Right_i::~Right_i () } char * -Right_i::shape (void) +Right_i::shape () { return CORBA::string_dup ("the right line"); } char * -Right_i::color (void) +Right_i::color () { return CORBA::string_dup ("red"); // } CORBA::Long -Right_i::width (void) +Right_i::width () { return 0; } @@ -72,26 +72,26 @@ Buttom_i::~Buttom_i () } char * -Buttom_i::shape (void) +Buttom_i::shape () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) In servant\n")); return CORBA::string_dup ("a diamond"); } char * -Buttom_i::color (void) +Buttom_i::color () { return CORBA::string_dup ("translucent"); } CORBA::Long -Buttom_i::width (void) +Buttom_i::width () { return 100; } char * -Buttom_i::name (void) +Buttom_i::name () { return CORBA::string_dup ("Jubilee"); } diff --git a/TAO/tests/CSD_Collocation/Diamond_i.h b/TAO/tests/CSD_Collocation/Diamond_i.h index 9c40c7fe247..f4f21c6fa5e 100644 --- a/TAO/tests/CSD_Collocation/Diamond_i.h +++ b/TAO/tests/CSD_Collocation/Diamond_i.h @@ -11,62 +11,62 @@ class Top_i : public POA_Diamond::Top { public: - Top_i (void); - ~Top_i (void); + Top_i (); + ~Top_i (); // Ctor and dtor. - virtual char * shape (void); + virtual char * shape (); // Return the shape of this object (interface.) }; class Left_i : public POA_Diamond::Left { public: - Left_i (void); - ~Left_i (void); + Left_i (); + ~Left_i (); // Ctor, dtor. - virtual char * shape (void); + virtual char * shape (); // Return the shape of this object (interface.) - virtual char * color (void); + virtual char * color (); // Return the color of this object (interface.) }; class Right_i : public POA_Diamond::Right { public: - Right_i (void); - ~Right_i (void); + Right_i (); + ~Right_i (); // Ctor, dtor. - virtual char * shape (void); + virtual char * shape (); // Return the shape of this object (interface.) - virtual char * color (void); + virtual char * color (); // Return the color of this object (interface.) - virtual CORBA::Long width (void); + virtual CORBA::Long width (); // Return the width of the stuff. }; class Buttom_i : public POA_Diamond::Buttom { public: - Buttom_i (void); - ~Buttom_i (void); + Buttom_i (); + ~Buttom_i (); // Ctor, dtor. - virtual char * shape (void); + virtual char * shape (); // Return the shape of this object (interface.) - virtual char * color (void); + virtual char * color (); // Return the color of this object (interface.) - virtual CORBA::Long width (void); + virtual CORBA::Long width (); // Return the width of the stuff. - virtual char * name (void); + virtual char * name (); // Return the name of the object. }; diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp index b9ae2cb7e37..9890f024599 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp @@ -78,7 +78,7 @@ ClientApp::init(int argc, ACE_TCHAR* argv[]) void -ClientApp::poa_setup(void) +ClientApp::poa_setup() { this->poa_ = this->create_poa(this->orb_.in(), "ChildPoa"); @@ -86,7 +86,7 @@ ClientApp::poa_setup(void) void -ClientApp::csd_setup(void) +ClientApp::csd_setup() { this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_); @@ -100,7 +100,7 @@ ClientApp::csd_setup(void) void -ClientApp::client_setup(void) +ClientApp::client_setup() { // Turn the ior_ into a Foo_B obj ref. Foo_B_var foo = RefHelper<Foo_B>::string_to_ref(this->orb_.in(), @@ -119,7 +119,7 @@ ClientApp::client_setup(void) void -ClientApp::poa_activate(void) +ClientApp::poa_activate() { PortableServer::POAManager_var poa_manager = this->poa_->the_POAManager(); @@ -128,7 +128,7 @@ ClientApp::poa_activate(void) void -ClientApp::run_clients(void) +ClientApp::run_clients() { if (this->client_task_.open() != 0) { @@ -138,7 +138,7 @@ ClientApp::run_clients(void) void -ClientApp::run_orb_event_loop(void) +ClientApp::run_orb_event_loop() { OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_); orb_runner.run(); diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h index f6945669a44..8160a063995 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h @@ -24,12 +24,12 @@ class ClientApp : public TestAppBase private: // These are all called, in order, by the run_i() method. int init(int argc, ACE_TCHAR* argv[]); - void poa_setup(void); - void csd_setup(void); - void client_setup(void); - void poa_activate(void); - void run_clients(void); - void run_orb_event_loop(void); + void poa_setup(); + void csd_setup(); + void client_setup(); + void poa_activate(); + void run_clients(); + void run_orb_event_loop(); bool check_validity (); void cleanup(); diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp index ea45b56328d..c113ed46009 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp @@ -82,7 +82,7 @@ ServerApp::init(int argc, ACE_TCHAR* argv[]) void -ServerApp::poa_setup(void) +ServerApp::poa_setup() { this->poa_ = this->create_poa(this->orb_.in(), "ChildPoa"); @@ -95,7 +95,7 @@ ServerApp::poa_setup(void) } void -ServerApp::csd_setup(void) +ServerApp::csd_setup() { this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_); @@ -131,7 +131,7 @@ ServerApp::csd_setup(void) void -ServerApp::servant_setup(void) +ServerApp::servant_setup() { this->foo_servants_.create_and_activate(this->num_servants_, this->orb_.in (), @@ -141,7 +141,7 @@ ServerApp::servant_setup(void) void -ServerApp::collocated_setup(void) +ServerApp::collocated_setup() { if (this->num_collocated_clients_ == 0) return; @@ -169,7 +169,7 @@ ServerApp::collocated_setup(void) void -ServerApp::poa_activate(void) +ServerApp::poa_activate() { PortableServer::POAManager_var poa_manager = this->poa_->the_POAManager(); @@ -178,7 +178,7 @@ ServerApp::poa_activate(void) void -ServerApp::run_collocated_clients(void) +ServerApp::run_collocated_clients() { if (this->num_collocated_clients_ > 0) { @@ -191,7 +191,7 @@ ServerApp::run_collocated_clients(void) void -ServerApp::run_orb_event_loop(void) +ServerApp::run_orb_event_loop() { OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_); orb_runner.run(); diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h index ea516b3b6c7..0465ad64294 100644 --- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h @@ -24,13 +24,13 @@ class ServerApp : public TestAppBase private: // These are all called, in order, by the run_i() method. int init(int argc, ACE_TCHAR* argv[]); - void poa_setup(void); - void csd_setup(void); - void servant_setup(void); - void collocated_setup(void); - void poa_activate(void); - void run_collocated_clients(void); - void run_orb_event_loop(void); + void poa_setup(); + void csd_setup(); + void servant_setup(); + void collocated_setup(); + void poa_activate(); + void run_collocated_clients(); + void run_orb_event_loop(); bool check_validity (); void cleanup(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp index 4284e163ee8..bde60f3b110 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp @@ -16,7 +16,7 @@ OrbRunner::~OrbRunner() void -OrbRunner::run(void) +OrbRunner::run() { ACE_ASSERT(this->num_orb_threads_ > 0); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp index 6b776551fd7..b621080eedd 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp @@ -20,7 +20,7 @@ Foo_A_ClientEngine::~Foo_A_ClientEngine() bool -Foo_A_ClientEngine::execute(void) +Foo_A_ClientEngine::execute() { // Make sure the connection is established before making // remote invocations. diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h index 0eb354a8060..6b9a1eb3af1 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h @@ -21,7 +21,7 @@ public: Foo_A_ClientEngine(Foo_A_ptr obj, unsigned client_id = 0, bool collocated = false); virtual ~Foo_A_ClientEngine(); - virtual bool execute(void); + virtual bool execute(); static void expected_results(Foo_A_Statistics& stats); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp index c6b4504db22..ac1805dcc8e 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp @@ -17,7 +17,7 @@ Foo_A_i::~Foo_A_i() void -Foo_A_i::op1(void) +Foo_A_i::op1() { this->op_count_[0] ++; } @@ -49,7 +49,7 @@ Foo_A_i::op4(CORBA::Long value) void -Foo_A_i::op5(void) +Foo_A_i::op5() { this->op_count_[4] ++; throw FooException(); @@ -57,7 +57,7 @@ Foo_A_i::op5(void) void -Foo_A_i::done(void) +Foo_A_i::done() { TheAppShutdown->client_done(); } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h index f8e23bf4d2f..3ca06469c0b 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h @@ -12,7 +12,7 @@ class CSD_TP_Foo_A_Export Foo_A_i : public virtual POA_Foo_A Foo_A_i(); virtual ~Foo_A_i(); - virtual void op1(void); + virtual void op1(); virtual void op2(CORBA::Long value); @@ -20,9 +20,9 @@ class CSD_TP_Foo_A_Export Foo_A_i : public virtual POA_Foo_A virtual void op4(CORBA::Long value); - virtual void op5(void); + virtual void op5(); - virtual void done(void); + virtual void done(); void gather_stats (Foo_A_Statistics& stats) ; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp index 2a43feb4f6d..7e881300082 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp @@ -12,7 +12,7 @@ Callback_i::~Callback_i () void -Callback_i::test_method(void) +Callback_i::test_method() { this->num_callbacks_ ++; } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h index 5c71583bdd4..7ae01e2ec5d 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h @@ -14,7 +14,7 @@ class CSD_TP_Foo_B_Export Callback_i virtual ~Callback_i(); - virtual void test_method(void); + virtual void test_method(); void gather_stats(Foo_B_Statistics& stats); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp index 6592f5b0720..ae331669663 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp @@ -25,7 +25,7 @@ Foo_B_ClientEngine::~Foo_B_ClientEngine() bool -Foo_B_ClientEngine::execute(void) +Foo_B_ClientEngine::execute() { // Make sure the connection is established before making // remote invocations. diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h index 72731110b59..d95eb496f4c 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h @@ -26,7 +26,7 @@ public: virtual ~Foo_B_ClientEngine(); - virtual bool execute(void); + virtual bool execute(); static void expected_results(Foo_B_Statistics& stats); static unsigned expected_callbacks (); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp index b6d215e0a94..0e1fad1a160 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp @@ -25,7 +25,7 @@ Foo_B_SimpleClientEngine::~Foo_B_SimpleClientEngine() bool -Foo_B_SimpleClientEngine::execute(void) +Foo_B_SimpleClientEngine::execute() { // Make sure the connection is established before making // remote invocations. diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h index e64bad650d9..8f77c6295e3 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h @@ -26,7 +26,7 @@ public: virtual ~Foo_B_SimpleClientEngine(); - virtual bool execute(void); + virtual bool execute(); static void expected_results(Foo_B_Statistics& stats); static unsigned expected_callbacks (); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp index 151dda93167..cb804eac88b 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp @@ -19,7 +19,7 @@ Foo_B_i::~Foo_B_i() void -Foo_B_i::op1(void) +Foo_B_i::op1() { this->op_count_[0] ++; } @@ -51,7 +51,7 @@ Foo_B_i::op4(CORBA::Long value) void -Foo_B_i::op5(void) +Foo_B_i::op5() { this->op_count_[4] ++; throw FooException(); @@ -245,7 +245,7 @@ Foo_B_i::test_objref_arg(Callback_ptr cb) void -Foo_B_i::done(void) +Foo_B_i::done() { TheAppShutdown->client_done(); } diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h index e2b37b7f0c8..0de419f732b 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h @@ -12,7 +12,7 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B Foo_B_i(); virtual ~Foo_B_i(); - virtual void op1(void); + virtual void op1(); virtual void op2(CORBA::Long value); @@ -20,7 +20,7 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B virtual void op4(CORBA::Long value); - virtual void op5(void); + virtual void op5(); virtual CORBA::Boolean op6(const TimeOfDay& t, char*& message); @@ -46,7 +46,7 @@ class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B virtual void test_objref_arg(Callback_ptr cb); - virtual void done(void); + virtual void done(); void gather_stats (Foo_B_Statistics& stats); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp index 3b66b5e29c9..82fe2c2df57 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp @@ -17,7 +17,7 @@ Foo_C_ClientEngine::~Foo_C_ClientEngine() bool -Foo_C_ClientEngine::execute(void) +Foo_C_ClientEngine::execute() { // Verify the return values and return the results. bool check_validity = true; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h index 245c72fc54a..8b741fb83e3 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h @@ -21,7 +21,7 @@ public: unsigned client_id); virtual ~Foo_C_ClientEngine(); - virtual bool execute(void); + virtual bool execute(); static void expected_results(Foo_C_Statistics& stats); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp index 8d717ec510d..99fb50a8818 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp @@ -20,7 +20,7 @@ Foo_C_Custom_ClientEngine::~Foo_C_Custom_ClientEngine() bool -Foo_C_Custom_ClientEngine::execute(void) +Foo_C_Custom_ClientEngine::execute() { // Make sure the connection is established before making // remote invocations. diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h index 6ef663ec30a..8ac8c275817 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h @@ -22,7 +22,7 @@ public: unsigned client_id); virtual ~Foo_C_Custom_ClientEngine(); - virtual bool execute(void); + virtual bool execute(); static void expected_results(Foo_C_Statistics& stats); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp index b33c12bfa71..1166864d62e 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp @@ -50,7 +50,7 @@ Foo_C_Custom_Proxy::validate_connection () void -Foo_C_Custom_Proxy::op1(void) +Foo_C_Custom_Proxy::op1() { this->objref_->op1(); } @@ -79,21 +79,21 @@ Foo_C_Custom_Proxy::op4(CORBA::Long x) void -Foo_C_Custom_Proxy::op5(void) +Foo_C_Custom_Proxy::op5() { this->objref_->op5(); } void -Foo_C_Custom_Proxy::done(void) +Foo_C_Custom_Proxy::done() { this->objref_->done(); } void -Foo_C_Custom_Proxy::cust_op1(void) +Foo_C_Custom_Proxy::cust_op1() { Foo_C_cust_op1_Handle op = new Foo_C_cust_op1(this->servant_); this->strategy_->custom_synch_request(op.in()); @@ -127,7 +127,7 @@ Foo_C_Custom_Proxy::cust_op4(long x) void -Foo_C_Custom_Proxy::cust_op5(void) +Foo_C_Custom_Proxy::cust_op5() { Foo_C_cust_op5_Handle op = new Foo_C_cust_op5(this->servant_); this->strategy_->custom_synch_request(op.in()); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h index 3c82dd0f15a..7b61e19797b 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h @@ -24,18 +24,18 @@ public: bool validate_connection (); - void op1(void); + void op1(); void op2(CORBA::Long x); CORBA::Long op3(CORBA::Long x); void op4(CORBA::Long x); - void op5(void); - void done(void); + void op5(); + void done(); - void cust_op1(void); + void cust_op1(); void cust_op2(long x); long cust_op3(long x); void cust_op4(long x); - void cust_op5(void); + void cust_op5(); private: Foo_C_i* servant_; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp index 7d20b104616..fc1a91f1b9a 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp @@ -37,7 +37,7 @@ Foo_C_cust_op1::~Foo_C_cust_op1() void -Foo_C_cust_op1::result(void) +Foo_C_cust_op1::result() { if (this->cancelled_) { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h index 27475bb4a78..13dcab071a1 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h @@ -24,7 +24,7 @@ public: Foo_C_cust_op1(Foo_C_i* servant); virtual ~Foo_C_cust_op1(); - void result(void); + void result(); protected: virtual void execute_i(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp index 7a6933c5dfd..aa33a3a1e26 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp @@ -38,7 +38,7 @@ Foo_C_cust_op2::~Foo_C_cust_op2() void -Foo_C_cust_op2::result(void) +Foo_C_cust_op2::result() { if (this->cancelled_) { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h index f26caa26e60..02532c8b036 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h @@ -24,7 +24,7 @@ public: Foo_C_cust_op2(Foo_C_i* servant, long arg); virtual ~Foo_C_cust_op2(); - void result(void); + void result(); protected: virtual void execute_i(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp index 33d68371a87..03699cae58b 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp @@ -39,7 +39,7 @@ Foo_C_cust_op3::~Foo_C_cust_op3() long -Foo_C_cust_op3::result(void) +Foo_C_cust_op3::result() { if (this->cancelled_) { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h index 61a034eb086..71c8931da96 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h @@ -24,7 +24,7 @@ public: Foo_C_cust_op3(Foo_C_i* servant, long arg); virtual ~Foo_C_cust_op3(); - long result(void); + long result(); protected: virtual void execute_i(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp index 134cf755d07..45ee80c72ca 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp @@ -39,7 +39,7 @@ Foo_C_cust_op5::~Foo_C_cust_op5() void -Foo_C_cust_op5::result(void) +Foo_C_cust_op5::result() { if (this->cancelled_) { diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h index 8a3c0159bbd..37bdd4954c1 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h @@ -24,7 +24,7 @@ public: Foo_C_cust_op5(Foo_C_i* servant); virtual ~Foo_C_cust_op5(); - void result(void); + void result(); protected: virtual void execute_i(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp index 144f2027738..f7a7917dbee 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp @@ -18,7 +18,7 @@ Foo_C_i::~Foo_C_i() void -Foo_C_i::op1(void) +Foo_C_i::op1() { ++this->count_[0]; } @@ -50,7 +50,7 @@ Foo_C_i::op4(CORBA::Long value) void -Foo_C_i::op5(void) +Foo_C_i::op5() { ++this->count_[4]; throw FooException(); @@ -58,14 +58,14 @@ Foo_C_i::op5(void) void -Foo_C_i::done(void) +Foo_C_i::done() { TheAppShutdown->client_done(); } void -Foo_C_i::cust_op1(void) +Foo_C_i::cust_op1() { ++this->count_[5]; } @@ -97,7 +97,7 @@ Foo_C_i::cust_op4(long value) void -Foo_C_i::cust_op5(void) +Foo_C_i::cust_op5() { ++this->count_[9]; throw CustomException(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h index d1150f29886..0e8bb9dd2d6 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h @@ -12,7 +12,7 @@ class CSD_TP_Foo_C_Export Foo_C_i : public virtual POA_Foo_C Foo_C_i(); virtual ~Foo_C_i(); - virtual void op1(void); + virtual void op1(); virtual void op2(CORBA::Long value); @@ -20,15 +20,15 @@ class CSD_TP_Foo_C_Export Foo_C_i : public virtual POA_Foo_C virtual void op4(CORBA::Long value); - virtual void op5(void); + virtual void op5(); - virtual void done(void); + virtual void done(); - void cust_op1(void); + void cust_op1(); void cust_op2(long value); long cust_op3(long value); void cust_op4(long value); - void cust_op5(void); + void cust_op5(); void gather_stats(Foo_C_Statistics& stats); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp index abde30b72f6..78cb71484d8 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp @@ -50,7 +50,7 @@ ClientApp::init(int argc, ACE_TCHAR* argv[]) void -ClientApp::client_setup(void) +ClientApp::client_setup() { // Turn the ior_ into a Foo_A obj ref. Foo_A_var foo = RefHelper<Foo_A>::string_to_ref(this->orb_.in(), @@ -62,7 +62,7 @@ ClientApp::client_setup(void) int -ClientApp::run_engine(void) +ClientApp::run_engine() { bool result = this->engine_->execute(); return result ? 0 : -1; diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h index b688eeb9700..b45a2ba6afd 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h @@ -19,8 +19,8 @@ class ClientApp : public TestAppBase private: // These are all called, in order, by the run_i() method. int init(int argc, ACE_TCHAR* argv[]); - void client_setup(void); - int run_engine(void); + void client_setup(); + int run_engine(); void cleanup(); // Helper methods used by the methods above. diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp index a9331abcc0a..efa6cbd9873 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp @@ -81,7 +81,7 @@ ServerApp::init(int argc, ACE_TCHAR* argv[]) void -ServerApp::poa_setup(void) +ServerApp::poa_setup() { this->poa_ = this->create_poa(this->orb_.in(), "ChildPoa"); @@ -89,7 +89,7 @@ ServerApp::poa_setup(void) void -ServerApp::csd_setup(void) +ServerApp::csd_setup() { this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_); @@ -103,7 +103,7 @@ ServerApp::csd_setup(void) void -ServerApp::servant_setup(void) +ServerApp::servant_setup() { this->servants_.create_and_activate(this->num_servants_, this->orb_.in (), @@ -129,7 +129,7 @@ ServerApp::collocated_setup() void -ServerApp::poa_activate(void) +ServerApp::poa_activate() { PortableServer::POAManager_var poa_manager = this->poa_->the_POAManager(); @@ -139,7 +139,7 @@ ServerApp::poa_activate(void) void -ServerApp::run_collocated_clients(void) +ServerApp::run_collocated_clients() { if (this->num_collocated_clients_ > 0) { @@ -152,7 +152,7 @@ ServerApp::run_collocated_clients(void) void -ServerApp::run_orb_event_loop(void) +ServerApp::run_orb_event_loop() { OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_); orb_runner.run(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h index bf9d6e80fad..756f99d2481 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h @@ -23,13 +23,13 @@ class ServerApp : public TestAppBase private: // These are all called, in order, by the run_i() method. int init(int argc, ACE_TCHAR* argv[]); - void poa_setup(void); - void csd_setup(void); - void servant_setup(void); + void poa_setup(); + void csd_setup(); + void servant_setup(); void collocated_setup(); - void poa_activate(void); - void run_collocated_clients(void); - void run_orb_event_loop(void); + void poa_activate(); + void run_collocated_clients(); + void run_orb_event_loop(); bool check_validity (); void cleanup(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp index 96b4f181f3e..d48dd6938ad 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp @@ -78,7 +78,7 @@ ClientApp::init(int argc, ACE_TCHAR* argv[]) void -ClientApp::poa_setup(void) +ClientApp::poa_setup() { this->poa_ = this->create_poa(this->orb_.in(), "ChildPoa"); @@ -86,7 +86,7 @@ ClientApp::poa_setup(void) void -ClientApp::csd_setup(void) +ClientApp::csd_setup() { this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_); @@ -100,7 +100,7 @@ ClientApp::csd_setup(void) void -ClientApp::client_setup(void) +ClientApp::client_setup() { // Turn the ior_ into a Foo_B obj ref. Foo_B_var foo = RefHelper<Foo_B>::string_to_ref(this->orb_.in(), @@ -119,7 +119,7 @@ ClientApp::client_setup(void) void -ClientApp::poa_activate(void) +ClientApp::poa_activate() { PortableServer::POAManager_var poa_manager = this->poa_->the_POAManager(); @@ -135,7 +135,7 @@ ClientApp::run_clients() void -ClientApp::run_orb_event_loop(void) +ClientApp::run_orb_event_loop() { OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_); orb_runner.run(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h index 8d8bf95dcd7..8160a063995 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h @@ -24,12 +24,12 @@ class ClientApp : public TestAppBase private: // These are all called, in order, by the run_i() method. int init(int argc, ACE_TCHAR* argv[]); - void poa_setup(void); - void csd_setup(void); - void client_setup(void); - void poa_activate(void); + void poa_setup(); + void csd_setup(); + void client_setup(); + void poa_activate(); void run_clients(); - void run_orb_event_loop(void); + void run_orb_event_loop(); bool check_validity (); void cleanup(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp index 9d43cef70aa..a061d4a003f 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp @@ -94,7 +94,7 @@ ServerApp::init(int argc, ACE_TCHAR* argv[]) void -ServerApp::poa_setup(void) +ServerApp::poa_setup() { this->poa_ = this->create_poa(this->orb_.in(), "ChildPoa"); @@ -107,7 +107,7 @@ ServerApp::poa_setup(void) } void -ServerApp::csd_setup(void) +ServerApp::csd_setup() { this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_); @@ -135,7 +135,7 @@ ServerApp::csd_setup(void) void -ServerApp::servant_setup(void) +ServerApp::servant_setup() { this->foo_servants_.create_and_activate(this->num_servants_, this->orb_.in (), @@ -145,7 +145,7 @@ ServerApp::servant_setup(void) void -ServerApp::collocated_setup(void) +ServerApp::collocated_setup() { if (this->num_collocated_clients_ == 0) return; @@ -173,7 +173,7 @@ ServerApp::collocated_setup(void) void -ServerApp::poa_activate(void) +ServerApp::poa_activate() { PortableServer::POAManager_var poa_manager = this->poa_->the_POAManager(); @@ -182,7 +182,7 @@ ServerApp::poa_activate(void) void -ServerApp::run_collocated_clients(void) +ServerApp::run_collocated_clients() { if (this->num_collocated_clients_ > 0) { @@ -195,7 +195,7 @@ ServerApp::run_collocated_clients(void) void -ServerApp::run_orb_event_loop(void) +ServerApp::run_orb_event_loop() { OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_); orb_runner.run(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h index 9b6ff34b863..f8b379d5884 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h @@ -24,13 +24,13 @@ class ServerApp : public TestAppBase private: // These are all called, in order, by the run_i() method. int init(int argc, ACE_TCHAR* argv[]); - void poa_setup(void); - void csd_setup(void); - void servant_setup(void); - void collocated_setup(void); - void poa_activate(void); - void run_collocated_clients(void); - void run_orb_event_loop(void); + void poa_setup(); + void csd_setup(); + void servant_setup(); + void collocated_setup(); + void poa_activate(); + void run_collocated_clients(); + void run_orb_event_loop(); bool check_validity (); void cleanup(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp index 6c37f9ed293..c271f1cba48 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp @@ -52,7 +52,7 @@ ClientApp::init(int argc, ACE_TCHAR* argv[]) void -ClientApp::client_setup(void) +ClientApp::client_setup() { // Turn the ior_ into a Foo_C obj ref. Foo_C_var foo = RefHelper<Foo_C>::string_to_ref(this->orb_.in(), @@ -64,7 +64,7 @@ ClientApp::client_setup(void) int -ClientApp::run_engine(void) +ClientApp::run_engine() { bool result = this->engine_->execute(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h index 14691ecad41..1533218656c 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h @@ -20,8 +20,8 @@ class ClientApp : public TestAppBase private: // These are all called, in order, by the run_i() method. int init(int argc, ACE_TCHAR* argv[]); - void client_setup(void); - int run_engine(void); + void client_setup(); + int run_engine(); void cleanup(); // Helper methods used by the methods above. diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp index 25383409b9e..d767c9bee50 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp @@ -82,7 +82,7 @@ ServerApp::init(int argc, ACE_TCHAR* argv[]) void -ServerApp::poa_setup(void) +ServerApp::poa_setup() { this->poa_ = this->create_poa(this->orb_.in(), "ChildPoa"); @@ -90,7 +90,7 @@ ServerApp::poa_setup(void) void -ServerApp::csd_setup(void) +ServerApp::csd_setup() { this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_); @@ -104,7 +104,7 @@ ServerApp::csd_setup(void) void -ServerApp::servant_setup(void) +ServerApp::servant_setup() { this->servants_.create_and_activate(this->num_servants_, this->orb_.in (), @@ -141,7 +141,7 @@ ServerApp::collocated_setup() void -ServerApp::poa_activate(void) +ServerApp::poa_activate() { PortableServer::POAManager_var poa_manager = this->poa_->the_POAManager(); @@ -151,7 +151,7 @@ ServerApp::poa_activate(void) void -ServerApp::run_collocated_clients(void) +ServerApp::run_collocated_clients() { if (this->num_collocated_clients_ > 0) { @@ -164,7 +164,7 @@ ServerApp::run_collocated_clients(void) void -ServerApp::run_orb_event_loop(void) +ServerApp::run_orb_event_loop() { OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_); orb_runner.run(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h index cdf9226c804..6a9e146e8ab 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h @@ -23,13 +23,13 @@ class ServerApp : public TestAppBase private: // These are all called, in order, by the run_i() method. int init(int argc, ACE_TCHAR* argv[]); - void poa_setup(void); - void csd_setup(void); - void servant_setup(void); + void poa_setup(); + void csd_setup(); + void servant_setup(); void collocated_setup(); - void poa_activate(void); - void run_collocated_clients(void); - void run_orb_event_loop(void); + void poa_activate(); + void run_collocated_clients(); + void run_orb_event_loop(); bool check_validity (); void cleanup(); diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp index 0d000b9f195..bdfcac050fb 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp @@ -6,13 +6,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/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h +++ b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/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/tests/Cache_Growth_Test/Hello.cpp b/TAO/tests/Cache_Growth_Test/Hello.cpp index 1757a64b002..635e9e8c1ea 100644 --- a/TAO/tests/Cache_Growth_Test/Hello.cpp +++ b/TAO/tests/Cache_Growth_Test/Hello.cpp @@ -9,7 +9,7 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (void) +Hello::get_string () { if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1) { @@ -21,7 +21,7 @@ Hello::get_string (void) } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Cache_Growth_Test/Hello.h b/TAO/tests/Cache_Growth_Test/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/Cache_Growth_Test/Hello.h +++ b/TAO/tests/Cache_Growth_Test/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/tests/CallbackTest/Callback.cpp b/TAO/tests/CallbackTest/Callback.cpp index a72878e305a..32143d1b8d7 100644 --- a/TAO/tests/CallbackTest/Callback.cpp +++ b/TAO/tests/CallbackTest/Callback.cpp @@ -17,14 +17,14 @@ Callback::are_you_there (CORBA::String_out answer) } void -Callback::test_oneway (void) +Callback::test_oneway () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Callback - test_oneway!\n")); } void -Callback::shutdown (void) +Callback::shutdown () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Callback - shutdown!\n")); diff --git a/TAO/tests/CallbackTest/Callback.h b/TAO/tests/CallbackTest/Callback.h index a2ae7b9064b..ea6628cd476 100644 --- a/TAO/tests/CallbackTest/Callback.h +++ b/TAO/tests/CallbackTest/Callback.h @@ -16,9 +16,9 @@ public: // = The skeleton methods virtual CORBA::Boolean are_you_there (CORBA::String_out answer); - virtual void test_oneway (void); + virtual void test_oneway (); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to shutdown the application. CORBA::ORB_var orb_; diff --git a/TAO/tests/CallbackTest/Service.cpp b/TAO/tests/CallbackTest/Service.cpp index 7b7cad946e0..4d8f0922237 100644 --- a/TAO/tests/CallbackTest/Service.cpp +++ b/TAO/tests/CallbackTest/Service.cpp @@ -7,7 +7,7 @@ Service::Service (CORBA::ORB_ptr orb) } void -Service::dump_results (void) +Service::dump_results () { if (this->test_count_ == 0) { diff --git a/TAO/tests/CallbackTest/Service.h b/TAO/tests/CallbackTest/Service.h index 78a6945d8d2..441a1c34370 100644 --- a/TAO/tests/CallbackTest/Service.h +++ b/TAO/tests/CallbackTest/Service.h @@ -17,7 +17,7 @@ public: /** * In case of failure this exposes any incomplete runs. */ - void dump_results (void); + void dump_results (); // = The skeleton methods virtual void run_test (Test::Callback_ptr callback); diff --git a/TAO/tests/ClientPortSpan/Hello.cpp b/TAO/tests/ClientPortSpan/Hello.cpp index 0d000b9f195..bdfcac050fb 100644 --- a/TAO/tests/ClientPortSpan/Hello.cpp +++ b/TAO/tests/ClientPortSpan/Hello.cpp @@ -6,13 +6,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/tests/ClientPortSpan/Hello.h b/TAO/tests/ClientPortSpan/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/ClientPortSpan/Hello.h +++ b/TAO/tests/ClientPortSpan/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/tests/Client_Leaks/Client_Task.cpp b/TAO/tests/Client_Leaks/Client_Task.cpp index bd29e654510..b49b07b1c75 100644 --- a/TAO/tests/Client_Leaks/Client_Task.cpp +++ b/TAO/tests/Client_Leaks/Client_Task.cpp @@ -16,7 +16,7 @@ Client_Task::successful_calls () const } int -Client_Task::svc (void) +Client_Task::svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); @@ -55,7 +55,7 @@ Client_Task::svc (void) } void -Client_Task::validate_connection (void) +Client_Task::validate_connection () { try { @@ -71,7 +71,7 @@ Client_Task::validate_connection (void) } int -Client_Task::one_iteration (void) +Client_Task::one_iteration () { try { diff --git a/TAO/tests/Client_Leaks/Client_Task.h b/TAO/tests/Client_Leaks/Client_Task.h index a8da84944ea..fbe0aa8b51b 100644 --- a/TAO/tests/Client_Leaks/Client_Task.h +++ b/TAO/tests/Client_Leaks/Client_Task.h @@ -22,14 +22,14 @@ public: int successful_calls () const; /// Thread entry point - int svc (void); + int svc (); private: /// Run one iteration of the test - int one_iteration (void); + int one_iteration (); /// Make sure that the thread has a connection available - void validate_connection (void); + void validate_connection (); private: /// Reference to the test interface diff --git a/TAO/tests/Client_Leaks/Process.cpp b/TAO/tests/Client_Leaks/Process.cpp index 1c6fb507e19..5ab2b0d55ac 100644 --- a/TAO/tests/Client_Leaks/Process.cpp +++ b/TAO/tests/Client_Leaks/Process.cpp @@ -7,13 +7,13 @@ Process::Process (CORBA::ORB_ptr orb) } CORBA::Long -Process::get_process_id (void) +Process::get_process_id () { return ACE_OS::getpid (); } void -Process::shutdown (void) +Process::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Client_Leaks/Process.h b/TAO/tests/Client_Leaks/Process.h index ff42dd8d9a9..6240f83d220 100644 --- a/TAO/tests/Client_Leaks/Process.h +++ b/TAO/tests/Client_Leaks/Process.h @@ -14,9 +14,9 @@ public: Process (CORBA::ORB_ptr orb); // = The skeleton methods - virtual CORBA::Long get_process_id (void); + virtual CORBA::Long get_process_id (); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp index c090c004da1..279f6b71802 100644 --- a/TAO/tests/Client_Leaks/Process_Factory.cpp +++ b/TAO/tests/Client_Leaks/Process_Factory.cpp @@ -9,13 +9,13 @@ Process_Factory::Process_Factory (CORBA::ORB_ptr orb) } int -Process_Factory::shutdown_received (void) +Process_Factory::shutdown_received () { return this->shutdown_received_; } Test::Process_ptr -Process_Factory::create_new_process (void) +Process_Factory::create_new_process () { Startup_Callback *startup_callback_impl; ACE_NEW_THROW_EX (startup_callback_impl, @@ -101,12 +101,12 @@ Process_Factory::create_new_process (void) } void -Process_Factory::noop (void) +Process_Factory::noop () { } void -Process_Factory::shutdown (void) +Process_Factory::shutdown () { this->shutdown_received_ = 1; this->orb_->shutdown (false); diff --git a/TAO/tests/Client_Leaks/Process_Factory.h b/TAO/tests/Client_Leaks/Process_Factory.h index f21a360f019..1481290e47f 100644 --- a/TAO/tests/Client_Leaks/Process_Factory.h +++ b/TAO/tests/Client_Leaks/Process_Factory.h @@ -14,14 +14,14 @@ public: Process_Factory (CORBA::ORB_ptr orb); /// Return 1 if the shutdown message has been received already - int shutdown_received (void); + int shutdown_received (); // = The skeleton methods - virtual Test::Process_ptr create_new_process (void); + virtual Test::Process_ptr create_new_process (); - virtual void noop (void); + virtual void noop (); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Client_Leaks/Server_Task.cpp b/TAO/tests/Client_Leaks/Server_Task.cpp index c071110e1fa..caad7b80721 100644 --- a/TAO/tests/Client_Leaks/Server_Task.cpp +++ b/TAO/tests/Client_Leaks/Server_Task.cpp @@ -9,7 +9,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb, } int -Server_Task::svc (void) +Server_Task::svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n")); try diff --git a/TAO/tests/Client_Leaks/Server_Task.h b/TAO/tests/Client_Leaks/Server_Task.h index 8b5f48d872c..4acef7697df 100644 --- a/TAO/tests/Client_Leaks/Server_Task.h +++ b/TAO/tests/Client_Leaks/Server_Task.h @@ -19,7 +19,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Reference to the ORB diff --git a/TAO/tests/Client_Leaks/Startup_Callback.cpp b/TAO/tests/Client_Leaks/Startup_Callback.cpp index 7056173d188..66a214d2b4b 100644 --- a/TAO/tests/Client_Leaks/Startup_Callback.cpp +++ b/TAO/tests/Client_Leaks/Startup_Callback.cpp @@ -1,6 +1,6 @@ #include "Startup_Callback.h" -Startup_Callback::Startup_Callback (void) +Startup_Callback::Startup_Callback () { } diff --git a/TAO/tests/Client_Leaks/Startup_Callback.h b/TAO/tests/Client_Leaks/Startup_Callback.h index eae388467ec..58c36c5f15a 100644 --- a/TAO/tests/Client_Leaks/Startup_Callback.h +++ b/TAO/tests/Client_Leaks/Startup_Callback.h @@ -11,7 +11,7 @@ class Startup_Callback { public: /// Constructor - Startup_Callback (void); + Startup_Callback (); /// Return 1 if the process has started already /** diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp index 4769f62b629..7ad4be97e15 100644 --- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp +++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.cpp @@ -18,11 +18,11 @@ // **************************************************************** -IBM1047_ISO8859::IBM1047_ISO8859 (void) +IBM1047_ISO8859::IBM1047_ISO8859 () { } -IBM1047_ISO8859::~IBM1047_ISO8859 (void) +IBM1047_ISO8859::~IBM1047_ISO8859 () { } diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.h b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.h index 659c57cda3f..5c928d9ce2b 100644 --- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.h +++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Char_IBM1047_ISO8859_Translator.h @@ -43,10 +43,10 @@ class IBM1047_ISO8859_Export IBM1047_ISO8859 : public ACE_Char_Codeset_Translato { public: /// A do nothing constructor. - IBM1047_ISO8859 (void); + IBM1047_ISO8859 (); /// Virtual destruction - virtual ~IBM1047_ISO8859 (void); + virtual ~IBM1047_ISO8859 (); // = Documented in $ACE_ROOT/ace/CDR_Stream.h virtual ACE_CDR::Boolean read_char (ACE_InputCDR &, ACE_CDR::Char &); diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp index 34424b205bd..5d786eb231a 100644 --- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp +++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.cpp @@ -16,11 +16,11 @@ // **************************************************************** -WIBM1047_ISO8859::WIBM1047_ISO8859 (void) +WIBM1047_ISO8859::WIBM1047_ISO8859 () { } -WIBM1047_ISO8859::~WIBM1047_ISO8859 (void) +WIBM1047_ISO8859::~WIBM1047_ISO8859 () { } diff --git a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.h b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.h index 2440833184a..d1fb1095e0b 100644 --- a/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.h +++ b/TAO/tests/CodeSets/libs/IBM1047_ISO8859/Wchar_IBM1047_ISO8859_Translator.h @@ -42,10 +42,10 @@ class IBM1047_ISO8859_Export WIBM1047_ISO8859 : public ACE_WChar_Codeset_Transla { public: /// A do nothing constructor. - WIBM1047_ISO8859 (void); + WIBM1047_ISO8859 (); /// Virtual destruction - virtual ~WIBM1047_ISO8859 (void); + virtual ~WIBM1047_ISO8859 (); // = Documented in $ACE_ROOT/ace/CDR_Stream.h virtual ACE_CDR::Boolean read_wchar (ACE_InputCDR &, ACE_CDR::WChar &); diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp index 3dbeafd115b..7699c4fda3d 100644 --- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp +++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.cpp @@ -213,11 +213,11 @@ size_t count_potential_surrogates ( ///////////////////////////// // WUCS4_UTF16 implementation -WUCS4_UTF16::WUCS4_UTF16 (void) +WUCS4_UTF16::WUCS4_UTF16 () { } -WUCS4_UTF16::~WUCS4_UTF16 (void) +WUCS4_UTF16::~WUCS4_UTF16 () { } diff --git a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h index 6fae5536a5f..950318eb5a1 100644 --- a/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h +++ b/TAO/tests/CodeSets/libs/UCS4_UTF16/WUCS4_UTF16.h @@ -36,10 +36,10 @@ class UCS4_UTF16_Export WUCS4_UTF16 : public ACE_WChar_Codeset_Translator { public: /// A do nothing constructor. - WUCS4_UTF16 (void); + WUCS4_UTF16 (); /// Virtual destruction - virtual ~WUCS4_UTF16 (void); + virtual ~WUCS4_UTF16 (); // = Documented in $ACE_ROOT/ace/CDR_Stream.h virtual ACE_CDR::Boolean read_wchar (ACE_InputCDR &, diff --git a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp index 06c3951e83d..42a23179e06 100644 --- a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp +++ b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.cpp @@ -42,7 +42,7 @@ UTF16_UCS2_Translator::UTF16_UCS2_Translator (CONV_FRAME::CodeSetId tcs) this->tcs_)); } -UTF16_UCS2_Translator::~UTF16_UCS2_Translator (void) +UTF16_UCS2_Translator::~UTF16_UCS2_Translator () { } diff --git a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h index db90c70cd8a..f724706ee3b 100644 --- a/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h +++ b/TAO/tests/CodeSets/libs/UTF16_UCS2/UTF16_UCS2_Translator.h @@ -43,7 +43,7 @@ public: UTF16_UCS2_Translator (CONV_FRAME::CodeSetId tcs = ACE_CODESET_ID_ISO_UCS_2_LEVEL_1); /// Virtual destruction - virtual ~UTF16_UCS2_Translator (void); + virtual ~UTF16_UCS2_Translator (); // = Documented in $ACE_ROOT/ace/CDR_Stream.h virtual ACE_CDR::Boolean read_wchar (ACE_InputCDR &, diff --git a/TAO/tests/CodeSets/simple/server.cpp b/TAO/tests/CodeSets/simple/server.cpp index 3599ee95ef2..9397fe7af7d 100644 --- a/TAO/tests/CodeSets/simple/server.cpp +++ b/TAO/tests/CodeSets/simple/server.cpp @@ -85,7 +85,7 @@ public: }; //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void) + void shutdown () { this->orb_->shutdown (false); }; diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp index 6fc065e8f78..d8c07c14341 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp +++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.cpp @@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { int status = 0; try diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h index b6ea6957134..15511cd7a02 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h +++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Client_Task.h @@ -20,7 +20,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: const ACE_TCHAR *input_; diff --git a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp index 15951f28767..5e21009c3e4 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp +++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.cpp @@ -11,7 +11,7 @@ } char * -Hello::get_string (void) +Hello::get_string () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Upcall in process ..\n")); @@ -57,7 +57,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/tests/Collocated_Best/Collocated_Best_Direct/Hello.h b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h index 043a6968853..e9c0f470f49 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Hello.h +++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/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/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp index 7a26f5fcf0c..0a0d94fee37 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.cpp +++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/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/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h index cea47faeb95..9f6a4ffa912 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h +++ b/TAO/tests/Collocated_Best/Collocated_Best_Direct/Server_Task.h @@ -27,7 +27,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Output file for IOR diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp index ee66cf2ba35..ebd3d169b4a 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp +++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.cpp @@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { int status = 0; diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h index b6ea6957134..15511cd7a02 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h +++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Client_Task.h @@ -20,7 +20,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: const ACE_TCHAR *input_; diff --git a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp index b0feddd2c8e..c6cfa8478f0 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp +++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.cpp @@ -11,7 +11,7 @@ } char * -Hello::get_string (void) +Hello::get_string () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Upcall in process ..\n")); @@ -63,7 +63,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/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h index 043a6968853..e9c0f470f49 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Hello.h +++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/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/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.cpp index 7a26f5fcf0c..0a0d94fee37 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.cpp +++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/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/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h index cea47faeb95..9f6a4ffa912 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h +++ b/TAO/tests/Collocated_Best/Collocated_Best_NoColl/Server_Task.h @@ -27,7 +27,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Output file for IOR diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp index 8a3948e0e22..bd7ac56e615 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp +++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.cpp @@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { int status = 1; try diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h index b6ea6957134..15511cd7a02 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h +++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Client_Task.h @@ -20,7 +20,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: const ACE_TCHAR *input_; diff --git a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp index dabc25cce11..57283fe2995 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp +++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.cpp @@ -12,7 +12,7 @@ } char * -Hello::get_string (void) +Hello::get_string () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Upcall in process ..\n")); @@ -55,7 +55,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/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h index 043a6968853..e9c0f470f49 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Hello.h +++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/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/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.cpp b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.cpp index 7a26f5fcf0c..0a0d94fee37 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.cpp +++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/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/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h index cea47faeb95..9f6a4ffa912 100644 --- a/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h +++ b/TAO/tests/Collocated_Best/Collocated_Best_ThuP/Server_Task.h @@ -27,7 +27,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Output file for IOR diff --git a/TAO/tests/Collocated_DerivedIF/Client_Task.cpp b/TAO/tests/Collocated_DerivedIF/Client_Task.cpp index 6bc6a75556b..01fc08696f7 100644 --- a/TAO/tests/Collocated_DerivedIF/Client_Task.cpp +++ b/TAO/tests/Collocated_DerivedIF/Client_Task.cpp @@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { int status = 0; diff --git a/TAO/tests/Collocated_DerivedIF/Client_Task.h b/TAO/tests/Collocated_DerivedIF/Client_Task.h index b6ea6957134..15511cd7a02 100644 --- a/TAO/tests/Collocated_DerivedIF/Client_Task.h +++ b/TAO/tests/Collocated_DerivedIF/Client_Task.h @@ -20,7 +20,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: const ACE_TCHAR *input_; diff --git a/TAO/tests/Collocated_DerivedIF/Hello.cpp b/TAO/tests/Collocated_DerivedIF/Hello.cpp index 93aa2c63755..d126eb34a3b 100644 --- a/TAO/tests/Collocated_DerivedIF/Hello.cpp +++ b/TAO/tests/Collocated_DerivedIF/Hello.cpp @@ -10,7 +10,7 @@ HelloAgain::HelloAgain (CORBA::ORB_ptr orb, { } char * -HelloAgain::get_string_again (void) +HelloAgain::get_string_again () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Upcall get_string_again in process ..\n")); @@ -40,7 +40,7 @@ HelloAgain::get_string_again (void) } char * -HelloAgain::get_string (void) +HelloAgain::get_string () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) HelloAgain::get_string Upcall get_string in process ..\n")); @@ -69,7 +69,7 @@ HelloAgain::get_string (void) return CORBA::string_dup ("Hello there!"); } void -HelloAgain::shutdown (void) +HelloAgain::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/tests/Collocated_DerivedIF/Hello.h b/TAO/tests/Collocated_DerivedIF/Hello.h index 4bb8b790558..b1ac7dacbd1 100644 --- a/TAO/tests/Collocated_DerivedIF/Hello.h +++ b/TAO/tests/Collocated_DerivedIF/Hello.h @@ -16,9 +16,9 @@ ACE_thread_t thr_id); // = The skeleton methods - virtual char * get_string_again (void); - virtual char * get_string (void); - virtual void shutdown (void); + virtual char * get_string_again (); + virtual char * get_string (); + virtual void shutdown (); private: diff --git a/TAO/tests/Collocated_DerivedIF/Server_Task.cpp b/TAO/tests/Collocated_DerivedIF/Server_Task.cpp index 6b89058c3ac..17b998b45ca 100644 --- a/TAO/tests/Collocated_DerivedIF/Server_Task.cpp +++ b/TAO/tests/Collocated_DerivedIF/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/tests/Collocated_DerivedIF/Server_Task.h b/TAO/tests/Collocated_DerivedIF/Server_Task.h index cea47faeb95..9f6a4ffa912 100644 --- a/TAO/tests/Collocated_DerivedIF/Server_Task.h +++ b/TAO/tests/Collocated_DerivedIF/Server_Task.h @@ -27,7 +27,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Output file for IOR diff --git a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp index 2bc503b80c1..27276d58595 100644 --- a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp +++ b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.cpp @@ -38,7 +38,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/tests/Collocated_Forwarding/Server_ORBInitializer.h b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h index 9fecb7bef81..67ca0a504bf 100644 --- a/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h +++ b/TAO/tests/Collocated_Forwarding/Server_ORBInitializer.h @@ -39,7 +39,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: /// How much requests to pass thru before forwarding. diff --git a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp index 548f1027c09..04f92407a48 100644 --- a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp +++ b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.cpp @@ -36,13 +36,13 @@ Server_Request_Interceptor::forward ( } 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->to_); } diff --git a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h index d7924879e43..cdda3618c4e 100644 --- a/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h +++ b/TAO/tests/Collocated_Forwarding/Server_Request_Interceptor.h @@ -42,9 +42,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/tests/Collocated_Forwarding/test_i.cpp b/TAO/tests/Collocated_Forwarding/test_i.cpp index a2f0451bd10..7b52881b9a4 100644 --- a/TAO/tests/Collocated_Forwarding/test_i.cpp +++ b/TAO/tests/Collocated_Forwarding/test_i.cpp @@ -24,7 +24,7 @@ test_i::forward (CORBA::Object_ptr to, } CORBA::Short -test_i::collocated_call (void) +test_i::collocated_call () { this->request_count_++; diff --git a/TAO/tests/Collocated_Forwarding/test_i.h b/TAO/tests/Collocated_Forwarding/test_i.h index 7cc54392e8a..cd26df18997 100644 --- a/TAO/tests/Collocated_Forwarding/test_i.h +++ b/TAO/tests/Collocated_Forwarding/test_i.h @@ -24,7 +24,7 @@ public: CORBA::ULong request_pass_count); /// Return the number assigned to this object. - virtual CORBA::Short collocated_call (void); + virtual CORBA::Short collocated_call (); private: /// Id of this instance. diff --git a/TAO/tests/Collocated_NoColl/Client_Task.cpp b/TAO/tests/Collocated_NoColl/Client_Task.cpp index ee66cf2ba35..ebd3d169b4a 100644 --- a/TAO/tests/Collocated_NoColl/Client_Task.cpp +++ b/TAO/tests/Collocated_NoColl/Client_Task.cpp @@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { int status = 0; diff --git a/TAO/tests/Collocated_NoColl/Client_Task.h b/TAO/tests/Collocated_NoColl/Client_Task.h index b6ea6957134..15511cd7a02 100644 --- a/TAO/tests/Collocated_NoColl/Client_Task.h +++ b/TAO/tests/Collocated_NoColl/Client_Task.h @@ -20,7 +20,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: const ACE_TCHAR *input_; diff --git a/TAO/tests/Collocated_NoColl/Hello.cpp b/TAO/tests/Collocated_NoColl/Hello.cpp index b0feddd2c8e..c6cfa8478f0 100644 --- a/TAO/tests/Collocated_NoColl/Hello.cpp +++ b/TAO/tests/Collocated_NoColl/Hello.cpp @@ -11,7 +11,7 @@ } char * -Hello::get_string (void) +Hello::get_string () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Upcall in process ..\n")); @@ -63,7 +63,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/tests/Collocated_NoColl/Hello.h b/TAO/tests/Collocated_NoColl/Hello.h index 043a6968853..e9c0f470f49 100644 --- a/TAO/tests/Collocated_NoColl/Hello.h +++ b/TAO/tests/Collocated_NoColl/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/tests/Collocated_NoColl/Server_Task.cpp b/TAO/tests/Collocated_NoColl/Server_Task.cpp index 7a26f5fcf0c..0a0d94fee37 100644 --- a/TAO/tests/Collocated_NoColl/Server_Task.cpp +++ b/TAO/tests/Collocated_NoColl/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/tests/Collocated_NoColl/Server_Task.h b/TAO/tests/Collocated_NoColl/Server_Task.h index cea47faeb95..9f6a4ffa912 100644 --- a/TAO/tests/Collocated_NoColl/Server_Task.h +++ b/TAO/tests/Collocated_NoColl/Server_Task.h @@ -27,7 +27,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Output file for IOR diff --git a/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp b/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp index 8199914c81f..46a58aef3af 100644 --- a/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp +++ b/TAO/tests/Collocated_ThruP_Sp/Client_Task.cpp @@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { CORBA::Boolean exception = false; try diff --git a/TAO/tests/Collocated_ThruP_Sp/Client_Task.h b/TAO/tests/Collocated_ThruP_Sp/Client_Task.h index b6ea6957134..15511cd7a02 100644 --- a/TAO/tests/Collocated_ThruP_Sp/Client_Task.h +++ b/TAO/tests/Collocated_ThruP_Sp/Client_Task.h @@ -20,7 +20,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: const ACE_TCHAR *input_; diff --git a/TAO/tests/Collocated_ThruP_Sp/Hello.cpp b/TAO/tests/Collocated_ThruP_Sp/Hello.cpp index 81c4b023077..1092b33968f 100644 --- a/TAO/tests/Collocated_ThruP_Sp/Hello.cpp +++ b/TAO/tests/Collocated_ThruP_Sp/Hello.cpp @@ -11,7 +11,7 @@ } char * -Hello::get_string (void) +Hello::get_string () { ACE_ERROR ((LM_DEBUG, "(%P|%t) ERROR: Upcall in process ..\n")); @@ -19,7 +19,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/tests/Collocated_ThruP_Sp/Hello.h b/TAO/tests/Collocated_ThruP_Sp/Hello.h index 043a6968853..e9c0f470f49 100644 --- a/TAO/tests/Collocated_ThruP_Sp/Hello.h +++ b/TAO/tests/Collocated_ThruP_Sp/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/tests/Collocated_ThruP_Sp/Server_Task.cpp b/TAO/tests/Collocated_ThruP_Sp/Server_Task.cpp index 206b5e564a0..21e398ead92 100644 --- a/TAO/tests/Collocated_ThruP_Sp/Server_Task.cpp +++ b/TAO/tests/Collocated_ThruP_Sp/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/tests/Collocated_ThruP_Sp/Server_Task.h b/TAO/tests/Collocated_ThruP_Sp/Server_Task.h index cea47faeb95..9f6a4ffa912 100644 --- a/TAO/tests/Collocated_ThruP_Sp/Server_Task.h +++ b/TAO/tests/Collocated_ThruP_Sp/Server_Task.h @@ -27,7 +27,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Output file for IOR diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp index 8199914c81f..46a58aef3af 100644 --- a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp +++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.cpp @@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { CORBA::Boolean exception = false; try diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h index b6ea6957134..15511cd7a02 100644 --- a/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h +++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Client_Task.h @@ -20,7 +20,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: const ACE_TCHAR *input_; diff --git a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp index 81c4b023077..1092b33968f 100644 --- a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp +++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.cpp @@ -11,7 +11,7 @@ } char * -Hello::get_string (void) +Hello::get_string () { ACE_ERROR ((LM_DEBUG, "(%P|%t) ERROR: Upcall in process ..\n")); @@ -19,7 +19,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/tests/Collocated_ThruP_Sp_Gd/Hello.h b/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h index 043a6968853..e9c0f470f49 100644 --- a/TAO/tests/Collocated_ThruP_Sp_Gd/Hello.h +++ b/TAO/tests/Collocated_ThruP_Sp_Gd/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/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp b/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp index 7a26f5fcf0c..0a0d94fee37 100644 --- a/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.cpp +++ b/TAO/tests/Collocated_ThruP_Sp_Gd/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/tests/Collocated_ThruP_Sp_Gd/Server_Task.h b/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h index cea47faeb95..9f6a4ffa912 100644 --- a/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h +++ b/TAO/tests/Collocated_ThruP_Sp_Gd/Server_Task.h @@ -27,7 +27,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Output file for IOR diff --git a/TAO/tests/Collocation/Collocation_Tester.cpp b/TAO/tests/Collocation/Collocation_Tester.cpp index 86f0234cdc4..ad9ee246c16 100644 --- a/TAO/tests/Collocation/Collocation_Tester.cpp +++ b/TAO/tests/Collocation/Collocation_Tester.cpp @@ -13,12 +13,12 @@ #include "Collocation_Tester.h" -Collocation_Test::Collocation_Test (void) +Collocation_Test::Collocation_Test () { } void -Collocation_Test::shutdown (void) +Collocation_Test::shutdown () { this->root_poa_->destroy (1, 1); this->orb_->destroy (); @@ -83,7 +83,7 @@ Collocation_Test::parse_args (int /*argc*/, } int -Collocation_Test::test_narrow (void) +Collocation_Test::test_narrow () { Diamond::Top_var top = Diamond::Top::_narrow (this->diamond_obj_.in ()); @@ -113,7 +113,7 @@ Collocation_Test::test_narrow (void) } int -Collocation_Test::run (void) +Collocation_Test::run () { this->poa_manager_->activate (); diff --git a/TAO/tests/Collocation/Collocation_Tester.h b/TAO/tests/Collocation/Collocation_Tester.h index 0f9650b9d2b..03fcf224538 100644 --- a/TAO/tests/Collocation/Collocation_Tester.h +++ b/TAO/tests/Collocation/Collocation_Tester.h @@ -22,9 +22,9 @@ class Collocation_Test { public: - Collocation_Test (void); + Collocation_Test (); - void shutdown (void); + void shutdown (); /// Initializing the Collocation_Test object. int init (int argc, ACE_TCHAR *argv[]); @@ -34,10 +34,10 @@ public: /// This test narrow an object reference to its base class and see /// if it works correctly. - int test_narrow (void); + int test_narrow (); /// Run the test. - int run (void); + int run (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Collocation/Diamond_i.cpp b/TAO/tests/Collocation/Diamond_i.cpp index b28e1d0fe9c..85b39b1ad54 100644 --- a/TAO/tests/Collocation/Diamond_i.cpp +++ b/TAO/tests/Collocation/Diamond_i.cpp @@ -9,7 +9,7 @@ Top_i::~Top_i () } char * -Top_i::shape (void) +Top_i::shape () { return CORBA::string_dup ("a point."); } @@ -23,13 +23,13 @@ Left_i::~Left_i () } char * -Left_i::shape (void) +Left_i::shape () { return CORBA::string_dup ("the left line"); } char * -Left_i::color (void) +Left_i::color () { return CORBA::string_dup ("black"); } @@ -43,20 +43,20 @@ Right_i::~Right_i () } char * -Right_i::shape (void) +Right_i::shape () { return CORBA::string_dup ("the right line"); } char * -Right_i::color (void) +Right_i::color () { return CORBA::string_dup ("red"); // } CORBA::Long -Right_i::width (void) +Right_i::width () { return 0; } @@ -70,25 +70,25 @@ Buttom_i::~Buttom_i () } char * -Buttom_i::shape (void) +Buttom_i::shape () { return CORBA::string_dup ("a diamond"); } char * -Buttom_i::color (void) +Buttom_i::color () { return CORBA::string_dup ("translucent"); } CORBA::Long -Buttom_i::width (void) +Buttom_i::width () { return 100; } char * -Buttom_i::name (void) +Buttom_i::name () { return CORBA::string_dup ("Jubilee"); } diff --git a/TAO/tests/Collocation/Diamond_i.h b/TAO/tests/Collocation/Diamond_i.h index 2b81c1c5906..904d2607d22 100644 --- a/TAO/tests/Collocation/Diamond_i.h +++ b/TAO/tests/Collocation/Diamond_i.h @@ -11,62 +11,62 @@ class Diamond_Export Top_i : public POA_Diamond::Top { public: - Top_i (void); - ~Top_i (void); + Top_i (); + ~Top_i (); // Ctor and dtor. - virtual char * shape (void); + virtual char * shape (); // Return the shape of this object (interface.) }; class Diamond_Export Left_i : public POA_Diamond::Left { public: - Left_i (void); - ~Left_i (void); + Left_i (); + ~Left_i (); // Ctor, dtor. - virtual char * shape (void); + virtual char * shape (); // Return the shape of this object (interface.) - virtual char * color (void); + virtual char * color (); // Return the color of this object (interface.) }; class Diamond_Export Right_i : public POA_Diamond::Right { public: - Right_i (void); - ~Right_i (void); + Right_i (); + ~Right_i (); // Ctor, dtor. - virtual char * shape (void); + virtual char * shape (); // Return the shape of this object (interface.) - virtual char * color (void); + virtual char * color (); // Return the color of this object (interface.) - virtual CORBA::Long width (void); + virtual CORBA::Long width (); // Return the width of the stuff. }; class Diamond_Export Buttom_i : public POA_Diamond::Buttom { public: - Buttom_i (void); - ~Buttom_i (void); + Buttom_i (); + ~Buttom_i (); // Ctor, dtor. - virtual char * shape (void); + virtual char * shape (); // Return the shape of this object (interface.) - virtual char * color (void); + virtual char * color (); // Return the color of this object (interface.) - virtual CORBA::Long width (void); + virtual CORBA::Long width (); // Return the width of the stuff. - virtual char * name (void); + virtual char * name (); // Return the name of the object. }; diff --git a/TAO/tests/CollocationLockup/SimpleNamingService.cpp b/TAO/tests/CollocationLockup/SimpleNamingService.cpp index f7709a3f02a..e535dc43946 100644 --- a/TAO/tests/CollocationLockup/SimpleNamingService.cpp +++ b/TAO/tests/CollocationLockup/SimpleNamingService.cpp @@ -27,7 +27,7 @@ public: #endif } - ~TestShutdown (void) + ~TestShutdown () { #if !defined(ACE_LACKS_UNIX_SIGNALS) this->shutdown_.remove_handler (SIGTERM); diff --git a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp index f7603965ef6..b7f91b5c88e 100644 --- a/TAO/tests/Collocation_Exception_Test/Client_Task.cpp +++ b/TAO/tests/Collocation_Exception_Test/Client_Task.cpp @@ -83,7 +83,7 @@ Client_Task::test_user_exception_not_expected ( } int -Client_Task::svc (void) +Client_Task::svc () { try { diff --git a/TAO/tests/Collocation_Exception_Test/Client_Task.h b/TAO/tests/Collocation_Exception_Test/Client_Task.h index 3cb45fa2d24..836ae7ef879 100644 --- a/TAO/tests/Collocation_Exception_Test/Client_Task.h +++ b/TAO/tests/Collocation_Exception_Test/Client_Task.h @@ -21,7 +21,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: void test_system_exception (Test::Hello_ptr hello_ptr); diff --git a/TAO/tests/Collocation_Exception_Test/Hello.cpp b/TAO/tests/Collocation_Exception_Test/Hello.cpp index 5151daaab6f..c9db9959f60 100644 --- a/TAO/tests/Collocation_Exception_Test/Hello.cpp +++ b/TAO/tests/Collocation_Exception_Test/Hello.cpp @@ -11,31 +11,31 @@ } void -Hello::system_exception_test (void) +Hello::system_exception_test () { throw CORBA::INTERNAL (); } void -Hello::user_exception_expected (void) +Hello::user_exception_expected () { throw ::Test::Hello::A (); } void -Hello::user_exception_not_expected (void) +Hello::user_exception_not_expected () { this->throw_internal_b (); } void -Hello::throw_internal_b (void) +Hello::throw_internal_b () { throw ::Test::Hello::B (); } char * -Hello::get_string (void) +Hello::get_string () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Upcall in process ..\n")); @@ -78,7 +78,7 @@ Hello::get_string (void) } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Collocation_Exception_Test/Hello.h b/TAO/tests/Collocation_Exception_Test/Hello.h index a75d4d64ea2..913b0708fd4 100644 --- a/TAO/tests/Collocation_Exception_Test/Hello.h +++ b/TAO/tests/Collocation_Exception_Test/Hello.h @@ -20,18 +20,18 @@ public: ACE_thread_t thr_id); // = The skeleton methods - virtual char * get_string (void); + virtual char * get_string (); - virtual void system_exception_test (void); + virtual void system_exception_test (); - virtual void user_exception_expected (void); + virtual void user_exception_expected (); - virtual void user_exception_not_expected (void); + virtual void user_exception_not_expected (); - virtual void shutdown (void); + virtual void shutdown (); private: - void throw_internal_b (void); + void throw_internal_b (); /// Use an ORB reference to convert strings to objects and shutdown /// the application. diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp index ebe3075b8fc..21ba1d3f8e3 100644 --- a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp +++ b/TAO/tests/Collocation_Exception_Test/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/tests/Collocation_Exception_Test/Server_Task.h b/TAO/tests/Collocation_Exception_Test/Server_Task.h index cea47faeb95..9f6a4ffa912 100644 --- a/TAO/tests/Collocation_Exception_Test/Server_Task.h +++ b/TAO/tests/Collocation_Exception_Test/Server_Task.h @@ -27,7 +27,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Output file for IOR diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp index 4c61af68844..f2f97b4513e 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp @@ -17,7 +17,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { try { diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.h b/TAO/tests/Collocation_Oneway_Tests/Client_Task.h index 6d5980db093..d67e7a8e46e 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.h +++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.h @@ -28,7 +28,7 @@ enum ClientSyncModeEnum { ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: const ACE_TCHAR *input_; diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp index aa0517f8dfd..da1097b230a 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Hello.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/Hello.cpp @@ -11,7 +11,7 @@ Hello::Hello (CORBA::ORB_ptr orb, } void -Hello::onewayTest (void) +Hello::onewayTest () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) onewayTest() Upcall in process ..\n")); @@ -20,7 +20,7 @@ Hello::onewayTest (void) char * -Hello::get_string (void) +Hello::get_string () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Upcall in process ..\n")); @@ -63,7 +63,7 @@ Hello::get_string (void) } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Collocation_Oneway_Tests/Hello.h b/TAO/tests/Collocation_Oneway_Tests/Hello.h index d2b6221d4d4..bc9e3a23043 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Hello.h +++ b/TAO/tests/Collocation_Oneway_Tests/Hello.h @@ -20,11 +20,11 @@ public: ACE_thread_t thr_id); // = The skeleton methods - virtual char * get_string (void); + virtual char * get_string (); - virtual void onewayTest (void); + virtual void onewayTest (); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp index 95cb690e576..8324758b0d2 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp +++ b/TAO/tests/Collocation_Oneway_Tests/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/tests/Collocation_Oneway_Tests/Server_Task.h b/TAO/tests/Collocation_Oneway_Tests/Server_Task.h index cea47faeb95..9f6a4ffa912 100644 --- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.h +++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.h @@ -27,7 +27,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Output file for IOR diff --git a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp index 3b3324b9e81..06721d060af 100644 --- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp +++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp @@ -13,9 +13,9 @@ public: void set_other (test_ptr test); - void method (void); + void method (); - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); CORBA::ORB_var orb_; @@ -47,7 +47,7 @@ test_i::set_other (test_ptr test) } void -test_i::method (void) +test_i::method () { if (this->other_.in () != test::_nil ()) { @@ -82,7 +82,7 @@ test_i::method (void) } PortableServer::POA_ptr -test_i::_default_POA (void) +test_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -92,7 +92,7 @@ class Task : public ACE_Task_Base public: Task (CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -103,7 +103,7 @@ Task::Task (CORBA::ORB_ptr orb) } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/Collocation_Tests/Client_Task.cpp b/TAO/tests/Collocation_Tests/Client_Task.cpp index 5ca5e2cfa3f..8352825f766 100644 --- a/TAO/tests/Collocation_Tests/Client_Task.cpp +++ b/TAO/tests/Collocation_Tests/Client_Task.cpp @@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { try { diff --git a/TAO/tests/Collocation_Tests/Client_Task.h b/TAO/tests/Collocation_Tests/Client_Task.h index b6ea6957134..15511cd7a02 100644 --- a/TAO/tests/Collocation_Tests/Client_Task.h +++ b/TAO/tests/Collocation_Tests/Client_Task.h @@ -20,7 +20,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: const ACE_TCHAR *input_; diff --git a/TAO/tests/Collocation_Tests/Hello.cpp b/TAO/tests/Collocation_Tests/Hello.cpp index 6def44732c1..93b81632258 100644 --- a/TAO/tests/Collocation_Tests/Hello.cpp +++ b/TAO/tests/Collocation_Tests/Hello.cpp @@ -11,7 +11,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/tests/Collocation_Tests/Hello.h b/TAO/tests/Collocation_Tests/Hello.h index 043a6968853..e9c0f470f49 100644 --- a/TAO/tests/Collocation_Tests/Hello.h +++ b/TAO/tests/Collocation_Tests/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/tests/Collocation_Tests/Server_Task.cpp b/TAO/tests/Collocation_Tests/Server_Task.cpp index 7a26f5fcf0c..0a0d94fee37 100644 --- a/TAO/tests/Collocation_Tests/Server_Task.cpp +++ b/TAO/tests/Collocation_Tests/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/tests/Collocation_Tests/Server_Task.h b/TAO/tests/Collocation_Tests/Server_Task.h index cea47faeb95..9f6a4ffa912 100644 --- a/TAO/tests/Collocation_Tests/Server_Task.h +++ b/TAO/tests/Collocation_Tests/Server_Task.h @@ -27,7 +27,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Output file for IOR diff --git a/TAO/tests/Connect_Strategy_Test/Hello.cpp b/TAO/tests/Connect_Strategy_Test/Hello.cpp index 0d000b9f195..bdfcac050fb 100644 --- a/TAO/tests/Connect_Strategy_Test/Hello.cpp +++ b/TAO/tests/Connect_Strategy_Test/Hello.cpp @@ -6,13 +6,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/tests/Connect_Strategy_Test/Hello.h b/TAO/tests/Connect_Strategy_Test/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/Connect_Strategy_Test/Hello.h +++ b/TAO/tests/Connect_Strategy_Test/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/tests/Crash_On_Write/Crash_Task.cpp b/TAO/tests/Crash_On_Write/Crash_Task.cpp index fea99bbb218..a08c78c65f5 100644 --- a/TAO/tests/Crash_On_Write/Crash_Task.cpp +++ b/TAO/tests/Crash_On_Write/Crash_Task.cpp @@ -10,7 +10,7 @@ Crash_Task::Crash_Task (ACE_Thread_Manager *thr_mgr, } int -Crash_Task::svc (void) +Crash_Task::svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting crash task\n")); ACE_OS::sleep (this->running_time_); diff --git a/TAO/tests/Crash_On_Write/Crash_Task.h b/TAO/tests/Crash_On_Write/Crash_Task.h index b4d9a7b63b4..c9e4516629e 100644 --- a/TAO/tests/Crash_On_Write/Crash_Task.h +++ b/TAO/tests/Crash_On_Write/Crash_Task.h @@ -18,7 +18,7 @@ public: const ACE_Time_Value &running_time); /// Thread entry point - int svc (void); + int svc (); private: /// Total running time for each thread diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp index e3610f5b633..08ec34b03c2 100644 --- a/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp +++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.cpp @@ -1,10 +1,10 @@ #include "Oneway_Receiver.h" -Oneway_Receiver::Oneway_Receiver (void) +Oneway_Receiver::Oneway_Receiver () { } void -Oneway_Receiver::receive_oneway (void) +Oneway_Receiver::receive_oneway () { } diff --git a/TAO/tests/Crash_On_Write/Oneway_Receiver.h b/TAO/tests/Crash_On_Write/Oneway_Receiver.h index 1e28f29784d..a19c77fe6b5 100644 --- a/TAO/tests/Crash_On_Write/Oneway_Receiver.h +++ b/TAO/tests/Crash_On_Write/Oneway_Receiver.h @@ -11,10 +11,10 @@ class Oneway_Receiver { public: /// Constructor - Oneway_Receiver (void); + Oneway_Receiver (); // = The skeleton methods - virtual void receive_oneway (void); + virtual void receive_oneway (); }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp index b76d85f7670..cb57d3ddcaf 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp @@ -1,17 +1,17 @@ #include "Crashed_Callback.h" -Crashed_Callback::Crashed_Callback (void) +Crashed_Callback::Crashed_Callback () { } CORBA::Boolean -Crashed_Callback::are_you_there (void) +Crashed_Callback::are_you_there () { return 1; } void -Crashed_Callback::crash_now_please (void) +Crashed_Callback::crash_now_please () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Crashed_Callback - crashing application\n")); @@ -26,6 +26,6 @@ Crashed_Callback::crash_now_please (void) } void -Crashed_Callback::test_oneway (void) +Crashed_Callback::test_oneway () { } diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.h b/TAO/tests/Crashed_Callback/Crashed_Callback.h index a6bd7ccc13f..0ba82c82b3b 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.h +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.h @@ -11,14 +11,14 @@ class Crashed_Callback { public: /// Constructor - Crashed_Callback (void); + Crashed_Callback (); // = The skeleton methods - virtual CORBA::Boolean are_you_there (void); + virtual CORBA::Boolean are_you_there (); - virtual void crash_now_please (void); + virtual void crash_now_please (); - virtual void test_oneway (void); + virtual void test_oneway (); }; #include /**/ "ace/post.h" diff --git a/TAO/tests/Crashed_Callback/Service.cpp b/TAO/tests/Crashed_Callback/Service.cpp index 697eddf636e..e798b7e1588 100644 --- a/TAO/tests/Crashed_Callback/Service.cpp +++ b/TAO/tests/Crashed_Callback/Service.cpp @@ -1,13 +1,13 @@ #include "Service.h" -Service::Service (void) +Service::Service () : orb_ (CORBA::ORB::_nil ()), test_count_ (0) { } void -Service::dump_results (void) +Service::dump_results () { if (this->test_count_ == 0) { diff --git a/TAO/tests/Crashed_Callback/Service.h b/TAO/tests/Crashed_Callback/Service.h index 4630e164764..9d3e4f4ffa3 100644 --- a/TAO/tests/Crashed_Callback/Service.h +++ b/TAO/tests/Crashed_Callback/Service.h @@ -11,13 +11,13 @@ class Service { public: /// Constructor - Service (void); + Service (); /// Dump the results. /** * In case of failure this exposes any incomplete runs. */ - void dump_results (void); + void dump_results (); // = The skeleton methods virtual void run_test (Test::Crashed_Callback_ptr callback); diff --git a/TAO/tests/DII_AMI_Forward/orb_initializer.cpp b/TAO/tests/DII_AMI_Forward/orb_initializer.cpp index 345f983b3a0..8a4ec18a430 100644 --- a/TAO/tests/DII_AMI_Forward/orb_initializer.cpp +++ b/TAO/tests/DII_AMI_Forward/orb_initializer.cpp @@ -3,7 +3,7 @@ #include "orb_initializer.h" #include "server_interceptor.h" -Server_ORBInitializer::Server_ORBInitializer (void) +Server_ORBInitializer::Server_ORBInitializer () { } @@ -30,7 +30,7 @@ Server_ORBInitializer::post_init ( } ForwardTest_Request_Interceptor * -Server_ORBInitializer::server_interceptor (void) +Server_ORBInitializer::server_interceptor () { return this->server_interceptor_; } diff --git a/TAO/tests/DII_AMI_Forward/orb_initializer.h b/TAO/tests/DII_AMI_Forward/orb_initializer.h index 0e2986a0a93..acd48c9048a 100644 --- a/TAO/tests/DII_AMI_Forward/orb_initializer.h +++ b/TAO/tests/DII_AMI_Forward/orb_initializer.h @@ -28,7 +28,7 @@ class Server_ORBInitializer { public: /// Constructor - Server_ORBInitializer (void); + Server_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); @@ -36,7 +36,7 @@ public: /// Return the created server request interceptor. Only valid after /// post_init(), i.e. ORB_init(), has been called. - ForwardTest_Request_Interceptor * server_interceptor (void); + ForwardTest_Request_Interceptor * server_interceptor (); private: /// Pointer to the server request interceptor. ORB is responsible diff --git a/TAO/tests/DII_AMI_Forward/server_interceptor.cpp b/TAO/tests/DII_AMI_Forward/server_interceptor.cpp index de80b330976..e231f671307 100644 --- a/TAO/tests/DII_AMI_Forward/server_interceptor.cpp +++ b/TAO/tests/DII_AMI_Forward/server_interceptor.cpp @@ -5,7 +5,7 @@ #include "ace/OS_NS_string.h" #include "ace/Thread.h" -ForwardTest_Request_Interceptor::ForwardTest_Request_Interceptor (void) +ForwardTest_Request_Interceptor::ForwardTest_Request_Interceptor () : myname_ ("ForwardTest_Interceptor"), forward_location_ (CORBA::Object::_nil ()), forward_location_done_ (false) @@ -19,7 +19,7 @@ ForwardTest_Request_Interceptor::ForwardTest_Request_Interceptor (CORBA::Object_ { } -ForwardTest_Request_Interceptor::~ForwardTest_Request_Interceptor (void) +ForwardTest_Request_Interceptor::~ForwardTest_Request_Interceptor () { } @@ -36,13 +36,13 @@ ForwardTest_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo } char * -ForwardTest_Request_Interceptor::name (void) +ForwardTest_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -ForwardTest_Request_Interceptor::destroy (void) +ForwardTest_Request_Interceptor::destroy () { } diff --git a/TAO/tests/DII_AMI_Forward/server_interceptor.h b/TAO/tests/DII_AMI_Forward/server_interceptor.h index a5496d72271..d862fcabdbf 100644 --- a/TAO/tests/DII_AMI_Forward/server_interceptor.h +++ b/TAO/tests/DII_AMI_Forward/server_interceptor.h @@ -21,7 +21,7 @@ class ForwardTest_Request_Interceptor { // = Server-side echo interceptor. For checking interceptor visually only. public: - ForwardTest_Request_Interceptor (void); + ForwardTest_Request_Interceptor (); // cotr. ForwardTest_Request_Interceptor (CORBA::Object_ptr forward_location); @@ -31,10 +31,10 @@ public: void forward_reference (CORBA::Object_ptr forward_location); - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp index f1cfbec1038..71bbf2b35ee 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.cpp @@ -25,7 +25,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { try { diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h index 265b6596721..130bb198807 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h +++ b/TAO/tests/DII_Collocation_Tests/oneway/Client_Task.h @@ -21,7 +21,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); CORBA::ULong error_count () const; diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp index 8e525bb5aaa..4d4d797c70f 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.cpp @@ -20,12 +20,12 @@ extern CORBA::Short TEST_SECOND; } // Implementation skeleton constructor -Test_Simple_Test_i::Test_Simple_Test_i (void) +Test_Simple_Test_i::Test_Simple_Test_i () { } // Implementation skeleton destructor -Test_Simple_Test_i::~Test_Simple_Test_i (void) +Test_Simple_Test_i::~Test_Simple_Test_i () { } @@ -269,7 +269,7 @@ void Hello::test_args_3 ( } char * -Hello::get_string (void) +Hello::get_string () { if (debug) ACE_DEBUG ((LM_DEBUG, @@ -324,7 +324,7 @@ Hello::test_unbounded_string ( } 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/tests/DII_Collocation_Tests/oneway/Hello.h b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h index 8fc53671693..29c8f26763a 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Hello.h +++ b/TAO/tests/DII_Collocation_Tests/oneway/Hello.h @@ -10,10 +10,10 @@ class Test_Simple_Test_i { public: //Constructor - Test_Simple_Test_i (void); + Test_Simple_Test_i (); //Destructor - virtual ~Test_Simple_Test_i (void); + virtual ~Test_Simple_Test_i (); virtual void test_method ( @@ -108,7 +108,7 @@ public: const ::Test::Var_Array arg4 ); - virtual char * get_string (void); + virtual char * get_string (); virtual char * test_unbounded_string ( @@ -117,7 +117,7 @@ public: CORBA::String_out s3 ); - virtual void shutdown (void); + virtual void shutdown (); CORBA::ULong error_count () const; diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp index 8c44fd06667..31d7959a269 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.cpp @@ -19,7 +19,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output, } int -Server_Task::svc (void) +Server_Task::svc () { try { diff --git a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h index 6e6d7085452..fde0740eebe 100644 --- a/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h +++ b/TAO/tests/DII_Collocation_Tests/oneway/Server_Task.h @@ -28,7 +28,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); CORBA::ULong error_count () const; diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp index 340f5d9b3a2..aba859d9fd3 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.cpp @@ -26,7 +26,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { try { diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h index 265b6596721..130bb198807 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h +++ b/TAO/tests/DII_Collocation_Tests/twoway/Client_Task.h @@ -21,7 +21,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); CORBA::ULong error_count () const; diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp index 2dbe25a3b22..9f8445cd6b7 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp +++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.cpp @@ -20,12 +20,12 @@ extern CORBA::Short TEST_SECOND; } // Implementation skeleton constructor -Test_Simple_Test_i::Test_Simple_Test_i (void) +Test_Simple_Test_i::Test_Simple_Test_i () { } // Implementation skeleton destructor -Test_Simple_Test_i::~Test_Simple_Test_i (void) +Test_Simple_Test_i::~Test_Simple_Test_i () { } @@ -286,7 +286,7 @@ void Hello::test_args_3 ( } char * -Hello::get_string (void) +Hello::get_string () { if (debug) ACE_DEBUG ((LM_DEBUG, @@ -341,7 +341,7 @@ Hello::test_unbounded_string ( } 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/tests/DII_Collocation_Tests/twoway/Hello.h b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h index 4050797f772..df2a9be278c 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Hello.h +++ b/TAO/tests/DII_Collocation_Tests/twoway/Hello.h @@ -10,10 +10,10 @@ class Test_Simple_Test_i { public: //Constructor - Test_Simple_Test_i (void); + Test_Simple_Test_i (); //Destructor - virtual ~Test_Simple_Test_i (void); + virtual ~Test_Simple_Test_i (); virtual void test_method ( @@ -115,7 +115,7 @@ public: const ::Test::Var_Array arg4 ); - virtual char * get_string (void); + virtual char * get_string (); virtual char * test_unbounded_string ( @@ -124,7 +124,7 @@ public: CORBA::String_out s3 ); - virtual void shutdown (void); + virtual void shutdown (); CORBA::ULong error_count () const; diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp index 2f8dd3327cb..cc42498052c 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp +++ b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.cpp @@ -17,7 +17,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output, } int -Server_Task::svc (void) +Server_Task::svc () { try { diff --git a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h index 690c31bb2a7..4f2b3c9adf4 100644 --- a/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h +++ b/TAO/tests/DII_Collocation_Tests/twoway/Server_Task.h @@ -25,7 +25,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); CORBA::ULong error_count () const; diff --git a/TAO/tests/DII_Discard_Deferred/Hello.cpp b/TAO/tests/DII_Discard_Deferred/Hello.cpp index a2c5103edc3..81c558f5180 100644 --- a/TAO/tests/DII_Discard_Deferred/Hello.cpp +++ b/TAO/tests/DII_Discard_Deferred/Hello.cpp @@ -8,7 +8,7 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (void) +Hello::get_string () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Hello::get_string called\n")); ACE_OS::sleep (2); @@ -17,7 +17,7 @@ Hello::get_string (void) } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/DII_Discard_Deferred/Hello.h b/TAO/tests/DII_Discard_Deferred/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/DII_Discard_Deferred/Hello.h +++ b/TAO/tests/DII_Discard_Deferred/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/tests/DIOP/UDP_Client_i.cpp b/TAO/tests/DIOP/UDP_Client_i.cpp index eda5079b763..b1bf9cc85ff 100644 --- a/TAO/tests/DIOP/UDP_Client_i.cpp +++ b/TAO/tests/DIOP/UDP_Client_i.cpp @@ -19,13 +19,13 @@ UDP_Client_i::UDP_Client_i (CORBA::ORB_ptr orb, } //Destructor. -UDP_Client_i::~UDP_Client_i (void) +UDP_Client_i::~UDP_Client_i () { //no-op } int -UDP_Client_i::svc (void) +UDP_Client_i::svc () { ACE_CString client_name ("UDP"); diff --git a/TAO/tests/DIOP/UDP_Client_i.h b/TAO/tests/DIOP/UDP_Client_i.h index f7c8261fc7c..80b8800577b 100644 --- a/TAO/tests/DIOP/UDP_Client_i.h +++ b/TAO/tests/DIOP/UDP_Client_i.h @@ -37,7 +37,7 @@ public: ACE_UINT32 iterations); /// Destructor - virtual ~UDP_Client_i (void); + virtual ~UDP_Client_i (); private: // Runs in a separate thread. diff --git a/TAO/tests/DIOP/UDP_i.cpp b/TAO/tests/DIOP/UDP_i.cpp index bf8106c29e9..dd8e91c847b 100644 --- a/TAO/tests/DIOP/UDP_i.cpp +++ b/TAO/tests/DIOP/UDP_i.cpp @@ -7,7 +7,7 @@ UDP_i::UDP_i (CORBA::ORB_ptr o) : } // Destructor -UDP_i::~UDP_i (void) +UDP_i::~UDP_i () { } @@ -56,7 +56,7 @@ UDP_i::invoke (const char * client_name, // Shutdown. void -UDP_i::shutdown (void) +UDP_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "UDP_i is shutting down\n")); diff --git a/TAO/tests/DIOP/UDP_i.h b/TAO/tests/DIOP/UDP_i.h index 110e4385d63..c0becf8bff0 100644 --- a/TAO/tests/DIOP/UDP_i.h +++ b/TAO/tests/DIOP/UDP_i.h @@ -37,14 +37,14 @@ public: UDP_i (CORBA::ORB_ptr o); /// Destructor - ~UDP_i (void); + ~UDP_i (); virtual void invoke (const char *client_name, UDP_ptr udpHandler, CORBA::Long request_id); /// Shutdown the server. - virtual void shutdown (void); + virtual void shutdown (); private: /// ORB pointer. diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp index b93e888e36c..4fbd18caa77 100644 --- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp @@ -127,7 +127,7 @@ Test_Client_Module::init (int argc, ACE_TCHAR *argv[]) } int -Test_Client_Module::fini (void) +Test_Client_Module::fini () { ACE_DEBUG ((LM_INFO, "Client is being finalized.\n")); @@ -147,7 +147,7 @@ Test_Client_Module::fini (void) } int -Test_Client_Module::svc (void) +Test_Client_Module::svc () { try { diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp index 260efda2744..5e5b1e1fb47 100644 --- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp +++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp @@ -33,7 +33,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) return 0; } -Test_Server_Module::~Test_Server_Module (void) +Test_Server_Module::~Test_Server_Module () { } @@ -157,7 +157,7 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[]) } int -Test_Server_Module::fini (void) +Test_Server_Module::fini () { ACE_DEBUG ((LM_INFO, "Server is being finalized.\n")); @@ -177,7 +177,7 @@ Test_Server_Module::fini (void) } int -Test_Server_Module::svc (void) +Test_Server_Module::svc () { try { diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.h b/TAO/tests/DLL_ORB/Test_Server_Module.h index 7554d491117..c2011ba6c46 100644 --- a/TAO/tests/DLL_ORB/Test_Server_Module.h +++ b/TAO/tests/DLL_ORB/Test_Server_Module.h @@ -45,7 +45,7 @@ public: /// Run by a daemon thread to handle deferred processing. virtual int svc (); - virtual ~Test_Server_Module (void); + virtual ~Test_Server_Module (); private: /// Reference to the ORB. diff --git a/TAO/tests/DLL_ORB/Test_i.cpp b/TAO/tests/DLL_ORB/Test_i.cpp index 8f808922e71..ebbf786288f 100644 --- a/TAO/tests/DLL_ORB/Test_i.cpp +++ b/TAO/tests/DLL_ORB/Test_i.cpp @@ -1,7 +1,7 @@ // -*- C++ -*- #include "Test_i.h" -Test_i::Test_i (void) +Test_i::Test_i () : orb_ () { } @@ -14,7 +14,7 @@ Test_i::invoke_me ( /* */) } void -Test_i::shutdown (void) +Test_i::shutdown () { ACE_DEBUG ((LM_INFO, "Server is shutting down.\n")); diff --git a/TAO/tests/DLL_ORB/Test_i.h b/TAO/tests/DLL_ORB/Test_i.h index 4ad2c2af555..f6a20b953ee 100644 --- a/TAO/tests/DLL_ORB/Test_i.h +++ b/TAO/tests/DLL_ORB/Test_i.h @@ -27,14 +27,14 @@ class Test_i : public virtual POA_Test { public: /// Constructor. - Test_i (void); + Test_i (); /// Simple two-way operation used to excercise the ORB transport /// internals. - virtual void invoke_me (void); + virtual void invoke_me (); /// Shutdown the ORB. - virtual void shutdown (void); + virtual void shutdown (); /// Set the ORB to be shutdown by the shutdown() method in this /// class. diff --git a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h index 134dafde1e0..11a75754d40 100644 --- a/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h +++ b/TAO/tests/DSI_AMI_Gateway/My_DII_Reply_Handler.h @@ -11,7 +11,7 @@ class My_DII_Reply_Handler : public virtual TAO_DII_Reply_Handler, public: My_DII_Reply_Handler (TAO_AMH_DSI_Response_Handler_ptr rph, CORBA::ORB_var orb); - virtual ~My_DII_Reply_Handler (void); + virtual ~My_DII_Reply_Handler (); // Callback method for deferred synchronous requests. virtual void handle_response (TAO_InputCDR &incoming); diff --git a/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp b/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp index 225b4a3475e..c678877fd6f 100644 --- a/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp +++ b/TAO/tests/DSI_AMI_Gateway/test_dsi.cpp @@ -130,7 +130,7 @@ DSI_Simple_Server::_primary_interface (const PortableServer::ObjectId &, } PortableServer::POA_ptr -DSI_Simple_Server::_default_POA (void) +DSI_Simple_Server::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/tests/DSI_AMI_Gateway/test_dsi.h b/TAO/tests/DSI_AMI_Gateway/test_dsi.h index e1bab6f3184..957e09e5e6b 100644 --- a/TAO/tests/DSI_AMI_Gateway/test_dsi.h +++ b/TAO/tests/DSI_AMI_Gateway/test_dsi.h @@ -50,7 +50,7 @@ public: const PortableServer::ObjectId &oid, PortableServer::POA_ptr poa); - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); private: /// The ORB diff --git a/TAO/tests/DSI_AMI_Gateway/test_i.cpp b/TAO/tests/DSI_AMI_Gateway/test_i.cpp index b2a50ab519d..b8493c6cc96 100644 --- a/TAO/tests/DSI_AMI_Gateway/test_i.cpp +++ b/TAO/tests/DSI_AMI_Gateway/test_i.cpp @@ -33,25 +33,25 @@ Simple_Server_i::test_method (CORBA::Long x, } void -Simple_Server_i::raise_user_exception (void) +Simple_Server_i::raise_user_exception () { throw test_exception (33, "reactor meltdown", "kaput"); } void -Simple_Server_i::raise_system_exception (void) +Simple_Server_i::raise_system_exception () { throw CORBA::NO_PERMISSION (); } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } CORBA::Long -Simple_Server_i::test_val (void) +Simple_Server_i::test_val () { return vlong_; } diff --git a/TAO/tests/DSI_AMI_Gateway/test_i.h b/TAO/tests/DSI_AMI_Gateway/test_i.h index 08fb539dde6..7c38878d778 100644 --- a/TAO/tests/DSI_AMI_Gateway/test_i.h +++ b/TAO/tests/DSI_AMI_Gateway/test_i.h @@ -32,15 +32,15 @@ public: Structure_out the_out_structure, char *&name); - CORBA::Long test_val (void); + CORBA::Long test_val (); void test_val (CORBA::Long test_val); - void raise_user_exception (void); + void raise_user_exception (); - void raise_system_exception (void); + void raise_system_exception (); - void shutdown (void); + void shutdown (); private: // The ORB diff --git a/TAO/tests/DSI_Gateway/test_dsi.cpp b/TAO/tests/DSI_Gateway/test_dsi.cpp index 379110de503..d008b54fac9 100644 --- a/TAO/tests/DSI_Gateway/test_dsi.cpp +++ b/TAO/tests/DSI_Gateway/test_dsi.cpp @@ -62,7 +62,7 @@ DSI_Simple_Server::_primary_interface (const PortableServer::ObjectId &, } PortableServer::POA_ptr -DSI_Simple_Server::_default_POA (void) +DSI_Simple_Server::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/tests/DSI_Gateway/test_i.cpp b/TAO/tests/DSI_Gateway/test_i.cpp index b2a50ab519d..b8493c6cc96 100644 --- a/TAO/tests/DSI_Gateway/test_i.cpp +++ b/TAO/tests/DSI_Gateway/test_i.cpp @@ -33,25 +33,25 @@ Simple_Server_i::test_method (CORBA::Long x, } void -Simple_Server_i::raise_user_exception (void) +Simple_Server_i::raise_user_exception () { throw test_exception (33, "reactor meltdown", "kaput"); } void -Simple_Server_i::raise_system_exception (void) +Simple_Server_i::raise_system_exception () { throw CORBA::NO_PERMISSION (); } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } CORBA::Long -Simple_Server_i::test_val (void) +Simple_Server_i::test_val () { return vlong_; } diff --git a/TAO/tests/DSI_Gateway/test_i.h b/TAO/tests/DSI_Gateway/test_i.h index 08fb539dde6..7c38878d778 100644 --- a/TAO/tests/DSI_Gateway/test_i.h +++ b/TAO/tests/DSI_Gateway/test_i.h @@ -32,15 +32,15 @@ public: Structure_out the_out_structure, char *&name); - CORBA::Long test_val (void); + CORBA::Long test_val (); void test_val (CORBA::Long test_val); - void raise_user_exception (void); + void raise_user_exception (); - void raise_system_exception (void); + void raise_system_exception (); - void shutdown (void); + void shutdown (); private: // The ORB diff --git a/TAO/tests/DiffServ/server.cpp b/TAO/tests/DiffServ/server.cpp index 53e4301c8b6..a42c51ca2d6 100644 --- a/TAO/tests/DiffServ/server.cpp +++ b/TAO/tests/DiffServ/server.cpp @@ -61,10 +61,10 @@ class Test_i : public POA_Test public: Test_i (CORBA::ORB_ptr orb); - void test_method (void); + void test_method (); //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); //FUZZ: enable check_for_lack_ACE_OS private: @@ -77,14 +77,14 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } void -Test_i::test_method (void) +Test_i::test_method () { ACE_DEBUG ((LM_DEBUG, "Test_i::test_method\n")); } void -Test_i::shutdown (void) +Test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/DynAny_Test/analyzer.cpp b/TAO/tests/DynAny_Test/analyzer.cpp index 2b8ea7c7774..3526621a66b 100644 --- a/TAO/tests/DynAny_Test/analyzer.cpp +++ b/TAO/tests/DynAny_Test/analyzer.cpp @@ -68,11 +68,11 @@ void DynAnyAnalyzer::tab (int t) } } -DynAnyAnalyzer::~DynAnyAnalyzer (void) +DynAnyAnalyzer::~DynAnyAnalyzer () { } -void DynAnyAnalyzer::resetTab (void) +void DynAnyAnalyzer::resetTab () { level_ = 0; } diff --git a/TAO/tests/DynAny_Test/analyzer.h b/TAO/tests/DynAny_Test/analyzer.h index 619380af541..7da71ab4f6a 100644 --- a/TAO/tests/DynAny_Test/analyzer.h +++ b/TAO/tests/DynAny_Test/analyzer.h @@ -27,9 +27,9 @@ public: void tab (int t); - ~DynAnyAnalyzer (void); + ~DynAnyAnalyzer (); - void resetTab (void); + void resetTab (); void analyze (DynamicAny::DynAny_ptr da); diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp index fb680eab82a..4aae2c73161 100644 --- a/TAO/tests/DynAny_Test/data.cpp +++ b/TAO/tests/DynAny_Test/data.cpp @@ -98,7 +98,7 @@ Data::Data (CORBA::ORB_var orb) } } -Data::~Data (void) +Data::~Data () { CORBA::string_free (m_string1); CORBA::string_free (m_string2); diff --git a/TAO/tests/DynAny_Test/data.h b/TAO/tests/DynAny_Test/data.h index 164ba8df20a..e488d233e46 100644 --- a/TAO/tests/DynAny_Test/data.h +++ b/TAO/tests/DynAny_Test/data.h @@ -18,7 +18,7 @@ class Data { public: Data (CORBA::ORB_var orb); - ~Data (void); + ~Data (); CORBA::Boolean m_bool1, m_bool2; CORBA::Octet m_octet1, m_octet2; diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp index 0ea3edfc135..c08e10e82bb 100644 --- a/TAO/tests/DynAny_Test/driver.cpp +++ b/TAO/tests/DynAny_Test/driver.cpp @@ -57,14 +57,14 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) } // constructor -Driver::Driver (void) +Driver::Driver () : test_type_ (NO_TEST), debug_ (0) { } // destructor -Driver::~Driver (void) +Driver::~Driver () { if (this->orb_.in () != 0) { @@ -158,7 +158,7 @@ Driver::parse_args (int argc, ACE_TCHAR *argv[]) } int -Driver::run (void) +Driver::run () { int error_count = 0; diff --git a/TAO/tests/DynAny_Test/driver.h b/TAO/tests/DynAny_Test/driver.h index 1ca55131df9..f337213da6a 100644 --- a/TAO/tests/DynAny_Test/driver.h +++ b/TAO/tests/DynAny_Test/driver.h @@ -19,8 +19,8 @@ class Driver { public: // = Constructor and destructor. - Driver (void); - ~Driver (void); + Driver (); + ~Driver (); enum TEST_TYPE { @@ -43,7 +43,7 @@ enum TEST_TYPE /** * @return The number of errors detected */ - int run (void); + int run (); private: /// underlying ORB (we do not own it) diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp index 53128689442..4bed14fab5b 100644 --- a/TAO/tests/DynAny_Test/test_dynany.cpp +++ b/TAO/tests/DynAny_Test/test_dynany.cpp @@ -24,7 +24,7 @@ Test_DynAny::Test_DynAny (CORBA::ORB_var orb, int debug) { } -Test_DynAny::~Test_DynAny (void) +Test_DynAny::~Test_DynAny () { CORBA::string_free (this->test_name_); this->test_name_ = 0; @@ -37,7 +37,7 @@ Test_DynAny::test_name () const } int -Test_DynAny::run_test (void) +Test_DynAny::run_test () { Data data (this->orb_); diff --git a/TAO/tests/DynAny_Test/test_dynany.h b/TAO/tests/DynAny_Test/test_dynany.h index c04e394ed54..c19d5caca98 100644 --- a/TAO/tests/DynAny_Test/test_dynany.h +++ b/TAO/tests/DynAny_Test/test_dynany.h @@ -19,11 +19,11 @@ class Test_DynAny { public: Test_DynAny (CORBA::ORB_var orb, int debug); - ~Test_DynAny (void); + ~Test_DynAny (); const char* test_name () const; - int run_test (void); + int run_test (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/DynAny_Test/test_dynarray.cpp b/TAO/tests/DynAny_Test/test_dynarray.cpp index 18a43659558..57b5ccb71e8 100644 --- a/TAO/tests/DynAny_Test/test_dynarray.cpp +++ b/TAO/tests/DynAny_Test/test_dynarray.cpp @@ -23,7 +23,7 @@ Test_DynArray::Test_DynArray (CORBA::ORB_var orb, int debug) { } -Test_DynArray::~Test_DynArray (void) +Test_DynArray::~Test_DynArray () { CORBA::string_free (this->test_name_); this->test_name_ = 0; @@ -36,7 +36,7 @@ Test_DynArray::test_name () const } int -Test_DynArray::run_test (void) +Test_DynArray::run_test () { Data data (this->orb_); diff --git a/TAO/tests/DynAny_Test/test_dynarray.h b/TAO/tests/DynAny_Test/test_dynarray.h index 50367b2a930..fb5b35fc827 100644 --- a/TAO/tests/DynAny_Test/test_dynarray.h +++ b/TAO/tests/DynAny_Test/test_dynarray.h @@ -18,11 +18,11 @@ class Test_DynArray { public: Test_DynArray (CORBA::ORB_var orb, int debug); - ~Test_DynArray (void); + ~Test_DynArray (); const char* test_name () const; - int run_test (void); + int run_test (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp index 9980259db9b..a3878393399 100644 --- a/TAO/tests/DynAny_Test/test_dynenum.cpp +++ b/TAO/tests/DynAny_Test/test_dynenum.cpp @@ -24,7 +24,7 @@ Test_DynEnum::Test_DynEnum (CORBA::ORB_var orb, int debug) { } -Test_DynEnum::~Test_DynEnum (void) +Test_DynEnum::~Test_DynEnum () { CORBA::string_free (this->test_name_); this->test_name_ = 0; @@ -37,7 +37,7 @@ Test_DynEnum::test_name () const } int -Test_DynEnum::run_test (void) +Test_DynEnum::run_test () { Data data (this->orb_); diff --git a/TAO/tests/DynAny_Test/test_dynenum.h b/TAO/tests/DynAny_Test/test_dynenum.h index e6714028824..a4e671991cd 100644 --- a/TAO/tests/DynAny_Test/test_dynenum.h +++ b/TAO/tests/DynAny_Test/test_dynenum.h @@ -18,11 +18,11 @@ class Test_DynEnum { public: Test_DynEnum (CORBA::ORB_var orb, int debug); - ~Test_DynEnum (void); + ~Test_DynEnum (); const char* test_name () const; - int run_test (void); + int run_test (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp index 7721aa40e59..04a4ca1b963 100644 --- a/TAO/tests/DynAny_Test/test_dynsequence.cpp +++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp @@ -53,7 +53,7 @@ Test_DynSequence::Test_DynSequence (CORBA::ORB_var orb, int debug) { } -Test_DynSequence::~Test_DynSequence (void) +Test_DynSequence::~Test_DynSequence () { CORBA::string_free (this->test_name_); this->test_name_ = 0; @@ -66,7 +66,7 @@ Test_DynSequence::test_name () const } int -Test_DynSequence::run_test (void) +Test_DynSequence::run_test () { Data data (this->orb_); DynAnyTests::test_seq ts (2); diff --git a/TAO/tests/DynAny_Test/test_dynsequence.h b/TAO/tests/DynAny_Test/test_dynsequence.h index afe325722a6..415005fb00e 100644 --- a/TAO/tests/DynAny_Test/test_dynsequence.h +++ b/TAO/tests/DynAny_Test/test_dynsequence.h @@ -18,11 +18,11 @@ class Test_DynSequence { public: Test_DynSequence (CORBA::ORB_var orb, int debug); - ~Test_DynSequence (void); + ~Test_DynSequence (); const char* test_name () const; - int run_test (void); + int run_test (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp index 915835bfa73..1ad95f62dd0 100644 --- a/TAO/tests/DynAny_Test/test_dynstruct.cpp +++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp @@ -24,7 +24,7 @@ Test_DynStruct::Test_DynStruct (CORBA::ORB_var orb, int debug) { } -Test_DynStruct::~Test_DynStruct (void) +Test_DynStruct::~Test_DynStruct () { CORBA::string_free (this->test_name_); this->test_name_ = 0; @@ -37,7 +37,7 @@ Test_DynStruct::test_name () const } int -Test_DynStruct::run_test (void) +Test_DynStruct::run_test () { Data data (this->orb_); diff --git a/TAO/tests/DynAny_Test/test_dynstruct.h b/TAO/tests/DynAny_Test/test_dynstruct.h index 408d626dda8..6b0a5a9099f 100644 --- a/TAO/tests/DynAny_Test/test_dynstruct.h +++ b/TAO/tests/DynAny_Test/test_dynstruct.h @@ -18,11 +18,11 @@ class Test_DynStruct { public: Test_DynStruct (CORBA::ORB_var orb, int debug); - ~Test_DynStruct (void); + ~Test_DynStruct (); const char* test_name () const; - int run_test (void); + int run_test (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/DynAny_Test/test_dynunion.cpp b/TAO/tests/DynAny_Test/test_dynunion.cpp index f51f05ec3b9..125a533b0fa 100644 --- a/TAO/tests/DynAny_Test/test_dynunion.cpp +++ b/TAO/tests/DynAny_Test/test_dynunion.cpp @@ -23,7 +23,7 @@ Test_DynUnion::Test_DynUnion (CORBA::ORB_var orb, int debug) { } -Test_DynUnion::~Test_DynUnion (void) +Test_DynUnion::~Test_DynUnion () { CORBA::string_free (this->test_name_); this->test_name_ = 0; @@ -36,7 +36,7 @@ Test_DynUnion::test_name () const } int -Test_DynUnion::run_test (void) +Test_DynUnion::run_test () { Data data (this->orb_); diff --git a/TAO/tests/DynAny_Test/test_dynunion.h b/TAO/tests/DynAny_Test/test_dynunion.h index 77ddc0eeef2..e359caac22e 100644 --- a/TAO/tests/DynAny_Test/test_dynunion.h +++ b/TAO/tests/DynAny_Test/test_dynunion.h @@ -18,11 +18,11 @@ class Test_DynUnion { public: Test_DynUnion (CORBA::ORB_var orb, int debug); - ~Test_DynUnion (void); + ~Test_DynUnion (); const char* test_name () const; - int run_test (void); + int run_test (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/DynAny_Test/test_wrapper.cpp b/TAO/tests/DynAny_Test/test_wrapper.cpp index 5befb0e0484..c95c1854038 100644 --- a/TAO/tests/DynAny_Test/test_wrapper.cpp +++ b/TAO/tests/DynAny_Test/test_wrapper.cpp @@ -24,14 +24,14 @@ Test_Wrapper<T>::Test_Wrapper (T* t) // Destructor template <class T> -Test_Wrapper<T>::~Test_Wrapper (void) +Test_Wrapper<T>::~Test_Wrapper () { delete this->test_object_; } template <class T> int -Test_Wrapper<T>::run_test (void) +Test_Wrapper<T>::run_test () { const char* test_name = this->test_object_->test_name (); diff --git a/TAO/tests/DynAny_Test/test_wrapper.h b/TAO/tests/DynAny_Test/test_wrapper.h index afcf83b93ac..11abca739b0 100644 --- a/TAO/tests/DynAny_Test/test_wrapper.h +++ b/TAO/tests/DynAny_Test/test_wrapper.h @@ -22,14 +22,14 @@ public: // constructor and destructor Test_Wrapper (T *); - ~Test_Wrapper (void); + ~Test_Wrapper (); /** * @brief Run the test. * * @return The number of errors detected. */ - int run_test (void); + int run_test (); private: // This does all the work. diff --git a/TAO/tests/DynValue_Test/ValueTypes_impl.h b/TAO/tests/DynValue_Test/ValueTypes_impl.h index 25bd32b1323..a92c73c9e24 100644 --- a/TAO/tests/DynValue_Test/ValueTypes_impl.h +++ b/TAO/tests/DynValue_Test/ValueTypes_impl.h @@ -21,7 +21,7 @@ public: BaseValue_impl (CORBA::UShort us1, CORBA::UShort us2) : OBV_DynValue_Test::BaseValue (us1,us2) {} virtual ~BaseValue_impl (); - virtual CORBA::ValueBase * _copy_value (void); + virtual CORBA::ValueBase * _copy_value (); virtual void print (); }; @@ -42,7 +42,7 @@ public: NestedValue_impl (CORBA::Short s1, CORBA::Short s2) : OBV_DynValue_Test::NestedValue (s1,s2) {} virtual ~NestedValue_impl (); - virtual CORBA::ValueBase * _copy_value (void); + virtual CORBA::ValueBase * _copy_value (); }; class NestedValue_Factory : public factory_id @@ -60,7 +60,7 @@ class NullValue_impl : public virtual OBV_DynValue_Test::NullValue, public: NullValue_impl () {} virtual ~NullValue_impl (); - virtual CORBA::ValueBase * _copy_value (void); + virtual CORBA::ValueBase * _copy_value (); }; class NullValue_Factory : public factory_id diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp index 7d330b5d366..7c509f094ea 100644 --- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp +++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.cpp @@ -16,7 +16,7 @@ Sleeper_i::delay(CORBA::Short sec) } void -Sleeper_i::shutdown (void) +Sleeper_i::shutdown () { this->orb_->shutdown (false); } @@ -72,7 +72,7 @@ Middle_i::call_delay(CORBA::Short sec) } void -Middle_i::shutdown (void) +Middle_i::shutdown () { sleeper_->shutdown (); this->orb_->shutdown (false); diff --git a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h index 1aeb8f5a8fd..c1aec4fd9e9 100644 --- a/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h +++ b/TAO/tests/Dynamic_TP/ORB_ThreadPool/Test_i.h @@ -17,7 +17,7 @@ public: // = The skeleton methods virtual void delay (CORBA::Short sec); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; @@ -34,7 +34,7 @@ public: // = The skeleton methods virtual void call_delay (CORBA::Short sec); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp index 19720e55059..67b6c09beb3 100644 --- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.cpp @@ -34,7 +34,7 @@ Hello::get_string (CORBA::Long client_num) } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.h b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.h index 751390c4e00..b721e04bb1d 100644 --- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.h +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/Hello.h @@ -18,7 +18,7 @@ public: virtual void sleep_sec (CORBA::Short sleep_sec); virtual char * get_string (CORBA::Long); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp index a1650ddd85f..c4cda2ecdb1 100644 --- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Dynamic/client.cpp @@ -70,7 +70,7 @@ public: target_ (Test::Hello::_duplicate(h)) {} - int svc (void); + int svc (); int replies_; int nis_; @@ -81,7 +81,7 @@ private: Test::Hello_var target_; }; -int ClientTask::svc (void) +int ClientTask::svc () { int ndx = 0; { diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp index 19720e55059..67b6c09beb3 100644 --- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.cpp @@ -34,7 +34,7 @@ Hello::get_string (CORBA::Long client_num) } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.h b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.h index 751390c4e00..b721e04bb1d 100644 --- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.h +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/Hello.h @@ -18,7 +18,7 @@ public: virtual void sleep_sec (CORBA::Short sleep_sec); virtual char * get_string (CORBA::Long); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp index a1650ddd85f..c4cda2ecdb1 100644 --- a/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp +++ b/TAO/tests/Dynamic_TP/POA_Loader/Dynamic_TP_POA_Test_Static/client.cpp @@ -70,7 +70,7 @@ public: target_ (Test::Hello::_duplicate(h)) {} - int svc (void); + int svc (); int replies_; int nis_; @@ -81,7 +81,7 @@ private: Test::Hello_var target_; }; -int ClientTask::svc (void) +int ClientTask::svc () { int ndx = 0; { diff --git a/TAO/tests/Explicit_Event_Loop/server.h b/TAO/tests/Explicit_Event_Loop/server.h index a61cc86259e..afeefeb30c9 100644 --- a/TAO/tests/Explicit_Event_Loop/server.h +++ b/TAO/tests/Explicit_Event_Loop/server.h @@ -19,7 +19,7 @@ class Time_impl : public virtual POA_Time { public: - virtual TimeOfDay get_gmt (void); + virtual TimeOfDay get_gmt (); }; #endif /* server_HH_ */ diff --git a/TAO/tests/Exposed_Policies/Counter_i.cpp b/TAO/tests/Exposed_Policies/Counter_i.cpp index 0c80c2c6e3c..2e60d01db03 100644 --- a/TAO/tests/Exposed_Policies/Counter_i.cpp +++ b/TAO/tests/Exposed_Policies/Counter_i.cpp @@ -9,7 +9,7 @@ Counter_Servant::Counter_Servant (Policy_Tester *policy_tester) // No-Op. } -Counter_Servant::~Counter_Servant (void) +Counter_Servant::~Counter_Servant () { // No-Op. } @@ -35,7 +35,7 @@ Counter_Servant::reset (/**/) } void -Counter_Servant::shutdown (void) +Counter_Servant::shutdown () { this->policy_tester_->shutdown (); } diff --git a/TAO/tests/Exposed_Policies/Counter_i.h b/TAO/tests/Exposed_Policies/Counter_i.h index 19464ebc6ff..eb6e66b79be 100644 --- a/TAO/tests/Exposed_Policies/Counter_i.h +++ b/TAO/tests/Exposed_Policies/Counter_i.h @@ -24,17 +24,17 @@ public: // = Ctor-Dtor Declaration Counter_Servant (Policy_Tester *policy_tester); - virtual ~Counter_Servant (void); + virtual ~Counter_Servant (); // = Counter Interface Methods Overloading. - virtual void increment (void); + virtual void increment (); - virtual CORBA::Long get_count (void); + virtual CORBA::Long get_count (); - virtual void reset (void); + virtual void reset (); - virtual void shutdown (void); + virtual void shutdown (); protected: CORBA::Long count_; diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp index c7b3633a048..0ae1ebae8a7 100644 --- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp +++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp @@ -16,19 +16,19 @@ #include "tao/ORB_Constants.h" #include "tao/ORB_Core.h" -Policy_Tester::Policy_Tester (void) +Policy_Tester::Policy_Tester () : rt_object_properties_ (0), rt_poa_properties_ (0) { // No_Op } -Policy_Tester::~Policy_Tester (void) +Policy_Tester::~Policy_Tester () { } void -Policy_Tester::run (void) +Policy_Tester::run () { PortableServer::POAManager_var poa_manager = this->child_poa_->the_POAManager (); @@ -127,7 +127,7 @@ Policy_Tester::check_reference (CORBA::Object_ptr object, int -Policy_Tester::create_objects (void) +Policy_Tester::create_objects () { CORBA::PolicyList poa_policy_list; poa_policy_list.length (3); @@ -255,7 +255,7 @@ Policy_Tester::create_objects (void) } void -Policy_Tester::shutdown (void) +Policy_Tester::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.h b/TAO/tests/Exposed_Policies/Policy_Tester.h index 106e2b94dd4..99329d281e3 100644 --- a/TAO/tests/Exposed_Policies/Policy_Tester.h +++ b/TAO/tests/Exposed_Policies/Policy_Tester.h @@ -25,19 +25,19 @@ class Policy_Tester { public: // Ctor/Dtor. - Policy_Tester (void); - ~Policy_Tester (void); + Policy_Tester (); + ~Policy_Tester (); /// Runs the test. - void run (void); + void run (); int init (int argc, ACE_TCHAR *argv[]); - void shutdown (void); + void shutdown (); private: // Helper method used internally. - int create_objects (void); + int create_objects (); CORBA::Boolean check_reference (CORBA::Object_ptr object, const char *msg); diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp index be292821e7f..1d32bc432de 100644 --- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp +++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp @@ -1,7 +1,7 @@ #include "Policy_Verifier.h" #include "ace/OS_NS_string.h" -Policy_Verifier::Policy_Verifier (void) +Policy_Verifier::Policy_Verifier () : rt_object_properties_ (0) , rt_poa_properties_ (0) , priority_bands_ (0) @@ -12,7 +12,7 @@ Policy_Verifier::Policy_Verifier (void) ACE_TEXT("file://overridden.ior")); } -Policy_Verifier::~Policy_Verifier (void) +Policy_Verifier::~Policy_Verifier () { delete rt_object_properties_; delete rt_poa_properties_; diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.h b/TAO/tests/Exposed_Policies/Policy_Verifier.h index 99ae21b2ab5..c035274d2ee 100644 --- a/TAO/tests/Exposed_Policies/Policy_Verifier.h +++ b/TAO/tests/Exposed_Policies/Policy_Verifier.h @@ -29,12 +29,12 @@ class Policy_Verifier { public: // -- Ctor/Dtor -- - Policy_Verifier (void); - ~Policy_Verifier (void); + Policy_Verifier (); + ~Policy_Verifier (); bool init (int argc, ACE_TCHAR *argv[]); - void run (void); + void run (); private: // -- Helper methods -- diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp index 350a5a8a7ca..8218b5ac219 100644 --- a/TAO/tests/Exposed_Policies/RT_Properties.cpp +++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp @@ -5,13 +5,13 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_string.h" -RT_Properties::RT_Properties (void) +RT_Properties::RT_Properties () : priority_ (10) { ior_source_ = ACE_TEXT("poa_default.ior"); } -RT_Properties::~RT_Properties (void) +RT_Properties::~RT_Properties () { // No-Op. } @@ -76,7 +76,7 @@ RT_Properties::priority (RTCORBA::Priority priority) } RTCORBA::Priority -RT_Properties::priority (void) +RT_Properties::priority () { return this->priority_; } @@ -88,7 +88,7 @@ RT_Properties::priority_bands (const RTCORBA::PriorityBands& priority_bands) } const RTCORBA::PriorityBands& -RT_Properties::priority_bands (void) +RT_Properties::priority_bands () { return this->priority_bands_; } @@ -100,7 +100,7 @@ RT_Properties::ior_source (const ACE_TCHAR *s) } const ACE_TCHAR * -RT_Properties::ior_source (void) +RT_Properties::ior_source () { return this->ior_source_.c_str (); } diff --git a/TAO/tests/Exposed_Policies/RT_Properties.h b/TAO/tests/Exposed_Policies/RT_Properties.h index bda1697cd83..c627fb70c9a 100644 --- a/TAO/tests/Exposed_Policies/RT_Properties.h +++ b/TAO/tests/Exposed_Policies/RT_Properties.h @@ -19,20 +19,20 @@ class RT_Properties { public: // -- Ctor/Dtor -- - RT_Properties (void); - ~RT_Properties (void); + RT_Properties (); + ~RT_Properties (); static RT_Properties * read_from (const ACE_TCHAR *file_name); // -- Accessor Methods -- void priority (RTCORBA::Priority priority); - RTCORBA::Priority priority (void); + RTCORBA::Priority priority (); void priority_bands (const RTCORBA::PriorityBands& priority_bands); - const RTCORBA::PriorityBands& priority_bands (void); + const RTCORBA::PriorityBands& priority_bands (); void ior_source (const ACE_TCHAR *s); - const ACE_TCHAR* ior_source (void); + const ACE_TCHAR* ior_source (); private: RTCORBA::Priority priority_; diff --git a/TAO/tests/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp index 2e3088390d6..b66b9ae2cdf 100644 --- a/TAO/tests/FL_Cube/client.cpp +++ b/TAO/tests/FL_Cube/client.cpp @@ -19,9 +19,9 @@ public: Fl_Window* parent); // ctor - ~Client (void); + ~Client (); - void show (void); + void show (); // Call show on all the window objects void parse_args (int argc, ACE_TCHAR *argv[]); @@ -31,8 +31,8 @@ private: static void y_cb (Fl_Widget *widget, void* cookie); // The callbacks - void x_changed (void); - void y_changed (void); + void x_changed (); + void y_changed (); // The methods for the callbacks private: @@ -99,14 +99,14 @@ Client::Client (CORBA::ORB_ptr orb, this->y_roller_->step (1); } -Client::~Client (void) +Client::~Client () { delete x_roller_; delete y_roller_; } void -Client::show (void) +Client::show () { this->x_roller_->show (); this->y_roller_->show (); @@ -127,7 +127,7 @@ Client::y_cb (Fl_Widget*, void* cookie) } void -Client::x_changed (void) +Client::x_changed () { try { @@ -141,7 +141,7 @@ Client::x_changed (void) } void -Client::y_changed (void) +Client::y_changed () { try { diff --git a/TAO/tests/FL_Cube/test_i.cpp b/TAO/tests/FL_Cube/test_i.cpp index 1ae00f711a7..1d75cbd70c9 100644 --- a/TAO/tests/FL_Cube/test_i.cpp +++ b/TAO/tests/FL_Cube/test_i.cpp @@ -21,7 +21,7 @@ Simple_Server_i::set_y_angle (CORBA::Long y) } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } @@ -60,7 +60,7 @@ Simple_Window::set_y_angle (CORBA::Long y) } void -Simple_Window::draw (void) +Simple_Window::draw () { // Based on the CubeView example in the FL toolkit. @@ -86,7 +86,7 @@ Simple_Window::draw (void) } void -Simple_Window::draw_cube (void) +Simple_Window::draw_cube () { const float ALPHA = 0.5; diff --git a/TAO/tests/FL_Cube/test_i.h b/TAO/tests/FL_Cube/test_i.h index 8ae8098f7a6..62ea39f6dbc 100644 --- a/TAO/tests/FL_Cube/test_i.h +++ b/TAO/tests/FL_Cube/test_i.h @@ -28,9 +28,9 @@ public: private: /// from the Fl_Gl_Window... - virtual void draw (void); + virtual void draw (); - virtual void draw_cube (void); + virtual void draw_cube (); /// The angles... CORBA::Long x_angle_; @@ -60,7 +60,7 @@ public: // = The Simple_Server methods. void set_x_angle (CORBA::Long x); void set_y_angle (CORBA::Long y); - void shutdown (void); + void shutdown (); private: /// The ORB diff --git a/TAO/tests/Faults/ping_i.cpp b/TAO/tests/Faults/ping_i.cpp index 6be7b4ec2a9..060e9a15a57 100644 --- a/TAO/tests/Faults/ping_i.cpp +++ b/TAO/tests/Faults/ping_i.cpp @@ -11,18 +11,18 @@ PingObject_i::ping (PingObject_ptr callback) } void -PingObject_i::pong (void) +PingObject_i::pong () { } void -PingObject_i::shutdown (void) +PingObject_i::shutdown () { this->orb_->shutdown (false); } PortableServer::POA_ptr -PingObject_i::_default_POA (void) +PingObject_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/tests/Faults/ping_i.h b/TAO/tests/Faults/ping_i.h index 809bf32802e..f32efaf14da 100644 --- a/TAO/tests/Faults/ping_i.h +++ b/TAO/tests/Faults/ping_i.h @@ -31,10 +31,10 @@ public: // = The PingObject interface methods void ping (PingObject_ptr callback); - void pong (void); - void shutdown (void); + void pong (); + void shutdown (); - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); private: /// The orb diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp index e88d859e42b..bdb07cfb63d 100644 --- a/TAO/tests/Faults/test_i.cpp +++ b/TAO/tests/Faults/test_i.cpp @@ -64,7 +64,7 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean) } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } @@ -105,7 +105,7 @@ Middle_i::shutdown_now (CORBA::Boolean is_clean) } void -Middle_i::shutdown (void) +Middle_i::shutdown () { try { diff --git a/TAO/tests/Faults/test_i.h b/TAO/tests/Faults/test_i.h index 884e62ff26d..48b304f79c4 100644 --- a/TAO/tests/Faults/test_i.h +++ b/TAO/tests/Faults/test_i.h @@ -55,7 +55,7 @@ public: void shutdown_now (CORBA::Boolean is_clean); - void shutdown (void); + void shutdown (); private: /// The ORB @@ -83,7 +83,7 @@ public: void shutdown_now (CORBA::Boolean is_clean); - void shutdown (void); + void shutdown (); private: /// The ORB diff --git a/TAO/tests/File_IO/File_i.cpp b/TAO/tests/File_IO/File_i.cpp index 5d3a6d6621c..f1f3f2e03ac 100644 --- a/TAO/tests/File_IO/File_i.cpp +++ b/TAO/tests/File_IO/File_i.cpp @@ -27,12 +27,12 @@ FileImpl::System::System (PortableServer::POA_ptr poa) poa->set_servant (&this->fd_servant_); } -FileImpl::System::~System (void) +FileImpl::System::~System () { } PortableServer::POA_ptr -FileImpl::System::_default_POA (void) +FileImpl::System::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -82,19 +82,19 @@ FileImpl::Descriptor::Descriptor (PortableServer::POA_ptr poa) { } -FileImpl::Descriptor::~Descriptor (void) +FileImpl::Descriptor::~Descriptor () { } PortableServer::POA_ptr -FileImpl::Descriptor::_default_POA (void) +FileImpl::Descriptor::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } //Extracts the ACE_HANDLE from the passed object reference ACE_HANDLE -FileImpl::Descriptor::fd (void) +FileImpl::Descriptor::fd () { // // One way of getting our id. @@ -194,7 +194,7 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset, } void -FileImpl::Descriptor::destroy (void) +FileImpl::Descriptor::destroy () { // Get the ACE_HANDLE for this object reference ACE_HANDLE file_descriptor = this->fd (); diff --git a/TAO/tests/File_IO/File_i.h b/TAO/tests/File_IO/File_i.h index 62327714b82..971dc5eb49e 100644 --- a/TAO/tests/File_IO/File_i.h +++ b/TAO/tests/File_IO/File_i.h @@ -35,10 +35,10 @@ public: Descriptor (PortableServer::POA_ptr poa); /// Destructor - ~Descriptor (void); + ~Descriptor (); /// Returns the default POA of this object - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); /// write buffer to File corresponding to this Descriptor virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer); @@ -50,11 +50,11 @@ public: CORBA::Long whence); /// closes the file corresponding to the requested ObjectID - virtual void destroy (void); + virtual void destroy (); private: /// Extracts the ACE_HANDLE from the objectID - ACE_HANDLE fd (void); + ACE_HANDLE fd (); PortableServer::POA_var poa_; }; @@ -72,10 +72,10 @@ public: System (PortableServer::POA_ptr poa); ///Destructor - ~System (void); + ~System (); ///Returns the default POA of this object - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); /// Opens a file ,creates a Descriptor reference with the /// ACE_HANDLE and returns that reference diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp index 5cf199a84e1..73ef4a1ea3a 100644 --- a/TAO/tests/File_IO/server.cpp +++ b/TAO/tests/File_IO/server.cpp @@ -195,7 +195,7 @@ Worker::Worker (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { try { diff --git a/TAO/tests/ForwardOnceUponException/client.cpp b/TAO/tests/ForwardOnceUponException/client.cpp index c087183bf73..619fedad3b0 100644 --- a/TAO/tests/ForwardOnceUponException/client.cpp +++ b/TAO/tests/ForwardOnceUponException/client.cpp @@ -179,7 +179,7 @@ Worker::Worker (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { try { diff --git a/TAO/tests/ForwardOnceUponException/test_i.cpp b/TAO/tests/ForwardOnceUponException/test_i.cpp index c77bd7b2527..3060c08666a 100644 --- a/TAO/tests/ForwardOnceUponException/test_i.cpp +++ b/TAO/tests/ForwardOnceUponException/test_i.cpp @@ -39,7 +39,7 @@ Simple_Server_i::test_is_a (const char * /* type */) } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/ForwardOnceUponException/test_i.h b/TAO/tests/ForwardOnceUponException/test_i.h index 1c617592d51..2ebce1f3da0 100644 --- a/TAO/tests/ForwardOnceUponException/test_i.h +++ b/TAO/tests/ForwardOnceUponException/test_i.h @@ -29,7 +29,7 @@ public: // = The Simple_Server methods. CORBA::Boolean test_is_a (const char * type); - void shutdown (void); + void shutdown (); int ncalls () const; diff --git a/TAO/tests/ForwardUponObjectNotExist/client.cpp b/TAO/tests/ForwardUponObjectNotExist/client.cpp index ba98b629398..f795552f152 100644 --- a/TAO/tests/ForwardUponObjectNotExist/client.cpp +++ b/TAO/tests/ForwardUponObjectNotExist/client.cpp @@ -58,7 +58,7 @@ public: Worker (CORBA::ORB_ptr orb); /// The actual implementation of the test - virtual void run_test (void); + virtual void run_test (); virtual int svc (); @@ -145,7 +145,7 @@ Worker::Worker (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { try { @@ -163,7 +163,7 @@ Worker::svc (void) } void -Worker::run_test (void) +Worker::run_test () { CORBA::Object_var object = this->orb_->string_to_object (ior); diff --git a/TAO/tests/ForwardUponObjectNotExist/test_i.cpp b/TAO/tests/ForwardUponObjectNotExist/test_i.cpp index 0fd5c7419c4..b14f3393c35 100644 --- a/TAO/tests/ForwardUponObjectNotExist/test_i.cpp +++ b/TAO/tests/ForwardUponObjectNotExist/test_i.cpp @@ -13,7 +13,7 @@ Simple_Server_i::test_is_a (const char * /* type */) } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/ForwardUponObjectNotExist/test_i.h b/TAO/tests/ForwardUponObjectNotExist/test_i.h index 71c4495c6a8..78094fdd9cf 100644 --- a/TAO/tests/ForwardUponObjectNotExist/test_i.h +++ b/TAO/tests/ForwardUponObjectNotExist/test_i.h @@ -29,7 +29,7 @@ public: // = The Simple_Server methods. CORBA::Boolean test_is_a (const char * type); - void shutdown (void); + void shutdown (); private: /// The ORB diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp index c14cc58d77f..3c3094beb75 100644 --- a/TAO/tests/Forwarding/client.cpp +++ b/TAO/tests/Forwarding/client.cpp @@ -48,7 +48,7 @@ public: Worker (CORBA::ORB_ptr orb); // Constructor - virtual void run_test (void); + virtual void run_test (); // The actual implementation of the test // = The Task_Base methods @@ -118,7 +118,7 @@ Worker::Worker (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { try { @@ -133,7 +133,7 @@ Worker::svc (void) } void -Worker::run_test (void) +Worker::run_test () { for (int j = 0; j != niterations; ++j) { diff --git a/TAO/tests/Forwarding/test_i.cpp b/TAO/tests/Forwarding/test_i.cpp index a5df35f5892..03319fc0b1e 100644 --- a/TAO/tests/Forwarding/test_i.cpp +++ b/TAO/tests/Forwarding/test_i.cpp @@ -12,7 +12,7 @@ Simple_Server_i::test_is_a (const char * /* type */) } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Forwarding/test_i.h b/TAO/tests/Forwarding/test_i.h index 71c4495c6a8..78094fdd9cf 100644 --- a/TAO/tests/Forwarding/test_i.h +++ b/TAO/tests/Forwarding/test_i.h @@ -29,7 +29,7 @@ public: // = The Simple_Server methods. CORBA::Boolean test_is_a (const char * type); - void shutdown (void); + void shutdown (); private: /// The ORB diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp index 712826479b7..f7538cf098f 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp +++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.cpp @@ -12,7 +12,7 @@ Client_Task::Client_Task (Test::Big_Reply_ptr reply_gen, } int -Client_Task::svc (void) +Client_Task::svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h index ca33c1b6446..bf995196d7e 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h +++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/Client_Task.h @@ -20,7 +20,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Reference to the test interface diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp index ff03f1a2de6..04ebeb029e2 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.cpp @@ -23,7 +23,7 @@ Payload_Receiver::more_data (const Test::Payload &payload) void -Payload_Receiver::shutdown (void) +Payload_Receiver::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h index d6ba365e769..ccb0aa37661 100644 --- a/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h +++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/Payload_Receiver.h @@ -19,7 +19,7 @@ public: // = The skeleton methods virtual void more_data (const Test::Payload &payload); - virtual void shutdown (void); + virtual void shutdown (); int get_count () const; diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp index ff03f1a2de6..04ebeb029e2 100644 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.cpp @@ -23,7 +23,7 @@ Payload_Receiver::more_data (const Test::Payload &payload) void -Payload_Receiver::shutdown (void) +Payload_Receiver::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h index 25d0748febd..a2d635f0e69 100644 --- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h +++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/Payload_Receiver.h @@ -19,7 +19,7 @@ public: // = The skeleton methods virtual void more_data (const Test::Payload &payload); - virtual void shutdown (void); + virtual void shutdown (); int get_count () const; diff --git a/TAO/tests/HandleExhaustion/server.cpp b/TAO/tests/HandleExhaustion/server.cpp index f7f449f47b6..252bde823cc 100644 --- a/TAO/tests/HandleExhaustion/server.cpp +++ b/TAO/tests/HandleExhaustion/server.cpp @@ -17,11 +17,11 @@ public: { } - void simple (void) + void simple () { } - void shutdown (void) + void shutdown () { this->orb_->shutdown (); } @@ -33,7 +33,7 @@ private: class Descriptors { public: - Descriptors (void) + Descriptors () : min_close_ (0), max_close_ (0), ok_ (false) @@ -44,7 +44,7 @@ public: } } - int allow_accepts (void) + int allow_accepts () { cout << "Server: closing " << (this->max_close_ - this->min_close_) + 1 << " fds" << endl; diff --git a/TAO/tests/Hang_Shutdown/client.cpp b/TAO/tests/Hang_Shutdown/client.cpp index 2aa6f4a118b..e23098b21c0 100644 --- a/TAO/tests/Hang_Shutdown/client.cpp +++ b/TAO/tests/Hang_Shutdown/client.cpp @@ -57,7 +57,7 @@ namespace Test : h_ (Hang::_duplicate (h)) {} - virtual int svc (void) + virtual int svc () { try { @@ -114,7 +114,7 @@ namespace Test : o_ (CORBA::ORB::_duplicate (o)) {} - virtual int svc (void) + virtual int svc () { try { diff --git a/TAO/tests/Hello/Hello.cpp b/TAO/tests/Hello/Hello.cpp index 0d000b9f195..bdfcac050fb 100644 --- a/TAO/tests/Hello/Hello.cpp +++ b/TAO/tests/Hello/Hello.cpp @@ -6,13 +6,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/tests/Hello/Hello.h b/TAO/tests/Hello/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/Hello/Hello.h +++ b/TAO/tests/Hello/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/tests/ICMG_Any_Bug/Hello.cpp b/TAO/tests/ICMG_Any_Bug/Hello.cpp index efb6ab0ec87..9f6914e2ab3 100644 --- a/TAO/tests/ICMG_Any_Bug/Hello.cpp +++ b/TAO/tests/ICMG_Any_Bug/Hello.cpp @@ -8,7 +8,7 @@ Hello::Hello (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) } Test::HelloWorld_ptr -Hello::get_helloworld (void) +Hello::get_helloworld () { HelloWorld *hello_world; ACE_NEW_THROW_EX (hello_world, @@ -25,7 +25,7 @@ Hello::get_helloworld (void) } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/ICMG_Any_Bug/Hello.h b/TAO/tests/ICMG_Any_Bug/Hello.h index dd62206cfef..1d2b0256a54 100644 --- a/TAO/tests/ICMG_Any_Bug/Hello.h +++ b/TAO/tests/ICMG_Any_Bug/Hello.h @@ -15,9 +15,9 @@ public: /// Constructor Hello (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - virtual Test::HelloWorld_ptr get_helloworld (void); + virtual Test::HelloWorld_ptr get_helloworld (); - virtual void shutdown (void); + virtual void shutdown (); private: PortableServer::POA_var poa_; diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp b/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp index 0c67b45ea2b..c15c5f65a2b 100644 --- a/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp +++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.cpp @@ -1,12 +1,12 @@ #include "HelloWorld.h" -HelloWorld::HelloWorld (void) +HelloWorld::HelloWorld () { } char * -HelloWorld::get_string (void) +HelloWorld::get_string () { return CORBA::string_dup ("TAO Any Implementation Works!"); } diff --git a/TAO/tests/ICMG_Any_Bug/HelloWorld.h b/TAO/tests/ICMG_Any_Bug/HelloWorld.h index 670eeee37d7..7bcd4dc0e7d 100644 --- a/TAO/tests/ICMG_Any_Bug/HelloWorld.h +++ b/TAO/tests/ICMG_Any_Bug/HelloWorld.h @@ -11,10 +11,10 @@ class HelloWorld : public virtual POA_Test::HelloWorld { public: - HelloWorld (void); + HelloWorld (); /// Constructor - virtual char * get_string (void); + virtual char * get_string (); }; #include /**/ "ace/post.h" diff --git a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp index 1b8bcc27184..393c0fd77f5 100644 --- a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp +++ b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.cpp @@ -6,13 +6,13 @@ Derived_i::Derived_i (CORBA::ORB_ptr orb) } void -Derived_i::BaseOp (void) +Derived_i::BaseOp () { ACE_DEBUG ((LM_DEBUG, "BaseOp upcall successful\n")); } void -Derived_i::shutdown (void) +Derived_i::shutdown () { orb_->shutdown (); } diff --git a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h index d64d6370536..e180bd801fe 100644 --- a/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h +++ b/TAO/tests/IDL_Inherited_Operation/InheritedOp_i.h @@ -10,8 +10,8 @@ class Derived_i : public virtual POA_Outer::Derived public: Derived_i (CORBA::ORB_ptr orb); - virtual void BaseOp (void); - virtual void shutdown (void); + virtual void BaseOp (); + virtual void shutdown (); private: CORBA::ORB_ptr orb_; diff --git a/TAO/tests/IORTable_Locator/simple_test_i.cpp b/TAO/tests/IORTable_Locator/simple_test_i.cpp index ff2df5d99e8..a2f552b0d77 100644 --- a/TAO/tests/IORTable_Locator/simple_test_i.cpp +++ b/TAO/tests/IORTable_Locator/simple_test_i.cpp @@ -7,7 +7,7 @@ Simple_Test_i::Simple_Test_i (CORBA::ORB_ptr orb) } void -Simple_Test_i::shutdown (void) +Simple_Test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/IORTable_Locator/simple_test_i.h b/TAO/tests/IORTable_Locator/simple_test_i.h index 9918438def1..f005511d554 100644 --- a/TAO/tests/IORTable_Locator/simple_test_i.h +++ b/TAO/tests/IORTable_Locator/simple_test_i.h @@ -12,7 +12,7 @@ public: Simple_Test_i (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp index 12f9468712a..78aa32035c0 100644 --- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp +++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.cpp @@ -9,6 +9,6 @@ bogus::~bogus() } void -bogus::noop (void) +bogus::noop () { } diff --git a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h index f46dd98bbe7..2a57d43742f 100644 --- a/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h +++ b/TAO/tests/IOR_Endpoint_Hostnames/bogus_i.h @@ -12,7 +12,7 @@ public: bogus (); virtual ~bogus (); - virtual void noop (void); + virtual void noop (); }; #include /**/ "ace/post.h" diff --git a/TAO/tests/IPV6/Hello.cpp b/TAO/tests/IPV6/Hello.cpp index 0d000b9f195..bdfcac050fb 100644 --- a/TAO/tests/IPV6/Hello.cpp +++ b/TAO/tests/IPV6/Hello.cpp @@ -6,13 +6,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/tests/IPV6/Hello.h b/TAO/tests/IPV6/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/IPV6/Hello.h +++ b/TAO/tests/IPV6/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/tests/InterOp-Naming/INS_i.cpp b/TAO/tests/InterOp-Naming/INS_i.cpp index 0f1f28137e0..cbe97d5ccca 100644 --- a/TAO/tests/InterOp-Naming/INS_i.cpp +++ b/TAO/tests/InterOp-Naming/INS_i.cpp @@ -2,12 +2,12 @@ // Constructor -INS_i::INS_i (void) +INS_i::INS_i () { } // Destructor -INS_i::~INS_i (void) +INS_i::~INS_i () { } @@ -19,7 +19,7 @@ INS_i::orb (CORBA::ORB_ptr o) } char * -INS_i::test_ins (void) +INS_i::test_ins () { ACE_DEBUG ((LM_DEBUG, "Inside Operation\n")); diff --git a/TAO/tests/InterOp-Naming/INS_i.h b/TAO/tests/InterOp-Naming/INS_i.h index 5065310f172..5c64e55ab56 100644 --- a/TAO/tests/InterOp-Naming/INS_i.h +++ b/TAO/tests/InterOp-Naming/INS_i.h @@ -20,13 +20,13 @@ class INS_i : public POA_INS { public: /// Constructor. - INS_i (void); + INS_i (); /// Destructor. - ~INS_i (void); + ~INS_i (); /// test the INS. - char * test_ins (void); + char * test_ins (); /// Set the ORB pointer. void orb (CORBA::ORB_ptr o); diff --git a/TAO/tests/InterOp-Naming/Server_i.cpp b/TAO/tests/InterOp-Naming/Server_i.cpp index a77c39dc331..d1dca7f3a99 100644 --- a/TAO/tests/InterOp-Naming/Server_i.cpp +++ b/TAO/tests/InterOp-Naming/Server_i.cpp @@ -4,20 +4,20 @@ #include "ace/OS_NS_stdio.h" // Constructor. -Server_i::Server_i (void) +Server_i::Server_i () : ior_output_file_ (0), ins_ (0) { } // Destructor. -Server_i::~Server_i (void) +Server_i::~Server_i () { } // Parse the command-line arguments and set options. int -Server_i::parse_args (void) +Server_i::parse_args () { ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:ni:")); int c = 0; @@ -153,7 +153,7 @@ Server_i::init (int argc, } int -Server_i::run (void) +Server_i::run () { // Run the main event loop for the ORB. int result = this->orb_manager_.run (); diff --git a/TAO/tests/InterOp-Naming/Server_i.h b/TAO/tests/InterOp-Naming/Server_i.h index 69ce69d0084..5a11fc728ac 100644 --- a/TAO/tests/InterOp-Naming/Server_i.h +++ b/TAO/tests/InterOp-Naming/Server_i.h @@ -22,10 +22,10 @@ class Server_i { public: /// Constructor. - Server_i (void); + Server_i (); /// Destructor. - ~Server_i (void); + ~Server_i (); /// Initialize the Server state - parsing arguments and waiting. int init (int argc, @@ -35,14 +35,14 @@ public: int add_IOR_to_table (CORBA::String_var ior); /// Run the orb. - int run (void); + int run (); protected: /// Servant class INS_i servant_; /// Parses the commandline arguments. - int parse_args (void); + int parse_args (); /// The ORB manager - a helper class for accessing the POA and /// registering objects. diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp index 714894abd1f..f3f43e49599 100644 --- a/TAO/tests/Leader_Followers/client.cpp +++ b/TAO/tests/Leader_Followers/client.cpp @@ -103,7 +103,7 @@ public: { } - int svc (void) + int svc () { try { @@ -172,7 +172,7 @@ public: { } - int svc (void) + int svc () { try { diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp index ac8630b8ac6..10b2fa7e6dc 100644 --- a/TAO/tests/Leader_Followers/server.cpp +++ b/TAO/tests/Leader_Followers/server.cpp @@ -48,7 +48,7 @@ public: { } - int svc (void) + int svc () { try { diff --git a/TAO/tests/Leader_Followers/test_i.cpp b/TAO/tests/Leader_Followers/test_i.cpp index 28473ad2c12..ad20d726c35 100644 --- a/TAO/tests/Leader_Followers/test_i.cpp +++ b/TAO/tests/Leader_Followers/test_i.cpp @@ -7,7 +7,7 @@ test_i::test_i (CORBA::ORB_ptr orb) } void -test_i::shutdown (void) +test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Leader_Followers/test_i.h b/TAO/tests/Leader_Followers/test_i.h index 36c840e09fb..b89f7ffb683 100644 --- a/TAO/tests/Leader_Followers/test_i.h +++ b/TAO/tests/Leader_Followers/test_i.h @@ -24,7 +24,7 @@ public: // = The test interface methods. CORBA::ULong method (CORBA::ULong work); - void shutdown (void); + void shutdown (); private: /// The ORB. diff --git a/TAO/tests/LongDouble/Global.cpp b/TAO/tests/LongDouble/Global.cpp index b09e8d927c9..9007c187886 100644 --- a/TAO/tests/LongDouble/Global.cpp +++ b/TAO/tests/LongDouble/Global.cpp @@ -1,7 +1,7 @@ #include "Global.h" long double -Global::get_long_double (void) +Global::get_long_double () { return 11777888333.111111109; } diff --git a/TAO/tests/LongDouble/Global.h b/TAO/tests/LongDouble/Global.h index 5c667cee8c3..bc84dbf9fee 100644 --- a/TAO/tests/LongDouble/Global.h +++ b/TAO/tests/LongDouble/Global.h @@ -4,7 +4,7 @@ class Global { public: - static long double get_long_double (void); + static long double get_long_double (); }; #endif /* TAO_TEST_GLOBAL_H */ diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp index 74a64d7d924..fbd6a6cff16 100644 --- a/TAO/tests/LongUpcalls/AMI_Manager.cpp +++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp @@ -44,7 +44,7 @@ AMI_Manager::start_workers (CORBA::Short worker_count, } void -AMI_Manager::shutdown (void) +AMI_Manager::shutdown () { this->orb_->shutdown (false); } @@ -63,7 +63,7 @@ Worker::Worker (ACE_Thread_Manager *thr_mgr, } int -Worker::svc (void) +Worker::svc () { // ACE_DEBUG ((LM_DEBUG, "Worker starts\n")); try @@ -134,7 +134,7 @@ Controller_Handler::Controller_Handler (TAO_SYNCH_MUTEX *mutex, } void -Controller_Handler::worker_started (void) +Controller_Handler::worker_started () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_); (*this->pending_replies_)--; @@ -156,7 +156,7 @@ Controller_Handler::worker_started_excep } void -Controller_Handler::worker_finished (void) +Controller_Handler::worker_finished () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_); (*this->pending_replies_)--; diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h index c5ec6f15903..55783b506ff 100644 --- a/TAO/tests/LongUpcalls/AMI_Manager.h +++ b/TAO/tests/LongUpcalls/AMI_Manager.h @@ -15,7 +15,7 @@ public: virtual void start_workers (CORBA::Short worker_count, CORBA::Long milliseconds, Test::Controller_ptr controller); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; @@ -56,9 +56,9 @@ public: int *pending_replies); // Constructor - virtual void worker_started (void); + virtual void worker_started (); virtual void worker_started_excep (::Messaging::ExceptionHolder*); - virtual void worker_finished (void); + virtual void worker_finished (); virtual void worker_finished_excep (::Messaging::ExceptionHolder*); private: diff --git a/TAO/tests/LongUpcalls/Controller.cpp b/TAO/tests/LongUpcalls/Controller.cpp index 5492961d17c..8df632d681a 100644 --- a/TAO/tests/LongUpcalls/Controller.cpp +++ b/TAO/tests/LongUpcalls/Controller.cpp @@ -1,6 +1,6 @@ #include "Controller.h" -Controller::Controller (void) +Controller::Controller () : start_count_ (0) , finish_count_ (0) { @@ -19,7 +19,7 @@ Controller::dump_results () } void -Controller::worker_started (void) +Controller::worker_started () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->start_count_++; @@ -28,7 +28,7 @@ Controller::worker_started (void) } void -Controller::worker_finished (void) +Controller::worker_finished () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->finish_count_++; diff --git a/TAO/tests/LongUpcalls/Controller.h b/TAO/tests/LongUpcalls/Controller.h index 5957473e7e4..30150930899 100644 --- a/TAO/tests/LongUpcalls/Controller.h +++ b/TAO/tests/LongUpcalls/Controller.h @@ -7,15 +7,15 @@ class Controller : public virtual POA_Test::Controller { public: - Controller (void); + Controller (); // Constructor - void dump_results (void); + void dump_results (); // Print out the results and any errors // = The skeleton methods - virtual void worker_started (void); - virtual void worker_finished (void); + virtual void worker_started (); + virtual void worker_finished (); private: TAO_SYNCH_MUTEX mutex_; diff --git a/TAO/tests/LongUpcalls/Manager.cpp b/TAO/tests/LongUpcalls/Manager.cpp index 4f9923c80fb..c4e19de02a5 100644 --- a/TAO/tests/LongUpcalls/Manager.cpp +++ b/TAO/tests/LongUpcalls/Manager.cpp @@ -43,7 +43,7 @@ Manager::start_workers (CORBA::Short worker_count, } void -Manager::shutdown (void) +Manager::shutdown () { this->orb_->shutdown (false); } @@ -61,7 +61,7 @@ Worker::Worker (ACE_Thread_Manager *thr_mgr, } int -Worker::svc (void) +Worker::svc () { // ACE_DEBUG ((LM_DEBUG, "Worker starts\n")); try diff --git a/TAO/tests/LongUpcalls/Manager.h b/TAO/tests/LongUpcalls/Manager.h index 8a8c31a580d..6155301c15f 100644 --- a/TAO/tests/LongUpcalls/Manager.h +++ b/TAO/tests/LongUpcalls/Manager.h @@ -16,7 +16,7 @@ public: virtual void start_workers (CORBA::Short worker_count, CORBA::Long milliseconds, Test::Controller_ptr controller); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/LongUpcalls/Manager_Handler.cpp b/TAO/tests/LongUpcalls/Manager_Handler.cpp index f6ed3bf55db..e5d767ec2d7 100644 --- a/TAO/tests/LongUpcalls/Manager_Handler.cpp +++ b/TAO/tests/LongUpcalls/Manager_Handler.cpp @@ -9,7 +9,7 @@ Manager_Handler::Manager_Handler (Test::Manager_ptr manager, } void -Manager_Handler::start_workers (void) +Manager_Handler::start_workers () { try { diff --git a/TAO/tests/LongUpcalls/Manager_Handler.h b/TAO/tests/LongUpcalls/Manager_Handler.h index dfb8c07e11f..6be848eef64 100644 --- a/TAO/tests/LongUpcalls/Manager_Handler.h +++ b/TAO/tests/LongUpcalls/Manager_Handler.h @@ -14,7 +14,7 @@ public: // Constructor // = The skeleton methods - virtual void start_workers (void); + virtual void start_workers (); virtual void start_workers_excep (::Messaging::ExceptionHolder *holder); private: diff --git a/TAO/tests/MProfile/test_i.cpp b/TAO/tests/MProfile/test_i.cpp index ac80f97ad7d..2004d24f72b 100644 --- a/TAO/tests/MProfile/test_i.cpp +++ b/TAO/tests/MProfile/test_i.cpp @@ -6,13 +6,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) { } CORBA::Long -Simple_Server_i::remote_call (void) +Simple_Server_i::remote_call () { ACE_DEBUG ((LM_DEBUG, "Print out from process id (%P) hosting the servant\n")); @@ -22,7 +22,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/tests/MProfile/test_i.h b/TAO/tests/MProfile/test_i.h index 4b9dad413fb..937e4700fd9 100644 --- a/TAO/tests/MProfile/test_i.h +++ b/TAO/tests/MProfile/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. - CORBA::Long remote_call (void); + CORBA::Long remote_call (); - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp index 5a4aa60200a..e2d704d87a8 100644 --- a/TAO/tests/MProfile_Connection_Timeout/test_i.cpp +++ b/TAO/tests/MProfile_Connection_Timeout/test_i.cpp @@ -12,13 +12,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) { } CORBA::ULongLong -Simple_Server_i::remote_call (void) +Simple_Server_i::remote_call () { ACE_DEBUG ((LM_DEBUG, "Print out from process id (%P) hosting the servant\n")); @@ -28,7 +28,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/tests/MProfile_Connection_Timeout/test_i.h b/TAO/tests/MProfile_Connection_Timeout/test_i.h index 8882fd2c91b..822d6e68bd9 100644 --- a/TAO/tests/MProfile_Connection_Timeout/test_i.h +++ b/TAO/tests/MProfile_Connection_Timeout/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. - CORBA::ULongLong remote_call (void); + CORBA::ULongLong remote_call (); - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp index d682c73aadb..04f43f17f9c 100644 --- a/TAO/tests/MProfile_Forwarding/Manager.cpp +++ b/TAO/tests/MProfile_Forwarding/Manager.cpp @@ -75,7 +75,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) return 0; } -Manager::Manager (void) +Manager::Manager () :orb_ (0), new_poa_var_ (0) { @@ -142,7 +142,7 @@ Manager::init (int argc, ACE_TCHAR *argv[]) } int -Manager::activate_servant (void) +Manager::activate_servant () { ACE_NEW_THROW_EX (this->servant_locator_, Servant_Locator (this->orb_.in ()), @@ -168,7 +168,7 @@ Manager::activate_servant (void) } int -Manager::make_iors_register (void) +Manager::make_iors_register () { // First server CORBA::Object_var object_primary = @@ -244,7 +244,7 @@ Manager::make_iors_register (void) } int -Manager::run (void) +Manager::run () { this->orb_->run (); diff --git a/TAO/tests/MProfile_Forwarding/Manager.h b/TAO/tests/MProfile_Forwarding/Manager.h index e1700fbaeb6..08cca3999f3 100644 --- a/TAO/tests/MProfile_Forwarding/Manager.h +++ b/TAO/tests/MProfile_Forwarding/Manager.h @@ -6,7 +6,7 @@ class Manager { public: - Manager (void); + Manager (); // Ctor @@ -14,15 +14,15 @@ class Manager // Initialize the ORB, POA etc. - int init_register_name_service (void); + int init_register_name_service (); // Initialize the Name service, tegister the combined IOR with it - int activate_servant (void); + int activate_servant (); // Activate the servant etc. - int make_iors_register (void); + int make_iors_register (); - int run (void); + int run (); // Run the ORB event loop.. private: CORBA::ORB_var orb_; diff --git a/TAO/tests/MProfile_Forwarding/test_i.cpp b/TAO/tests/MProfile_Forwarding/test_i.cpp index 8ae51e821ed..f34b6906615 100644 --- a/TAO/tests/MProfile_Forwarding/test_i.cpp +++ b/TAO/tests/MProfile_Forwarding/test_i.cpp @@ -4,13 +4,13 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -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, "Print out from process id (%P) hosting the servant\n")); @@ -18,7 +18,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/tests/MProfile_Forwarding/test_i.h b/TAO/tests/MProfile_Forwarding/test_i.h index e42de5db9fb..10164445f01 100644 --- a/TAO/tests/MProfile_Forwarding/test_i.h +++ b/TAO/tests/MProfile_Forwarding/test_i.h @@ -28,12 +28,12 @@ public: // ctor /// 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/tests/MT_BiDir/Client_Task.cpp b/TAO/tests/MT_BiDir/Client_Task.cpp index 64c5acf73df..4f1b86398cc 100644 --- a/TAO/tests/MT_BiDir/Client_Task.cpp +++ b/TAO/tests/MT_BiDir/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/tests/MT_BiDir/Client_Task.h b/TAO/tests/MT_BiDir/Client_Task.h index f0e94c59e2a..cf414bdc1bd 100644 --- a/TAO/tests/MT_BiDir/Client_Task.h +++ b/TAO/tests/MT_BiDir/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/tests/MT_BiDir/Receiver_i.cpp b/TAO/tests/MT_BiDir/Receiver_i.cpp index 900e505506a..751dc660f08 100644 --- a/TAO/tests/MT_BiDir/Receiver_i.cpp +++ b/TAO/tests/MT_BiDir/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/tests/MT_BiDir/Receiver_i.h b/TAO/tests/MT_BiDir/Receiver_i.h index 8f426fb3106..ea27d75337e 100644 --- a/TAO/tests/MT_BiDir/Receiver_i.h +++ b/TAO/tests/MT_BiDir/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/tests/MT_BiDir/Sender_i.cpp b/TAO/tests/MT_BiDir/Sender_i.cpp index 00b43a9ed7d..262880457aa 100644 --- a/TAO/tests/MT_BiDir/Sender_i.cpp +++ b/TAO/tests/MT_BiDir/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/tests/MT_BiDir/Sender_i.h b/TAO/tests/MT_BiDir/Sender_i.h index a57494d613d..e19766d6b8e 100644 --- a/TAO/tests/MT_BiDir/Sender_i.h +++ b/TAO/tests/MT_BiDir/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/tests/MT_BiDir/Server_Task.cpp b/TAO/tests/MT_BiDir/Server_Task.cpp index e6b3d3e6fcc..48b6835359c 100644 --- a/TAO/tests/MT_BiDir/Server_Task.cpp +++ b/TAO/tests/MT_BiDir/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/tests/MT_BiDir/Server_Task.h b/TAO/tests/MT_BiDir/Server_Task.h index 3a34b55d44c..71c65b4a4c2 100644 --- a/TAO/tests/MT_BiDir/Server_Task.h +++ b/TAO/tests/MT_BiDir/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/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp index dae352c2acb..2649f1f14be 100644 --- a/TAO/tests/MT_Client/client.cpp +++ b/TAO/tests/MT_Client/client.cpp @@ -60,7 +60,7 @@ public: // The thread entry point. private: - void validate_connection (void); + void validate_connection (); // Validate the connection private: @@ -133,7 +133,7 @@ Client::Client (Simple_Server_ptr server, } void -Client::validate_connection (void) +Client::validate_connection () { // Ping the object 100 times, ignoring all exceptions. // It would be better to use validate_connection() but the test must @@ -149,7 +149,7 @@ Client::validate_connection (void) } int -Client::svc (void) +Client::svc () { try { diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp index 6bbea2da704..05fd52a0ab6 100644 --- a/TAO/tests/MT_Client/orb_creation.cpp +++ b/TAO/tests/MT_Client/orb_creation.cpp @@ -121,7 +121,7 @@ Client::Client (int niterations, } int -Client::svc (void) +Client::svc () { try { diff --git a/TAO/tests/MT_Client/test_i.cpp b/TAO/tests/MT_Client/test_i.cpp index cca0271c9d0..583c68e2915 100644 --- a/TAO/tests/MT_Client/test_i.cpp +++ b/TAO/tests/MT_Client/test_i.cpp @@ -5,12 +5,12 @@ #endif /* __ACE_INLINE__ */ void -Simple_Server_i::test_method (void) +Simple_Server_i::test_method () { } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/MT_Client/test_i.h b/TAO/tests/MT_Client/test_i.h index 5990b2f3642..732e54eaabd 100644 --- a/TAO/tests/MT_Client/test_i.h +++ b/TAO/tests/MT_Client/test_i.h @@ -27,9 +27,9 @@ public: Simple_Server_i (CORBA::ORB_ptr orb); // = The Simple_Server methods. - void test_method (void); + void test_method (); - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h index f2e376eef0d..490b40f7d92 100644 --- a/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h +++ b/TAO/tests/MT_NoUpcall_Client_Leader/SharedIntf_i.h @@ -11,7 +11,7 @@ class Test_Idl_SharedIntf_i : public virtual POA_Test_Idl::SharedIntf { public: Test_Idl_SharedIntf_i (CORBA::ORB_ptr orb); - virtual ~Test_Idl_SharedIntf_i (void); + virtual ~Test_Idl_SharedIntf_i (); virtual void ping (); virtual void farewell (); diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp index 5c89d60360a..891214d0c96 100644 --- a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp +++ b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.cpp @@ -12,19 +12,19 @@ Chatter::Chatter (CORBA::ORB_ptr orb, const ACE_TCHAR *ior, ACE_Condition<ACE_Mu } long -Chatter::nreplies (void) +Chatter::nreplies () { return this->nreplies_; } long -Chatter::nrequests (void) +Chatter::nrequests () { return this->nrequests_; } int -Chatter::svc (void) +Chatter::svc () { long nrq = -1; try diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h index 224dd5a4e2d..e1b5c909ec5 100644 --- a/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h +++ b/TAO/tests/MT_NoUpcall_Client_Leader/chatter.h @@ -12,8 +12,8 @@ public: Chatter (CORBA::ORB_ptr orb, const ACE_TCHAR *ior, ACE_Condition<ACE_Mutex>& cond); virtual int svc (); int farewell (); - long nrequests (void); - long nreplies (void); + long nrequests (); + long nreplies (); public: volatile long nrequests_; volatile long nreplies_; diff --git a/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp b/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp index c9d1484a04b..7e06796e775 100644 --- a/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp +++ b/TAO/tests/MT_NoUpcall_Client_Leader/worker.cpp @@ -6,7 +6,7 @@ Worker::Worker (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { ACE_DEBUG((LM_INFO,"(%P|%t) Running ORB in a separate thread\n")); try diff --git a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp index cfaaf75e7ec..c5b9fc8c714 100644 --- a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp +++ b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.cpp @@ -21,7 +21,7 @@ Test_Idl_SharedIntf_i::set_upper (const char *ior) } void -Test_Idl_SharedIntf_i::do_upcall (void) +Test_Idl_SharedIntf_i::do_upcall () { ACE_DEBUG((LM_DEBUG,"(%P|%t) Test_Idl_SharedIntf::do_upcall called\n")); diff --git a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h index a304d41726a..5536154473f 100644 --- a/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h +++ b/TAO/tests/MT_NoUpcall_Connect/SharedIntf_i.h @@ -11,12 +11,12 @@ class Test_Idl_SharedIntf_i : public virtual POA_Test_Idl::SharedIntf { public: Test_Idl_SharedIntf_i (CORBA::ORB_ptr orb); - virtual ~Test_Idl_SharedIntf_i (void); + virtual ~Test_Idl_SharedIntf_i (); void set_upper (const char * ior); - virtual void do_upcall (void); - virtual void ping (void); - virtual void farewell (void); + virtual void do_upcall (); + virtual void ping (); + virtual void farewell (); private: CORBA::String_var upper_ior; CORBA::ORB_ptr orb_; diff --git a/TAO/tests/MT_NoUpcall_Connect/client.cpp b/TAO/tests/MT_NoUpcall_Connect/client.cpp index e954f4735bf..7da39d94eb6 100644 --- a/TAO/tests/MT_NoUpcall_Connect/client.cpp +++ b/TAO/tests/MT_NoUpcall_Connect/client.cpp @@ -17,7 +17,7 @@ ACE_Time_Value ping_end (0,0); class SharedIntfCB : public POA_Test_Idl::AMI_SharedIntfHandler { public: - void ping (void) + void ping () { ACE_DEBUG ((LM_DEBUG, "ping returned\n")); ping_end = ping_end.now (); @@ -29,7 +29,7 @@ public: ping_end = ping_end.now (); } - void do_upcall (void) + void do_upcall () { ACE_DEBUG ((LM_DEBUG, "upcall returned\n")); upcall_end = upcall_end.now (); diff --git a/TAO/tests/MT_NoUpcall_Connect/server.cpp b/TAO/tests/MT_NoUpcall_Connect/server.cpp index d750cb09e83..240e2b73736 100644 --- a/TAO/tests/MT_NoUpcall_Connect/server.cpp +++ b/TAO/tests/MT_NoUpcall_Connect/server.cpp @@ -13,7 +13,7 @@ CORBA::ORB_var orb_; class Worker : public ACE_Task_Base { public: - int svc (void) + int svc () { ACE_DEBUG((LM_INFO,"(%P|%t) Running ORB in a separate thread\n")); try diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp index 99e4e4bbf33..eed467c5c16 100644 --- a/TAO/tests/MT_Server/server.cpp +++ b/TAO/tests/MT_Server/server.cpp @@ -138,7 +138,7 @@ Worker::Worker (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { try { diff --git a/TAO/tests/MT_Server/test_i.cpp b/TAO/tests/MT_Server/test_i.cpp index 811469bdcca..28032bad85b 100644 --- a/TAO/tests/MT_Server/test_i.cpp +++ b/TAO/tests/MT_Server/test_i.cpp @@ -17,7 +17,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/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp index c43b52cb2b5..c32815919d0 100644 --- a/TAO/tests/MT_Timeout/Client_Task.cpp +++ b/TAO/tests/MT_Timeout/Client_Task.cpp @@ -40,7 +40,7 @@ Client_Task::too_big_difference_calls () const } int -Client_Task::svc (void) +Client_Task::svc () { int successful_calls = 0; int timed_out_calls = 0; @@ -101,7 +101,7 @@ Client_Task::svc (void) } void -Client_Task::validate_connection (void) +Client_Task::validate_connection () { try { @@ -117,7 +117,7 @@ Client_Task::validate_connection (void) } int -Client_Task::one_iteration (void) +Client_Task::one_iteration () { try { diff --git a/TAO/tests/MT_Timeout/Client_Task.h b/TAO/tests/MT_Timeout/Client_Task.h index 9bde5efdf45..7bc86ce3050 100644 --- a/TAO/tests/MT_Timeout/Client_Task.h +++ b/TAO/tests/MT_Timeout/Client_Task.h @@ -48,14 +48,14 @@ public: int too_big_difference_calls () const; /// Thread entry point - int svc (void); + int svc (); private: /// Run one iteration of the test - int one_iteration (void); + int one_iteration (); /// Make sure that the thread has a connection available - void validate_connection (void); + void validate_connection (); private: /// A reference to the ORB diff --git a/TAO/tests/MT_Timeout/Server_Task.cpp b/TAO/tests/MT_Timeout/Server_Task.cpp index 0b0503d31c5..0e0b4169136 100644 --- a/TAO/tests/MT_Timeout/Server_Task.cpp +++ b/TAO/tests/MT_Timeout/Server_Task.cpp @@ -11,7 +11,7 @@ Server_Task::Server_Task (ACE_Thread_Manager *thr_mgr, } int -Server_Task::svc (void) +Server_Task::svc () { try { diff --git a/TAO/tests/MT_Timeout/Server_Task.h b/TAO/tests/MT_Timeout/Server_Task.h index 7890d0970e2..0128d2bc480 100644 --- a/TAO/tests/MT_Timeout/Server_Task.h +++ b/TAO/tests/MT_Timeout/Server_Task.h @@ -20,7 +20,7 @@ public: const ACE_Time_Value &running_time); /// Thread entry point - int svc (void); + int svc (); private: /// Reference to the ORB diff --git a/TAO/tests/MT_Timeout/Sleep_Service.cpp b/TAO/tests/MT_Timeout/Sleep_Service.cpp index 898b31179ed..ee7114f22ec 100644 --- a/TAO/tests/MT_Timeout/Sleep_Service.cpp +++ b/TAO/tests/MT_Timeout/Sleep_Service.cpp @@ -17,7 +17,7 @@ Sleep_Service::go_to_sleep (CORBA::ULong microseconds) } void -Sleep_Service::shutdown (void) +Sleep_Service::shutdown () { ACE_DEBUG ((LM_DEBUG, "Shutting down the ORB\n")); this->orb_->shutdown (false); diff --git a/TAO/tests/MT_Timeout/Sleep_Service.h b/TAO/tests/MT_Timeout/Sleep_Service.h index bf4021284fa..d5d2f3813f3 100644 --- a/TAO/tests/MT_Timeout/Sleep_Service.h +++ b/TAO/tests/MT_Timeout/Sleep_Service.h @@ -16,7 +16,7 @@ public: // = The skeleton methods virtual void go_to_sleep (CORBA::ULong microseconds); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp index 2ee2f7a2ada..c9347ae5e33 100644 --- a/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp +++ b/TAO/tests/Mixed_Sync_ASync_Events/test_i.cpp @@ -87,7 +87,7 @@ Test_i::report ( } void -Test_i::shutdown (void) +Test_i::shutdown () { if (this->mode_ == A::RM_SLAVE && !CORBA::is_nil (this->opponent_.in ())) { diff --git a/TAO/tests/Mixed_Sync_ASync_Events/test_i.h b/TAO/tests/Mixed_Sync_ASync_Events/test_i.h index 2afce180a26..5f7acc1211b 100644 --- a/TAO/tests/Mixed_Sync_ASync_Events/test_i.h +++ b/TAO/tests/Mixed_Sync_ASync_Events/test_i.h @@ -36,7 +36,7 @@ public: virtual void report ( const char * msg); - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Monitor/Marshal_Buffer/client.cpp b/TAO/tests/Monitor/Marshal_Buffer/client.cpp index e74ef70b9c2..c8a07d39212 100644 --- a/TAO/tests/Monitor/Marshal_Buffer/client.cpp +++ b/TAO/tests/Monitor/Marshal_Buffer/client.cpp @@ -29,7 +29,7 @@ public: : orb_ (orb) {} - int svc (void) + int svc () { this->orb_->run (); return 0; diff --git a/TAO/tests/Multiple/Collocation_Tester.cpp b/TAO/tests/Multiple/Collocation_Tester.cpp index 58ba868e616..a28e61db52b 100644 --- a/TAO/tests/Multiple/Collocation_Tester.cpp +++ b/TAO/tests/Multiple/Collocation_Tester.cpp @@ -11,7 +11,7 @@ Collocation_Tester::Collocation_Tester (CORBA::Object_ptr object) this->object_ = CORBA::Object::_duplicate (object); } -Collocation_Tester::~Collocation_Tester (void) +Collocation_Tester::~Collocation_Tester () { // No-Op. } @@ -36,7 +36,7 @@ Collocation_Tester::match_answer (const char *actual_answer, } int -Collocation_Tester::test_top (void) +Collocation_Tester::test_top () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n------------------------<TOP>-------------------------------\n"))); @@ -70,7 +70,7 @@ Collocation_Tester::test_top (void) } int -Collocation_Tester::test_right (void) +Collocation_Tester::test_right () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n------------------------<RIGHT>-------------------------------\n"))); @@ -109,7 +109,7 @@ Collocation_Tester::test_right (void) int -Collocation_Tester::test_left (void) +Collocation_Tester::test_left () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n------------------------<LEFT>-------------------------------\n"))); @@ -149,7 +149,7 @@ Collocation_Tester::test_left (void) int -Collocation_Tester::test_bottom (void) +Collocation_Tester::test_bottom () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT("\n-----------------------<BOTTOM>-------------------------------\n"))); @@ -196,7 +196,7 @@ Collocation_Tester::test_bottom (void) } void -Collocation_Tester::shutdown (void) +Collocation_Tester::shutdown () { Multiple::Top_var top = Multiple::Top::_narrow (this->object_.in ()); @@ -215,7 +215,7 @@ Collocation_Tester::shutdown (void) } void -Collocation_Tester::run (void) +Collocation_Tester::run () { int failure_num = this->test_top (); diff --git a/TAO/tests/Multiple/Collocation_Tester.h b/TAO/tests/Multiple/Collocation_Tester.h index fc250810992..d36740def60 100644 --- a/TAO/tests/Multiple/Collocation_Tester.h +++ b/TAO/tests/Multiple/Collocation_Tester.h @@ -34,7 +34,7 @@ public: // -- Command -- /// Runs the test. - void run (void); + void run (); private: @@ -42,19 +42,19 @@ private: /// Tests the method accessible thru the /// Top interface. - int test_top (void); + int test_top (); /// Tests the method accessible thru the /// Right interface. - int test_right (void); + int test_right (); /// Tests the method accessible thru the /// Left interface. - int test_left (void); + int test_left (); /// Tests the method accessible thru the /// Bottom interface. - int test_bottom (void); + int test_bottom (); /** * This method tests wether the answer obtained @@ -67,7 +67,7 @@ private: const char *right_answer, const char *method_name); - void shutdown (void); + void shutdown (); private: CORBA::Object_var object_; }; diff --git a/TAO/tests/Multiple/Multiple_Impl.cpp b/TAO/tests/Multiple/Multiple_Impl.cpp index 29b3805061f..1380efeb323 100644 --- a/TAO/tests/Multiple/Multiple_Impl.cpp +++ b/TAO/tests/Multiple/Multiple_Impl.cpp @@ -10,7 +10,7 @@ Bottom_Impl::Bottom_Impl (CORBA::ORB_ptr orb) this->orb_ = CORBA::ORB::_duplicate (orb); } -Bottom_Impl::~Bottom_Impl (void) +Bottom_Impl::~Bottom_Impl () { // No-Op. } @@ -40,7 +40,7 @@ Bottom_Impl::bottom_quote ( ) } void -Bottom_Impl::shutdown (void) +Bottom_Impl::shutdown () { this->orb_->shutdown (false); } @@ -55,13 +55,13 @@ Delegated_Bottom_Impl::Delegated_Bottom_Impl (Multiple::Bottom_ptr delegate, this->orb_ = CORBA::ORB::_duplicate (orb); } -Delegated_Bottom_Impl::~Delegated_Bottom_Impl (void) +Delegated_Bottom_Impl::~Delegated_Bottom_Impl () { // No-Op. } char * -Delegated_Bottom_Impl::top_quote (void) +Delegated_Bottom_Impl::top_quote () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <top_quote>\n"))); @@ -72,7 +72,7 @@ Delegated_Bottom_Impl::top_quote (void) } char * -Delegated_Bottom_Impl::left_quote (void) +Delegated_Bottom_Impl::left_quote () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <left_quote>\n"))); @@ -83,7 +83,7 @@ Delegated_Bottom_Impl::left_quote (void) } char * -Delegated_Bottom_Impl::right_quote (void) +Delegated_Bottom_Impl::right_quote () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <right_quote>\n"))); @@ -94,7 +94,7 @@ Delegated_Bottom_Impl::right_quote (void) } char * -Delegated_Bottom_Impl::bottom_quote (void) +Delegated_Bottom_Impl::bottom_quote () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating the call: <bottom_quote>\n"))); @@ -105,7 +105,7 @@ Delegated_Bottom_Impl::bottom_quote (void) } void -Delegated_Bottom_Impl::shutdown (void) +Delegated_Bottom_Impl::shutdown () { ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Delegating Shut-Down.\n"))); diff --git a/TAO/tests/Multiple/Multiple_Impl.h b/TAO/tests/Multiple/Multiple_Impl.h index ae7d72bd49b..67a48bce557 100644 --- a/TAO/tests/Multiple/Multiple_Impl.h +++ b/TAO/tests/Multiple/Multiple_Impl.h @@ -28,18 +28,18 @@ class Bottom_Impl : public virtual POA_Multiple::Bottom public: // Ctor-Dtor Bottom_Impl (CORBA::ORB_ptr orb); - virtual ~Bottom_Impl (void); + virtual ~Bottom_Impl (); // IDL Interface Methods - virtual char * top_quote (void); + virtual char * top_quote (); - virtual char * left_quote (void); + virtual char * left_quote (); - virtual char * right_quote (void); + virtual char * right_quote (); - virtual char * bottom_quote (void); + virtual char * bottom_quote (); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; }; @@ -59,15 +59,15 @@ class Delegated_Bottom_Impl : public virtual POA_Multiple::Bottom public: // Ctor-Dtor Delegated_Bottom_Impl (Multiple::Bottom_ptr delegate, CORBA::ORB_ptr orb); - virtual ~Delegated_Bottom_Impl (void); + virtual ~Delegated_Bottom_Impl (); // IDL Interface Methods. - virtual char * top_quote (void); - virtual char * left_quote (void); - virtual char * right_quote (void); - virtual char * bottom_quote (void); + virtual char * top_quote (); + virtual char * left_quote (); + virtual char * right_quote (); + virtual char * bottom_quote (); - virtual void shutdown (void); + virtual void shutdown (); private: Multiple::Bottom_var delegate_; diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h index de6f2e48629..bc3da18e0c0 100644 --- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h +++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance_i.h @@ -3,21 +3,21 @@ class Multiple_Inheritance_i : public POA_D { public: - Multiple_Inheritance_i (void); + Multiple_Inheritance_i (); - virtual char* method1 (void) + virtual char* method1 () { return CORBA::string_dup ("method1"); } - virtual char* method2 (void) + virtual char* method2 () { return CORBA::string_dup ("method2"); } - virtual char* method3 (void) + virtual char* method3 () { return CORBA::string_dup ("method3"); } - virtual char* method4 (void) + virtual char* method4 () { return CORBA::string_dup ("method4"); } diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp index aae19ba1755..1a0d87596da 100644 --- a/TAO/tests/Multiple_Inheritance/server.cpp +++ b/TAO/tests/Multiple_Inheritance/server.cpp @@ -6,7 +6,7 @@ static ACE_TCHAR *ior_output_file = 0; -Multiple_Inheritance_i::Multiple_Inheritance_i (void) +Multiple_Inheritance_i::Multiple_Inheritance_i () { // Sun/CC 5.0 crashes if there is no explicit default // constructor diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp index 9c89eb5b0f1..d21f93acc63 100644 --- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp +++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.cpp @@ -7,7 +7,7 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (void) +Hello::get_string () { return CORBA::string_dup ("Hello there!"); } @@ -19,7 +19,7 @@ Hello::set_string (const char * s) } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.h b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.h index 206dc46fb2c..2d9575e6c4c 100644 --- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.h +++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Connection_Failure/Hello.h @@ -14,11 +14,11 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void); + virtual char * get_string (); virtual void set_string (const char * s); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp index 362d4ab9cb3..9865948dd48 100644 --- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp +++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/client.cpp @@ -173,7 +173,7 @@ Worker::Worker (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { try { diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp index b178b81bafc..b9ff161ef75 100644 --- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp +++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.cpp @@ -50,7 +50,7 @@ Simple_Server_i::test_is_a (const char * /* type */) } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.h b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.h index b2648bc16e9..0fd34da8e43 100644 --- a/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.h +++ b/TAO/tests/Multiple_Retry_Tests/Retry_On_Reply_Failure/test_i.h @@ -29,7 +29,7 @@ public: // = The Simple_Server methods. CORBA::Boolean test_is_a (const char * type); - void shutdown (void); + void shutdown (); private: /// The ORB diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp index d8e2e8da78f..4858f270922 100644 --- a/TAO/tests/Muxed_GIOP_Versions/client.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/client.cpp @@ -64,7 +64,7 @@ public: // The thread entry point. private: - void validate_connection (void); + void validate_connection (); // Validate the connection private: @@ -184,7 +184,7 @@ Client::Client (Simple_Server_ptr server, } void -Client::validate_connection (void) +Client::validate_connection () { // Ping the object 100 times, ignoring all exceptions. // It would be better to use validate_connection() but the test must @@ -200,7 +200,7 @@ Client::validate_connection (void) } int -Client::svc (void) +Client::svc () { try { diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp index 5005fe0a71a..69794be33b0 100644 --- a/TAO/tests/Muxed_GIOP_Versions/server.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp @@ -93,7 +93,7 @@ public: // The thread entry point. private: - void validate_connection (void); + void validate_connection (); // Validate the connection private: @@ -208,7 +208,7 @@ Worker::Worker (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { try { @@ -232,7 +232,7 @@ SelfClient::SelfClient (CORBA::ORB_ptr orb, Simple_Server_ptr server, } void -SelfClient::validate_connection (void) +SelfClient::validate_connection () { // Ping the object 100 times, ignoring all exceptions. // It would be better to use validate_connection() but the test must @@ -250,7 +250,7 @@ SelfClient::validate_connection (void) } int -SelfClient::svc (void) +SelfClient::svc () { try { diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp index 913354f274d..e83f527b9cf 100644 --- a/TAO/tests/Muxed_GIOP_Versions/test_i.cpp +++ b/TAO/tests/Muxed_GIOP_Versions/test_i.cpp @@ -18,7 +18,7 @@ Simple_Server_i::test_method (CORBA::Long x) } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { // We dont shutdown the ORB. We allow the server to go away as it // wants. diff --git a/TAO/tests/Muxed_GIOP_Versions/test_i.h b/TAO/tests/Muxed_GIOP_Versions/test_i.h index ce21c4429cc..f9db7f0f4a2 100644 --- a/TAO/tests/Muxed_GIOP_Versions/test_i.h +++ b/TAO/tests/Muxed_GIOP_Versions/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/tests/Muxing/Client_Task.cpp b/TAO/tests/Muxing/Client_Task.cpp index 351c094666b..c4f28592684 100644 --- a/TAO/tests/Muxing/Client_Task.cpp +++ b/TAO/tests/Muxing/Client_Task.cpp @@ -13,7 +13,7 @@ Client_Task::Client_Task (Test::Receiver_ptr receiver, } int -Client_Task::svc (void) +Client_Task::svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); Test::Payload payload (this->event_size_); diff --git a/TAO/tests/Muxing/Client_Task.h b/TAO/tests/Muxing/Client_Task.h index 6f55129af67..6b621d0ba6d 100644 --- a/TAO/tests/Muxing/Client_Task.h +++ b/TAO/tests/Muxing/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 test interface diff --git a/TAO/tests/Muxing/Receiver.cpp b/TAO/tests/Muxing/Receiver.cpp index 18afcfde8b4..630c1be966d 100644 --- a/TAO/tests/Muxing/Receiver.cpp +++ b/TAO/tests/Muxing/Receiver.cpp @@ -27,14 +27,14 @@ Receiver::receive_data (const Test::Payload &payload) } CORBA::Long -Receiver::get_event_count (void) +Receiver::get_event_count () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->mutex_, 0); return this->message_count_; } void -Receiver::shutdown (void) +Receiver::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Muxing/Receiver.h b/TAO/tests/Muxing/Receiver.h index 19ccb9cad52..d49be298f12 100644 --- a/TAO/tests/Muxing/Receiver.h +++ b/TAO/tests/Muxing/Receiver.h @@ -22,13 +22,13 @@ public: Receiver (CORBA::ORB_ptr orb); /// Print out the results - void dump_results (void); + void dump_results (); // = The skeleton methods virtual void receive_data (const Test::Payload &payload); - virtual CORBA::Long get_event_count (void); + virtual CORBA::Long get_event_count (); - virtual void shutdown (void); + virtual void shutdown (); private: TAO_SYNCH_MUTEX mutex_; diff --git a/TAO/tests/Muxing/Server_Task.cpp b/TAO/tests/Muxing/Server_Task.cpp index c0091912959..d23f910e669 100644 --- a/TAO/tests/Muxing/Server_Task.cpp +++ b/TAO/tests/Muxing/Server_Task.cpp @@ -9,7 +9,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb, } int -Server_Task::svc (void) +Server_Task::svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n")); try diff --git a/TAO/tests/Muxing/Server_Task.h b/TAO/tests/Muxing/Server_Task.h index 1e2a05604e1..a731a281d3a 100644 --- a/TAO/tests/Muxing/Server_Task.h +++ b/TAO/tests/Muxing/Server_Task.h @@ -19,7 +19,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Reference to the ORB diff --git a/TAO/tests/Native_Exceptions/test_i.cpp b/TAO/tests/Native_Exceptions/test_i.cpp index dfa3792ac03..d776d22610b 100644 --- a/TAO/tests/Native_Exceptions/test_i.cpp +++ b/TAO/tests/Native_Exceptions/test_i.cpp @@ -17,7 +17,7 @@ Simple_Server_i::test_raise (CORBA::Long) } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (); } diff --git a/TAO/tests/Native_Exceptions/test_i.h b/TAO/tests/Native_Exceptions/test_i.h index a92d86fda64..c4c25e17e76 100644 --- a/TAO/tests/Native_Exceptions/test_i.h +++ b/TAO/tests/Native_Exceptions/test_i.h @@ -31,7 +31,7 @@ public: CORBA::Long test_raise (CORBA::Long x); - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp index 961ccb58ae5..b684394d4c1 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.cpp @@ -17,12 +17,12 @@ #define MAX_HOP_COUNT 20 // CTOR -MT_Object_i::MT_Object_i (void) +MT_Object_i::MT_Object_i () { } // DTOR -MT_Object_i::~MT_Object_i (void) +MT_Object_i::~MT_Object_i () { } diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h index d1f4783af64..947e14c43f7 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Object_i.h @@ -25,10 +25,10 @@ class MT_Object_i : public POA_MT_Object { public: /// Constructor. - MT_Object_i (void); + MT_Object_i (); /// Destructor. - virtual ~MT_Object_i (void); + virtual ~MT_Object_i (); virtual CORBA::Long yadda (CORBA::Long hop_count, MT_Object_ptr partner); diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp index fbaa94d8acc..74e9b576e00 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp @@ -31,7 +31,7 @@ MT_Client_Task::MT_Client_Task (int argc, ACE_TCHAR **argv, } int -MT_Client_Task::svc (void) +MT_Client_Task::svc () { if (this->mT_Client_.init (this->argc_, this->argv_, @@ -79,7 +79,7 @@ MT_Client::read_ior (ACE_TCHAR *filename) // Parses the command line arguments and returns an error status. int -MT_Client::parse_args (void) +MT_Client::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:g:h:i:n:s:")); int c; @@ -141,7 +141,7 @@ MT_Client::parse_args (void) } int -MT_Client::run (void) +MT_Client::run () { try { @@ -169,7 +169,7 @@ MT_Client::run (void) return 0; } -MT_Client::~MT_Client (void) +MT_Client::~MT_Client () { if (this->object_key_ != 0) ACE_Allocator::instance ()->free (this->object_key_); diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.h b/TAO/tests/NestedUpcall/MT_Client_Test/client.h index df1b9a7b8d0..8828e19463f 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/client.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.h @@ -35,11 +35,11 @@ class MT_Client { public: /// = Constructor and destructor. - MT_Client (void); - ~MT_Client (void); + MT_Client (); + ~MT_Client (); /// Execute client example code. - int run (void); + int run (); /// Initialize the client communication endpoint with server. int init (int argc, @@ -51,7 +51,7 @@ private: int read_ior (ACE_TCHAR *filename); /// 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/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp index e166bfcfe90..0d911aa049a 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp @@ -30,7 +30,7 @@ MT_Server_Task::MT_Server_Task (ACE_Thread_Manager* thr_mgr_ptr, } int -MT_Server_Task::svc (void) +MT_Server_Task::svc () { if (this->mT_Server_.init (this->argc_, this->argv_, @@ -76,7 +76,7 @@ MT_Server::read_ior (ACE_TCHAR *filename) int -MT_Server::parse_args (void) +MT_Server::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("d:f:g:h:i:n:s:")); int c; @@ -223,7 +223,7 @@ MT_Server::run () return 0; } -MT_Server::~MT_Server (void) +MT_Server::~MT_Server () { if (this->object_key_ != 0) ACE_OS::free (this->object_key_); @@ -241,7 +241,7 @@ MT_Server::~MT_Server (void) int -MT_Server::run_ORB_briefly (void) +MT_Server::run_ORB_briefly () { if (this->iterations_ > 0) { diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h index ac9b5e5db30..db8bc482cf0 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h @@ -41,7 +41,7 @@ public: MT_Server (); /// Destructor - ~MT_Server (void); + ~MT_Server (); /// Initialize the MT_Server state - parsing arguments and ... int init (int argc, @@ -49,17 +49,17 @@ public: TAO_ORB_Manager* orb_manager_ptr); /// Run the orb - int run (void); + int run (); /// Just run it briefly - int run_ORB_briefly (void); + int run_ORB_briefly (); private: /// reading the IOR of mt object in int read_ior (ACE_TCHAR *filename); /// Parses the commandline arguments. - int parse_args (void); + int parse_args (); /// Key of the object char *object_key_; diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp index 8c4ce3fcc17..9609b0bf950 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp @@ -32,7 +32,7 @@ public: #endif } - ~TestShutdown (void) + ~TestShutdown () { #if !defined(ACE_LACKS_UNIX_SIGNALS) this->shutdown_.remove_handler (SIGTERM); @@ -54,13 +54,13 @@ private: ACE_Sig_Handler shutdown_; }; -MT_Object_Server::MT_Object_Server (void) +MT_Object_Server::MT_Object_Server () : ior_output_file_ (0) { } int -MT_Object_Server::parse_args (void) +MT_Object_Server::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("do:m")); int c; @@ -132,7 +132,7 @@ MT_Object_Server::init (int argc, ACE_TCHAR** argv) int -MT_Object_Server::run (void) +MT_Object_Server::run () { CORBA::ORB_var orb = this->orb_manager_.orb (); TestShutdown killer (orb.in ()); @@ -146,7 +146,7 @@ MT_Object_Server::run (void) return 0; } -MT_Object_Server::~MT_Object_Server (void) +MT_Object_Server::~MT_Object_Server () { } diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h index b1d934cfa9c..3a332f35cef 100644 --- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h +++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h @@ -35,21 +35,21 @@ class MT_Object_Server { public: /// Default constructor - MT_Object_Server (void); + MT_Object_Server (); /// Destructor - ~MT_Object_Server (void); + ~MT_Object_Server (); /// Initialize the NestedUpCalls_Server state - parsing arguments and ... 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 (); /// File to output the IOR of the object A. FILE* ior_output_file_; diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp index 3195d21086d..1f251ce3521 100644 --- a/TAO/tests/NestedUpcall/Simple/client.cpp +++ b/TAO/tests/NestedUpcall/Simple/client.cpp @@ -19,7 +19,7 @@ class Client_Task public: Client_Task (client_ptr c, server_ptr s); - int svc (void); + int svc (); private: client_var client_; @@ -34,7 +34,7 @@ Client_Task::Client_Task (client_ptr c, } int -Client_Task::svc (void) +Client_Task::svc () { try { diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp index 1aa13a59714..d5ef9e815ba 100644 --- a/TAO/tests/NestedUpcall/Simple/server.cpp +++ b/TAO/tests/NestedUpcall/Simple/server.cpp @@ -15,7 +15,7 @@ class Server_Task : public ACE_Task_Base { public: Server_Task (CORBA::ORB_ptr orb); - int svc (void); + int svc (); private: CORBA::ORB_var orb_; @@ -27,7 +27,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb) } int -Server_Task::svc (void) +Server_Task::svc () { try { diff --git a/TAO/tests/NestedUpcall/Simple/server_i.cpp b/TAO/tests/NestedUpcall/Simple/server_i.cpp index 7c72d7f57aa..93acf38c13f 100644 --- a/TAO/tests/NestedUpcall/Simple/server_i.cpp +++ b/TAO/tests/NestedUpcall/Simple/server_i.cpp @@ -34,7 +34,7 @@ server_i::ping (CORBA::UShort time_to_live) } void -server_i::shutdown (void) +server_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/NestedUpcall/Simple/server_i.h b/TAO/tests/NestedUpcall/Simple/server_i.h index 6b070844b0b..4d971d90ed0 100644 --- a/TAO/tests/NestedUpcall/Simple/server_i.h +++ b/TAO/tests/NestedUpcall/Simple/server_i.h @@ -11,7 +11,7 @@ public: void start (client_ptr c, CORBA::UShort time_to_live); - void shutdown (void); + void shutdown (); private: int quiet_; diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp index 3210aa23441..7d64e03ee3c 100644 --- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp +++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp @@ -22,7 +22,7 @@ class Client_Task public: Client_Task (client_ptr c, server_ptr s); - int svc (void); + int svc (); private: client_var client_; @@ -37,7 +37,7 @@ Client_Task::Client_Task (client_ptr c, } int -Client_Task::svc (void) +Client_Task::svc () { try { diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp index e19f51f376a..30cc8292da3 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.cpp @@ -22,12 +22,12 @@ Initiator_i::Initiator_i (Object_A_ptr object_A_ptr, } // DTOR -Initiator_i::~Initiator_i (void) +Initiator_i::~Initiator_i () { } void -Initiator_i::foo_object_B (void) +Initiator_i::foo_object_B () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) BEGIN Initiator_i::foo_object_B ()\n")); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h index 9c99bfe59d8..0e8cd6bb58e 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Initiator_i.h @@ -29,9 +29,9 @@ public: Object_B_ptr object_B_ptr); /// Destructor. - virtual ~Initiator_i (void); + virtual ~Initiator_i (); - virtual void foo_object_B (void); + virtual void foo_object_B (); private: /// reference to object A diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp index 41d91c21896..94d48a82e4b 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.cpp @@ -16,13 +16,13 @@ #include "ace/Reactor.h" // CTOR -Object_A_i::Object_A_i (void) +Object_A_i::Object_A_i () : finish_two_way_call_ (0) { } // DTOR -Object_A_i::~Object_A_i (void) +Object_A_i::~Object_A_i () { } @@ -45,13 +45,13 @@ Object_A_i::foo (Initiator_ptr theInitiator_ptr) } void -Object_A_i::finish (void) +Object_A_i::finish () { this->finish_two_way_call_ = 1; } void -Object_A_i::shutdown (void) +Object_A_i::shutdown () { int argc = 0; ACE_TCHAR **argv = 0; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h index 7bd596bfc10..85259bae3c9 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_A_i.h @@ -25,16 +25,16 @@ class Object_A_i : public POA_Object_A { public: /// Constructor. - Object_A_i (void); + Object_A_i (); /// Destructor. - virtual ~Object_A_i (void); + virtual ~Object_A_i (); virtual void foo (Initiator_ptr theInitiator_ptr); - virtual void finish (void); + virtual void finish (); - virtual void shutdown (void); + virtual void shutdown (); unsigned long finish_two_way_call_; }; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp index 826349cd30e..99b748b2862 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.cpp @@ -16,12 +16,12 @@ #include "ace/OS_NS_unistd.h" // CTOR -Object_B_i::Object_B_i (void) +Object_B_i::Object_B_i () { } // DTOR -Object_B_i::~Object_B_i (void) +Object_B_i::~Object_B_i () { } @@ -51,7 +51,7 @@ Object_B_i::foo (Object_A_ptr theObject_A_ptr) } void -Object_B_i::shutdown (void) +Object_B_i::shutdown () { int argc = 0; ACE_TCHAR **argv = 0; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h index 2a6f7e93cfd..86e48064f8e 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/Object_B_i.h @@ -25,14 +25,14 @@ class Object_B_i : public POA_Object_B { public: /// Constructor. - Object_B_i (void); + Object_B_i (); /// Destructor. - virtual ~Object_B_i (void); + virtual ~Object_B_i (); virtual void foo(Object_A_ptr theObject_A_ptr); - virtual void shutdown (void); + virtual void shutdown (); }; #endif /* OBJECT_B_IMPL_H */ diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp index 079ff88d929..3adc814fe05 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp @@ -17,7 +17,7 @@ #include "ace/OS_NS_fcntl.h" #include "ace/OS_NS_unistd.h" -Initiator_Server::Initiator_Server (void) +Initiator_Server::Initiator_Server () : object_A_key_ (0), object_B_key_ (0), object_A_var_ (0), @@ -68,7 +68,7 @@ Initiator_Server::read_ior (ACE_TCHAR *filename, unsigned int A_B) int -Initiator_Server::parse_args (void) +Initiator_Server::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:g:")); int c, result; @@ -214,7 +214,7 @@ Initiator_Server::init (int argc, int -Initiator_Server::run (void) +Initiator_Server::run () { try { @@ -243,7 +243,7 @@ Initiator_Server::run (void) return 0; } -Initiator_Server::~Initiator_Server (void) +Initiator_Server::~Initiator_Server () { if (this->object_A_key_ != 0) ACE_Allocator::instance ()->free (this->object_A_key_); diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h index 23324226af3..ba7c39fe1a5 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h @@ -35,10 +35,10 @@ class Initiator_Server { public: /// Default constructor - Initiator_Server (void); + Initiator_Server (); /// Destructor - ~Initiator_Server (void); + ~Initiator_Server (); /// read in the IOR's for the two objects A and B int read_ior (ACE_TCHAR *filename, unsigned int A_B); @@ -48,11 +48,11 @@ public: ACE_TCHAR **argv); /// Run the orb - int run (void); + int run (); private: /// Parses the commandline arguments. - int parse_args (void); + int parse_args (); /// The IOR of object A char * object_A_key_; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp index 614c3f63ed1..88246d49b64 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp @@ -15,13 +15,13 @@ #include "tao/debug.h" #include "ace/OS_NS_stdio.h" -Object_A_Server::Object_A_Server (void) +Object_A_Server::Object_A_Server () : ior_output_file_ (0) { } int -Object_A_Server::parse_args (void) +Object_A_Server::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("do:")); int c; @@ -88,7 +88,7 @@ Object_A_Server::init (int argc, int -Object_A_Server::run (void) +Object_A_Server::run () { int r = this->orb_manager_.run (); @@ -99,7 +99,7 @@ Object_A_Server::run (void) return 0;} -Object_A_Server::~Object_A_Server (void) +Object_A_Server::~Object_A_Server () { } diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h index b4f312cad07..21f8d5ccd18 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h @@ -35,21 +35,21 @@ class Object_A_Server { public: /// Default constructor - Object_A_Server (void); + Object_A_Server (); /// Destructor - ~Object_A_Server (void); + ~Object_A_Server (); /// Initialize the NestedUpCalls_Server state - parsing arguments and ... 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 (); /// File to output the IOR of the object A. FILE* ior_output_file_; diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp index 43f07d30a43..0b715c8a5ba 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp @@ -15,13 +15,13 @@ #include "tao/debug.h" #include "ace/OS_NS_stdio.h" -Object_B_Server::Object_B_Server (void) +Object_B_Server::Object_B_Server () : ior_output_file_ (0) { } int -Object_B_Server::parse_args (void) +Object_B_Server::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("do:")); int c; @@ -87,7 +87,7 @@ Object_B_Server::init (int argc, int -Object_B_Server::run (void) +Object_B_Server::run () { int result = this->orb_manager_.run (); @@ -99,7 +99,7 @@ Object_B_Server::run (void) return 0; } -Object_B_Server::~Object_B_Server (void) +Object_B_Server::~Object_B_Server () { } diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h index 43cfdb100b7..28f33c1469e 100644 --- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h +++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h @@ -35,21 +35,21 @@ class Object_B_Server { public: /// Default constructor - Object_B_Server (void); + Object_B_Server (); /// Destructor - ~Object_B_Server (void); + ~Object_B_Server (); /// Initialize the NestedUpCalls_Server state - parsing arguments and ... 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 (); /// File to output the IOR of the object A. FILE* ior_output_file_; diff --git a/TAO/tests/Nested_Event_Loop/test_i.cpp b/TAO/tests/Nested_Event_Loop/test_i.cpp index 9a155f6f8ba..c4b8128ba99 100644 --- a/TAO/tests/Nested_Event_Loop/test_i.cpp +++ b/TAO/tests/Nested_Event_Loop/test_i.cpp @@ -96,7 +96,7 @@ server_i::no_op (client_ptr remote_partner, } void -server_i::shutdown (void) +server_i::shutdown () { this->orb_->shutdown (false); } @@ -153,7 +153,7 @@ client_i::oneway_no_op (const act &act_for_iterations, } void -client_i::twoway_no_op (void) +client_i::twoway_no_op () { ACE_DEBUG ((LM_DEBUG, "client_i::twoway_no_op\n")); diff --git a/TAO/tests/Nested_Event_Loop/test_i.h b/TAO/tests/Nested_Event_Loop/test_i.h index 58d9362d0f7..dbb8a69a574 100644 --- a/TAO/tests/Nested_Event_Loop/test_i.h +++ b/TAO/tests/Nested_Event_Loop/test_i.h @@ -16,7 +16,7 @@ public: const act &act_for_iterations, const act &act_for_flag); - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; @@ -33,7 +33,7 @@ public: void oneway_no_op (const act &act_for_iterations, const act &act_for_flag); - void twoway_no_op (void); + void twoway_no_op (); private: server_var remote_partner_; diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp index abdf7c27e63..2704f3b026d 100644 --- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp +++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.cpp @@ -11,7 +11,7 @@ class Crasher : public ACE_Event_Handler { public: - Crasher (void); + Crasher (); virtual int handle_timeout (ACE_Time_Value const & current_time, void const * arg); @@ -39,7 +39,7 @@ Client_Peer::callme(Test::Peer_ptr callback, } void -Client_Peer::crash(void) +Client_Peer::crash() { Crasher * crasher = new Crasher; @@ -49,11 +49,11 @@ Client_Peer::crash(void) } void -Client_Peer::noop(void) +Client_Peer::noop() { } -Crasher::Crasher(void) +Crasher::Crasher() { } diff --git a/TAO/tests/Nested_Upcall_Crash/Client_Peer.h b/TAO/tests/Nested_Upcall_Crash/Client_Peer.h index ffab60484a0..95430ca94e9 100644 --- a/TAO/tests/Nested_Upcall_Crash/Client_Peer.h +++ b/TAO/tests/Nested_Upcall_Crash/Client_Peer.h @@ -17,8 +17,8 @@ public: void callme(Test::Peer_ptr callback, CORBA::ULong max_depth, Test::Payload const &); - void crash(void); - void noop(void); + void crash(); + void noop(); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.cpp b/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.cpp index 8021d09bd0f..090ae91b3ec 100644 --- a/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.cpp +++ b/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.cpp @@ -6,7 +6,7 @@ #include "Clock_Ticks.h" long -Clock_Ticks::get_hz (void) +Clock_Ticks::get_hz () { #if defined(_SC_CLK_TCK) long r = ACE_OS::sysconf(_SC_CLK_TCK); @@ -24,7 +24,7 @@ Clock_Ticks::get_hz (void) } int -Clock_Ticks::get_usecs_per_tick (void) +Clock_Ticks::get_usecs_per_tick () { return 1000000 / get_hz (); } diff --git a/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h b/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h index 1c002d2021a..1bd6e06fc69 100644 --- a/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h +++ b/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.h @@ -9,10 +9,10 @@ namespace Clock_Ticks { /// Return the number of clock ticks per second - long get_hz (void); + long get_hz (); /// Return the number of microseconds per tick - int get_usecs_per_tick (void); + int get_usecs_per_tick (); } #endif /* Clock_Ticks__h_ */ diff --git a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp index 3e47cfa1d28..381072262f8 100644 --- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp +++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.cpp @@ -54,12 +54,12 @@ Server_Peer::callme(Test::Peer_ptr callback, } void -Server_Peer::crash(void) +Server_Peer::crash() { throw CORBA::NO_IMPLEMENT (); } void -Server_Peer::noop(void) +Server_Peer::noop() { } diff --git a/TAO/tests/Nested_Upcall_Crash/Server_Peer.h b/TAO/tests/Nested_Upcall_Crash/Server_Peer.h index 5fa7b4f5815..9ae7da6cb14 100644 --- a/TAO/tests/Nested_Upcall_Crash/Server_Peer.h +++ b/TAO/tests/Nested_Upcall_Crash/Server_Peer.h @@ -19,8 +19,8 @@ public: void callme(Test::Peer_ptr callback, CORBA::ULong max_depth, Test::Payload const & extra_data); - void crash(void); - void noop(void); + void crash(); + void noop(); private: unsigned int seed_; diff --git a/TAO/tests/No_Server_MT_Connect_Test/client.cpp b/TAO/tests/No_Server_MT_Connect_Test/client.cpp index 80cf170c64d..0bd61bb3908 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/client.cpp +++ b/TAO/tests/No_Server_MT_Connect_Test/client.cpp @@ -129,7 +129,7 @@ Client::Client (Simple_Server_ptr server, } int -Client::svc (void) +Client::svc () { try { diff --git a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp index fd5f7c68fb2..bc79e845075 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp +++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.cpp @@ -6,12 +6,12 @@ Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb) } void -Simple_Server_i::test_method (void) +Simple_Server_i::test_method () { } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/No_Server_MT_Connect_Test/test_i.h b/TAO/tests/No_Server_MT_Connect_Test/test_i.h index e9a304aa039..9fd981fa5b1 100644 --- a/TAO/tests/No_Server_MT_Connect_Test/test_i.h +++ b/TAO/tests/No_Server_MT_Connect_Test/test_i.h @@ -16,9 +16,9 @@ public: // ctor // = The Simple_Server methods. - void test_method (void); + void test_method (); - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/OBV/Any/AnyS_impl.cpp b/TAO/tests/OBV/Any/AnyS_impl.cpp index 28a4c1b7463..ba67d2f06f7 100644 --- a/TAO/tests/OBV/Any/AnyS_impl.cpp +++ b/TAO/tests/OBV/Any/AnyS_impl.cpp @@ -51,7 +51,7 @@ Test_impl::get_vb() } void -Test_impl::shutdown (void) +Test_impl::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/OBV/Any/AnyS_impl.h b/TAO/tests/OBV/Any/AnyS_impl.h index 774090a9c7e..efa989f4ad8 100644 --- a/TAO/tests/OBV/Any/AnyS_impl.h +++ b/TAO/tests/OBV/Any/AnyS_impl.h @@ -30,9 +30,9 @@ public: virtual CORBA::Any * get_something ( CORBA::Boolean need_vb); - virtual OBV_AnyTest::VB * get_vb (void); + virtual OBV_AnyTest::VB * get_vb (); - virtual void shutdown (void); + virtual void shutdown (); private: /// The ORB diff --git a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp index 41808959dc7..ef1e47b3672 100644 --- a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp +++ b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp @@ -12,7 +12,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { int result = 0; try diff --git a/TAO/tests/OBV/Collocated/Forward/Client_Task.h b/TAO/tests/OBV/Collocated/Forward/Client_Task.h index 7239ed526b1..cc9f65a040f 100644 --- a/TAO/tests/OBV/Collocated/Forward/Client_Task.h +++ b/TAO/tests/OBV/Collocated/Forward/Client_Task.h @@ -23,7 +23,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); void dump_node (BaseNode *bn, int indent); diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp index fd02bf6fec2..a23aab2b223 100644 --- a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp +++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp @@ -18,7 +18,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output, } int -Server_Task::svc (void) +Server_Task::svc () { try { diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.h b/TAO/tests/OBV/Collocated/Forward/Server_Task.h index cea47faeb95..9f6a4ffa912 100644 --- a/TAO/tests/OBV/Collocated/Forward/Server_Task.h +++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.h @@ -27,7 +27,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Output file for IOR diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp index a921535a4eb..e203ccfd62e 100644 --- a/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp +++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.cpp @@ -36,7 +36,7 @@ Test_impl::reflect (TreeController * tc) } void -Test_impl::shutdown (void) +Test_impl::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/OBV/Collocated/Forward/Test_impl.h b/TAO/tests/OBV/Collocated/Forward/Test_impl.h index 47ea5de756d..32d544194c1 100644 --- a/TAO/tests/OBV/Collocated/Forward/Test_impl.h +++ b/TAO/tests/OBV/Collocated/Forward/Test_impl.h @@ -32,7 +32,7 @@ public: virtual TreeController * reflect ( TreeController * tc); - virtual void shutdown (void); + virtual void shutdown (); private: /// The ORB diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.cpp b/TAO/tests/OBV/Factory/FactoryC_impl.cpp index c0cde67dcba..1fede0aa5cc 100644 --- a/TAO/tests/OBV/Factory/FactoryC_impl.cpp +++ b/TAO/tests/OBV/Factory/FactoryC_impl.cpp @@ -37,7 +37,7 @@ Value2_init_impl::create ( } CORBA::ValueBase * -Value2_init_impl::create_for_unmarshal (void) +Value2_init_impl::create_for_unmarshal () { OBV_FactoryTest::Value2* ret_val = 0; ACE_NEW_THROW_EX (ret_val, diff --git a/TAO/tests/OBV/Factory/FactoryC_impl.h b/TAO/tests/OBV/Factory/FactoryC_impl.h index 2eb16242ff3..08b40df990c 100644 --- a/TAO/tests/OBV/Factory/FactoryC_impl.h +++ b/TAO/tests/OBV/Factory/FactoryC_impl.h @@ -47,7 +47,7 @@ public: ); public: - virtual CORBA::ValueBase * create_for_unmarshal (void); + virtual CORBA::ValueBase * create_for_unmarshal (); }; #endif /* TAO_FACTORY_FACTORY_C_IMPL_H */ diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.cpp b/TAO/tests/OBV/Factory/FactoryS_impl.cpp index 169eaf05e43..711eb446d8e 100644 --- a/TAO/tests/OBV/Factory/FactoryS_impl.cpp +++ b/TAO/tests/OBV/Factory/FactoryS_impl.cpp @@ -7,7 +7,7 @@ Test_impl::Test_impl (CORBA::ORB_ptr orb) } OBV_FactoryTest::BaseValue * -Test_impl::get_base_value (void) +Test_impl::get_base_value () { OBV_FactoryTest::BaseValue* ret_val = 0; ACE_NEW_RETURN (ret_val, @@ -18,7 +18,7 @@ Test_impl::get_base_value (void) } OBV_FactoryTest::Value1 * -Test_impl::get_value1 (void) +Test_impl::get_value1 () { OBV_FactoryTest::Value1* ret_val = 0; ACE_NEW_RETURN (ret_val, @@ -29,7 +29,7 @@ Test_impl::get_value1 (void) } OBV_FactoryTest::Value2 * -Test_impl::get_value2 (void) +Test_impl::get_value2 () { OBV_FactoryTest::Value2* ret_val = 0; ACE_NEW_RETURN (ret_val, @@ -40,7 +40,7 @@ Test_impl::get_value2 (void) } void -Test_impl::shutdown (void) +Test_impl::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/OBV/Factory/FactoryS_impl.h b/TAO/tests/OBV/Factory/FactoryS_impl.h index 8556cc81ebb..c963f4c3fa2 100644 --- a/TAO/tests/OBV/Factory/FactoryS_impl.h +++ b/TAO/tests/OBV/Factory/FactoryS_impl.h @@ -27,13 +27,13 @@ public: /// ctor Test_impl (CORBA::ORB_ptr orb); - virtual OBV_FactoryTest::BaseValue * get_base_value (void); + virtual OBV_FactoryTest::BaseValue * get_base_value (); - virtual OBV_FactoryTest::Value1 * get_value1 (void); + virtual OBV_FactoryTest::Value1 * get_value1 (); - virtual OBV_FactoryTest::Value2 * get_value2 (void); + virtual OBV_FactoryTest::Value2 * get_value2 (); - virtual void shutdown (void); + virtual void shutdown (); private: /// The ORB diff --git a/TAO/tests/OBV/Forward/Test_impl.cpp b/TAO/tests/OBV/Forward/Test_impl.cpp index ad571a516a8..446c475e0b9 100644 --- a/TAO/tests/OBV/Forward/Test_impl.cpp +++ b/TAO/tests/OBV/Forward/Test_impl.cpp @@ -37,7 +37,7 @@ Test_impl::reflect (TreeController * tc) } void -Test_impl::shutdown (void) +Test_impl::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/OBV/Forward/Test_impl.h b/TAO/tests/OBV/Forward/Test_impl.h index ddddbe5948f..2dbb5b9fce2 100644 --- a/TAO/tests/OBV/Forward/Test_impl.h +++ b/TAO/tests/OBV/Forward/Test_impl.h @@ -30,7 +30,7 @@ public: virtual TreeController * reflect ( TreeController * tc); - virtual void shutdown (void); + virtual void shutdown (); private: /// The ORB diff --git a/TAO/tests/OBV/Indirection/Factory.cpp b/TAO/tests/OBV/Indirection/Factory.cpp index 56e0938bd73..8a827f7e66b 100644 --- a/TAO/tests/OBV/Indirection/Factory.cpp +++ b/TAO/tests/OBV/Indirection/Factory.cpp @@ -9,7 +9,7 @@ NodeFactory::register_new_factory (CORBA::ORB& orb) { } CORBA::ValueBase* -NodeFactory::create_for_unmarshal (void) +NodeFactory::create_for_unmarshal () { ::CORBA::ValueBase *ret_val = 0; ACE_NEW_THROW_EX ( @@ -29,7 +29,7 @@ BoxedValueFactory::register_new_factory (CORBA::ORB& orb) { } CORBA::ValueBase* -BoxedValueFactory::create_for_unmarshal (void) +BoxedValueFactory::create_for_unmarshal () { ::CORBA::ValueBase *ret_val = 0; ACE_NEW_THROW_EX ( @@ -49,7 +49,7 @@ BaseValueFactory::register_new_factory (CORBA::ORB& orb) { } CORBA::ValueBase* -BaseValueFactory::create_for_unmarshal (void) +BaseValueFactory::create_for_unmarshal () { ::CORBA::ValueBase *ret_val = 0; ACE_NEW_THROW_EX ( @@ -69,7 +69,7 @@ TValueFactory::register_new_factory (CORBA::ORB& orb) { } CORBA::ValueBase* -TValueFactory::create_for_unmarshal (void) +TValueFactory::create_for_unmarshal () { ::CORBA::ValueBase *ret_val = 0; ACE_NEW_THROW_EX ( @@ -89,7 +89,7 @@ ConfigValueFactory::register_new_factory (CORBA::ORB& orb) { } CORBA::ValueBase* -ConfigValueFactory::create_for_unmarshal (void) +ConfigValueFactory::create_for_unmarshal () { ::CORBA::ValueBase *ret_val = 0; ACE_NEW_THROW_EX ( diff --git a/TAO/tests/OBV/Indirection/Factory.h b/TAO/tests/OBV/Indirection/Factory.h index 9ea876feab7..17f21158d02 100644 --- a/TAO/tests/OBV/Indirection/Factory.h +++ b/TAO/tests/OBV/Indirection/Factory.h @@ -6,7 +6,7 @@ class NodeFactory : public CORBA::ValueFactoryBase { public: static void register_new_factory(CORBA::ORB& orb); - virtual CORBA::ValueBase* create_for_unmarshal(void); + virtual CORBA::ValueBase* create_for_unmarshal(); }; @@ -14,7 +14,7 @@ class BoxedValueFactory : public CORBA::ValueFactoryBase { public: static void register_new_factory(CORBA::ORB& orb); - virtual CORBA::ValueBase* create_for_unmarshal(void); + virtual CORBA::ValueBase* create_for_unmarshal(); }; @@ -22,7 +22,7 @@ class BaseValueFactory : public CORBA::ValueFactoryBase { public: static void register_new_factory(CORBA::ORB& orb); - virtual CORBA::ValueBase* create_for_unmarshal(void); + virtual CORBA::ValueBase* create_for_unmarshal(); }; @@ -30,14 +30,14 @@ class TValueFactory : public CORBA::ValueFactoryBase { public: static void register_new_factory(CORBA::ORB& orb); - virtual CORBA::ValueBase* create_for_unmarshal(void); + virtual CORBA::ValueBase* create_for_unmarshal(); }; class ConfigValueFactory : public CORBA::ValueFactoryBase { public: static void register_new_factory(CORBA::ORB& orb); - virtual CORBA::ValueBase* create_for_unmarshal(void); + virtual CORBA::ValueBase* create_for_unmarshal(); }; class ConfigValueImpl : public ::OBV_demo::value::idl::ConfigValue diff --git a/TAO/tests/OBV/Simple/Client_i.cpp b/TAO/tests/OBV/Simple/Client_i.cpp index 9a677c602a9..9a9b42920c0 100644 --- a/TAO/tests/OBV/Simple/Client_i.cpp +++ b/TAO/tests/OBV/Simple/Client_i.cpp @@ -44,13 +44,13 @@ Checkpoint_Client_i::run (const char *name, } // Constructor. -Checkpoint_Client_i::Checkpoint_Client_i (void) +Checkpoint_Client_i::Checkpoint_Client_i () { //no-op } //Destructor. -Checkpoint_Client_i::~Checkpoint_Client_i (void) +Checkpoint_Client_i::~Checkpoint_Client_i () { //no-op } diff --git a/TAO/tests/OBV/Simple/Client_i.h b/TAO/tests/OBV/Simple/Client_i.h index 6796c09fb47..a3738171e01 100644 --- a/TAO/tests/OBV/Simple/Client_i.h +++ b/TAO/tests/OBV/Simple/Client_i.h @@ -31,10 +31,10 @@ class Checkpoint_Client_i { public: /// Constructor - Checkpoint_Client_i (void); + Checkpoint_Client_i (); /// Destructor - virtual ~Checkpoint_Client_i (void); + virtual ~Checkpoint_Client_i (); /// Execute the methods virtual int run (const char *,int, ACE_TCHAR** ); diff --git a/TAO/tests/OBV/Simple/OBV_impl.cpp b/TAO/tests/OBV/Simple/OBV_impl.cpp index b49d1f116d7..e879bce4c51 100644 --- a/TAO/tests/OBV/Simple/OBV_impl.cpp +++ b/TAO/tests/OBV/Simple/OBV_impl.cpp @@ -17,14 +17,14 @@ Event_impl::~Event_impl () } CORBA::ValueBase* -Event_impl::_copy_value (void) +Event_impl::_copy_value () { return new Event_impl (this->value_ ()); } void -Event_impl::do_print (void) +Event_impl::do_print () { ACE_DEBUG((LM_DEBUG, "(value %d) \n", (CORBA::ULong) this->value_())); @@ -35,7 +35,7 @@ Event_factory::~Event_factory () } TAO_OBV_CREATE_RETURN_TYPE (Event) -Event_factory::create_for_unmarshal (void) +Event_factory::create_for_unmarshal () { return new Event_impl; } diff --git a/TAO/tests/OBV/Simple/OBV_impl.h b/TAO/tests/OBV/Simple/OBV_impl.h index 3bc81eda768..133da704f92 100644 --- a/TAO/tests/OBV/Simple/OBV_impl.h +++ b/TAO/tests/OBV/Simple/OBV_impl.h @@ -12,8 +12,8 @@ class Event_impl : public virtual OBV_Event, Event_impl (); Event_impl (CORBA::Long value); virtual ~Event_impl (); - virtual CORBA::ValueBase* _copy_value (void); - virtual void do_print (void); + virtual CORBA::ValueBase* _copy_value (); + virtual void do_print (); }; class Event_factory : public CORBA::ValueFactoryBase @@ -25,7 +25,7 @@ protected: virtual ~Event_factory (); private: - TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (void); + TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (); }; #endif /* OBV_IMPL_H */ diff --git a/TAO/tests/OBV/Simple/Server_i.cpp b/TAO/tests/OBV/Simple/Server_i.cpp index 1ad1a9cfb8b..602d0f9efab 100644 --- a/TAO/tests/OBV/Simple/Server_i.cpp +++ b/TAO/tests/OBV/Simple/Server_i.cpp @@ -49,7 +49,7 @@ Checkpoint_i::put_event (Event *event) // Shutdown the server application. void -Checkpoint_i::shutdown (void) +Checkpoint_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "\nThe Checkpoint server is shutting down\n")); @@ -59,11 +59,11 @@ Checkpoint_i::shutdown (void) } // Constructor. -Checkpoint_i::Checkpoint_i (void) +Checkpoint_i::Checkpoint_i () { } // Destructor. -Checkpoint_i::~Checkpoint_i (void) +Checkpoint_i::~Checkpoint_i () { } diff --git a/TAO/tests/OBV/Simple/Server_i.h b/TAO/tests/OBV/Simple/Server_i.h index cc38e9d2b6e..138569c7247 100644 --- a/TAO/tests/OBV/Simple/Server_i.h +++ b/TAO/tests/OBV/Simple/Server_i.h @@ -20,14 +20,14 @@ class Checkpoint_i : public POA_Checkpoint { public: /// Constructor. - Checkpoint_i (void); + Checkpoint_i (); /// Destructor. - ~Checkpoint_i (void); + ~Checkpoint_i (); virtual void put_event (Event * e); - virtual void shutdown (void); + virtual void shutdown (); /// Set the ORB pointer. void orb (CORBA::ORB_ptr o); diff --git a/TAO/tests/OBV/Simple/Simple_util.cpp b/TAO/tests/OBV/Simple/Simple_util.cpp index 4f75ce7bbad..c8282e111d1 100644 --- a/TAO/tests/OBV/Simple/Simple_util.cpp +++ b/TAO/tests/OBV/Simple/Simple_util.cpp @@ -13,7 +13,7 @@ // Constructor. template <class Servant> -Server<Servant>::Server (void) +Server<Servant>::Server () : ior_output_file_ (0) { } @@ -21,14 +21,14 @@ Server<Servant>::Server (void) // Destructor. template <class Servant> -Server<Servant>::~Server (void) +Server<Servant>::~Server () { } // Parse the command-line arguments and set options. template <class Servant> int -Server<Servant>::parse_args (void) +Server<Servant>::parse_args () { ACE_Get_Opt get_opts (this->argc_, this->argv_, ACE_TEXT("do:ni:")); int c = 0; @@ -125,7 +125,7 @@ Server<Servant>::init (const char *servant_name, } template <class Servant>int -Server<Servant>::run (void) +Server<Servant>::run () { // Run the main event loop for the ORB. if (this->orb_manager_.run () == -1) @@ -137,7 +137,7 @@ Server<Servant>::run (void) } template <class Servant> int -Server<Servant>::register_name (void) +Server<Servant>::register_name () { return -1; } @@ -145,7 +145,7 @@ Server<Servant>::register_name (void) // Constructor. template <class InterfaceObj, class Var> -Client<InterfaceObj, Var>::Client (void) +Client<InterfaceObj, Var>::Client () : ior_ (0) { //no-op @@ -184,7 +184,7 @@ Client<InterfaceObj, Var>::read_ior (ACE_TCHAR *filename) // Parses the command line arguments and returns an error status. template <class InterfaceObj, class Var> int -Client<InterfaceObj, Var>::parse_args (void) +Client<InterfaceObj, Var>::parse_args () { ACE_Get_Opt get_opts (argc_, argv_, ACE_TEXT("df:nk:x")); int c = 0; @@ -217,7 +217,7 @@ Client<InterfaceObj, Var>::parse_args (void) } template <class InterfaceObj, class Var> -Client<InterfaceObj, Var>::~Client (void) +Client<InterfaceObj, Var>::~Client () { ACE_OS::free (this->ior_); } @@ -272,7 +272,7 @@ Client<InterfaceObj, Var>::init (const char *name, template <class InterfaceObj, class Var> int -Client<InterfaceObj, Var>::obtain_initial_references (void) +Client<InterfaceObj, Var>::obtain_initial_references () { return 0; } diff --git a/TAO/tests/OBV/Simple/Simple_util.h b/TAO/tests/OBV/Simple/Simple_util.h index 68abbdb1a4f..e798140edeb 100644 --- a/TAO/tests/OBV/Simple/Simple_util.h +++ b/TAO/tests/OBV/Simple/Simple_util.h @@ -32,10 +32,10 @@ class Server { public: /// Constructor. - Server (void); + Server (); /// Destructor. - ~Server (void); + ~Server (); /// Initialize the Server state - parsing arguments and waiting. /// interface_name is the name used to register the Servant. @@ -45,10 +45,10 @@ public: /// After calling <init>, this method will register the server with /// the TAO Naming Service using the servant_name passed to <init>. - int register_name (void); + int register_name (); /// Run the orb. - int run (void); + int run (); protected: /// Servant class @@ -58,7 +58,7 @@ protected: const char *name; /// Parses the commandline arguments. - int parse_args (void); + int parse_args (); /// The ORB manager - a helper class for accessing the POA and /// registering objects. @@ -91,10 +91,10 @@ class Client { public: /// Constructor. - Client (void); + Client (); /// Destructor. - ~Client (void); + ~Client (); /// Initialize the client communication endpoint with server. int init (const char *name,int argc, ACE_TCHAR *argv[]); @@ -109,14 +109,14 @@ public: void shutdown (int); /// Initialize naming service - int obtain_initial_references (void); + int obtain_initial_references (); protected: /// 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 (); // TAO_Naming_Client namingClient; // helper class for getting access to Naming Service. diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp index f2f2d2d7d57..7e311788243 100644 --- a/TAO/tests/OBV/Supports/Supports_Test_impl.cpp +++ b/TAO/tests/OBV/Supports/Supports_Test_impl.cpp @@ -6,7 +6,7 @@ /* vt_graph_impl */ -vt_graph_impl::vt_graph_impl (void) +vt_graph_impl::vt_graph_impl () { } @@ -24,7 +24,7 @@ vt_graph_impl::vt_graph_impl (int num_nodes) } // Get the number of nodes in the vt_graph. -CORBA::Long vt_graph_impl::size (void) +CORBA::Long vt_graph_impl::size () { return nodes_ ().length (); } @@ -41,7 +41,7 @@ vt_graph_impl::add_node (const char * name) // Print out information about each node. void -vt_graph_impl::print (void) +vt_graph_impl::print () { ACE_DEBUG ((LM_DEBUG, "Printing graph data...\n")); @@ -57,7 +57,7 @@ vt_graph_impl::print (void) /* vt_graph_init_impl - factory operations */ Supports_Test::vt_graph * -vt_graph_init_impl::create (void) +vt_graph_init_impl::create () { vt_graph_impl * ret_val = 0; ACE_NEW_RETURN (ret_val, vt_graph_impl, 0); @@ -65,7 +65,7 @@ vt_graph_init_impl::create (void) } CORBA::ValueBase * -vt_graph_init_impl::create_for_unmarshal (void) +vt_graph_init_impl::create_for_unmarshal () { vt_graph_impl * ret_val = 0; ACE_NEW_RETURN (ret_val, vt_graph_impl, 0); @@ -79,7 +79,7 @@ test_impl::test_impl (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { } -test_impl::~test_impl (void) +test_impl::~test_impl () { } @@ -146,12 +146,12 @@ test_impl::pass_vt_graph_inout ( } void -test_impl::start (void) +test_impl::start () { } void -test_impl::finish (void) +test_impl::finish () { this->orb_->shutdown (false); } @@ -159,7 +159,7 @@ test_impl::finish (void) /* node_impl */ -node_impl::node_impl (void) +node_impl::node_impl () { } @@ -203,7 +203,7 @@ node_impl::change_weight (CORBA::Long new_weight) } void -node_impl::print (void) +node_impl::print () { cout << " Name: " << name_ () << endl; cout << " Weight: " << weight_ () << endl; @@ -216,7 +216,7 @@ node_impl::print (void) /* node_init_impl - factory operations */ Supports_Test::Node * -node_init_impl::create (void) +node_init_impl::create () { node_impl * ret_val = 0; ACE_NEW_RETURN (ret_val, node_impl, 0); @@ -224,7 +224,7 @@ node_init_impl::create (void) } CORBA::ValueBase * -node_init_impl::create_for_unmarshal (void) +node_init_impl::create_for_unmarshal () { node_impl * ret_val = 0; ACE_NEW_RETURN (ret_val, node_impl, 0); diff --git a/TAO/tests/OBV/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h index 590eaca9269..733d5beb0b4 100644 --- a/TAO/tests/OBV/Supports/Supports_Test_impl.h +++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h @@ -12,7 +12,7 @@ class node_impl : public virtual CORBA::DefaultValueRefCountBase { public: - node_impl (void); + node_impl (); node_impl (const char * name); @@ -22,15 +22,15 @@ public: void change_weight (CORBA::Long new_weight); - void print (void); + void print (); }; class node_init_impl : public Supports_Test::Node_init { public: - virtual Supports_Test::Node * create (void); + virtual Supports_Test::Node * create (); - virtual CORBA::ValueBase * create_for_unmarshal (void); + virtual CORBA::ValueBase * create_for_unmarshal (); }; @@ -40,24 +40,24 @@ class vt_graph_impl : public virtual CORBA::DefaultValueRefCountBase { public: - vt_graph_impl (void); + vt_graph_impl (); vt_graph_impl (int num_nodes); - virtual CORBA::Long size (void); + virtual CORBA::Long size (); virtual void add_node (const char * name); - virtual void print (void); + virtual void print (); }; class vt_graph_init_impl : public Supports_Test::vt_graph_init { public: - virtual Supports_Test::vt_graph * create (void); + virtual Supports_Test::vt_graph * create (); - virtual CORBA::ValueBase * create_for_unmarshal (void); + virtual CORBA::ValueBase * create_for_unmarshal (); }; class test_impl : @@ -66,7 +66,7 @@ class test_impl : public: test_impl (CORBA::ORB_ptr orb); - virtual ~test_impl (void); + virtual ~test_impl (); virtual void pass_obj_graph_in (Supports_Test::graph * graph_param); @@ -80,9 +80,9 @@ class test_impl : virtual void pass_vt_graph_inout (Supports_Test::vt_graph * &vt_graph_param); - virtual void start (void); + virtual void start (); - virtual void finish (void); + virtual void finish (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/OBV/TC_Alignment/test_i.cpp b/TAO/tests/OBV/TC_Alignment/test_i.cpp index ed20848b459..dafdac61f33 100644 --- a/TAO/tests/OBV/TC_Alignment/test_i.cpp +++ b/TAO/tests/OBV/TC_Alignment/test_i.cpp @@ -64,7 +64,7 @@ test_i::get_value (CORBA::Long offset) } void -test_i::shutdown (void) +test_i::shutdown () { this->orb_->shutdown (); } diff --git a/TAO/tests/OBV/TC_Alignment/test_i.h b/TAO/tests/OBV/TC_Alignment/test_i.h index 9dddc34fc28..4cc2ef89b94 100644 --- a/TAO/tests/OBV/TC_Alignment/test_i.h +++ b/TAO/tests/OBV/TC_Alignment/test_i.h @@ -36,7 +36,7 @@ public: virtual CORBA::Any *get_value (CORBA::Long offset); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_ptr orb_; diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp index b38e709023f..5789adcda72 100644 --- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp +++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.cpp @@ -175,7 +175,7 @@ Test_impl::op5 (const CORBA::Any& val, } void -Test_impl::shutdown (void) +Test_impl::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h index 843ed75dfed..55638797122 100644 --- a/TAO/tests/OBV/Truncatable/TruncatableS_impl.h +++ b/TAO/tests/OBV/Truncatable/TruncatableS_impl.h @@ -64,7 +64,7 @@ public: char *& desc ); - virtual void shutdown (void); + virtual void shutdown (); private: /// The ORB diff --git a/TAO/tests/OBV/ValueBox/Test_impl.cpp b/TAO/tests/OBV/ValueBox/Test_impl.cpp index 9d87012b6b1..619158ea6a8 100644 --- a/TAO/tests/OBV/ValueBox/Test_impl.cpp +++ b/TAO/tests/OBV/ValueBox/Test_impl.cpp @@ -476,7 +476,7 @@ Test_impl::union_op4 (const ::Variable_Union1 & p1, void -Test_impl::shutdown (void) +Test_impl::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/OBV/ValueBox/Test_impl.h b/TAO/tests/OBV/ValueBox/Test_impl.h index 95b9d4af8e5..ee148e839ba 100644 --- a/TAO/tests/OBV/ValueBox/Test_impl.h +++ b/TAO/tests/OBV/ValueBox/Test_impl.h @@ -102,7 +102,7 @@ public: ::Variable_Union1_out p3); - virtual void shutdown (void); + virtual void shutdown (); private: /// The ORB diff --git a/TAO/tests/OBV/ValueBox/client.cpp b/TAO/tests/OBV/ValueBox/client.cpp index c82ad1d6853..b699e4f4800 100644 --- a/TAO/tests/OBV/ValueBox/client.cpp +++ b/TAO/tests/OBV/ValueBox/client.cpp @@ -153,7 +153,7 @@ int box_test_ref (BoxT *valuebox, UT &val1, UT &val2) return fail; } -int test_basic (void) +int test_basic () { int fail = 0; @@ -519,7 +519,7 @@ int test_boxed_string_invocations (Test * test_object) // // Test boxed sequence types. // -int test_boxed_sequence (void) +int test_boxed_sequence () { int fail = 0; try @@ -698,7 +698,7 @@ int test_boxed_sequence_invocations (Test * test_object) // Test a boxed struct type. This is not templated since the struct // members are accessed by name, so this is specific to a certain IDL. // -int test_boxed_struct (void) +int test_boxed_struct () { int fail = 0; diff --git a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp index fdc3591ca8d..5d4d0f0241c 100644 --- a/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp +++ b/TAO/tests/ORB_Local_Config/Bug_2612/DllOrb.cpp @@ -119,7 +119,7 @@ int DllOrb::init (int argc, ACE_TCHAR *argv[]) return 0; } -int DllOrb::fini (void) +int DllOrb::fini () { int result; @@ -190,7 +190,7 @@ int DllOrb::fini (void) return 0; } -int DllOrb::svc (void) +int DllOrb::svc () { #if defined (ACE_HAS_THREADS) mp_barrier->wait(); diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp index 1e00a53f757..77c4ceb3290 100644 --- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp +++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.cpp @@ -21,7 +21,7 @@ invoke_service_config (void *arg) return 0; } -Service_Config_DLL::Service_Config_DLL (void) +Service_Config_DLL::Service_Config_DLL () { ACE_OS::memset (this->directive_[0], 0, BUFSIZ * sizeof (ACE_TCHAR)); ACE_OS::memset (this->directive_[1], 0, BUFSIZ * sizeof (ACE_TCHAR)); @@ -92,13 +92,13 @@ Service_Config_DLL::init (int argc, ACE_TCHAR *argv[]) } int -Service_Config_DLL::fini (void) +Service_Config_DLL::fini () { return 0; } int -Service_Config_DLL::svc (void) +Service_Config_DLL::svc () { if (ACE_Thread_Manager::instance ()->spawn (invoke_service_config, this->directive_[1]) == -1) diff --git a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h index 4b260fa48c6..14dc318497e 100644 --- a/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h +++ b/TAO/tests/ORB_Local_Config/Service_Dependency/Service_Config_DLL.h @@ -34,7 +34,7 @@ class Service_Config_DLL_Export Service_Config_DLL : public ACE_Task_Base { public: /// Constructor. - Service_Config_DLL (void); + Service_Config_DLL (); /// Initializes object when dynamic linking occurs. virtual int init (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp index 211d91693b2..b8aea2d7552 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.cpp @@ -13,12 +13,12 @@ Abstract_Worker::Abstract_Worker (const ACE_TCHAR *s) } // -Abstract_Worker::~Abstract_Worker (void) +Abstract_Worker::~Abstract_Worker () { } // -Service_Config_ORB_DLL::Service_Config_ORB_DLL (void) +Service_Config_ORB_DLL::Service_Config_ORB_DLL () : is_server_ (-1) , worker_ (0) , argv_ (0) @@ -26,7 +26,7 @@ Service_Config_ORB_DLL::Service_Config_ORB_DLL (void) } // -Service_Config_ORB_DLL::~Service_Config_ORB_DLL (void) +Service_Config_ORB_DLL::~Service_Config_ORB_DLL () { } @@ -98,7 +98,7 @@ Service_Config_ORB_DLL::init (int argc, ACE_TCHAR *argv[]) } int -Service_Config_ORB_DLL::svc (void) +Service_Config_ORB_DLL::svc () { ACE_ASSERT (this->worker_.get () != 0); ACE_ASSERT (this->argv_.get () != 0); diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h index b6950577a5a..1977726f118 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/ORB_DLL.h @@ -30,7 +30,7 @@ class Abstract_Worker { public: Abstract_Worker (const ACE_TCHAR *ior); - virtual ~Abstract_Worker (void); + virtual ~Abstract_Worker (); virtual int test_main (int argc, ACE_TCHAR *argv[]) = 0; virtual const ACE_TCHAR * kind () const = 0; @@ -45,7 +45,7 @@ class Server_Worker : public Abstract_Worker { public: Server_Worker (); - ~Server_Worker (void); + ~Server_Worker (); int test_main (int argc, ACE_TCHAR *argv[]); const ACE_TCHAR * kind () const; @@ -60,7 +60,7 @@ class Client_Worker : public Abstract_Worker { public: Client_Worker (); - ~Client_Worker (void); + ~Client_Worker (); int test_main (int argc, ACE_TCHAR *argv[]); const ACE_TCHAR * kind () const; @@ -79,8 +79,8 @@ class Service_Config_ORB_DLL_Export Service_Config_ORB_DLL { public: /// Constructor. - Service_Config_ORB_DLL (void); - ~Service_Config_ORB_DLL (void); + Service_Config_ORB_DLL (); + ~Service_Config_ORB_DLL (); /// Initializes object when dynamic linking occurs. virtual int init (int argc, ACE_TCHAR *argv[]); diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp index 17607898770..83e6ffe6929 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.cpp @@ -6,13 +6,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/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.h +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/Test_i.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/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp index db65b94520a..e14fe880855 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/client.cpp @@ -17,7 +17,7 @@ Client_Worker::kind () const return ACE_TEXT ("Client"); } -Client_Worker::~Client_Worker (void) +Client_Worker::~Client_Worker () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) %@ Client::<dtor>\n", this)); } diff --git a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp index a15a9fa9720..9425ff57850 100644 --- a/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp +++ b/TAO/tests/ORB_Local_Config/Two_DLL_ORB/server.cpp @@ -19,7 +19,7 @@ Server_Worker::kind () const } // -Server_Worker::~Server_Worker (void) +Server_Worker::~Server_Worker () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) %@ Server::<dtor>\n", this)); } diff --git a/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h b/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h index 48d00ac8139..9d73704966e 100644 --- a/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h +++ b/TAO/tests/ORB_Local_Config/lib/Service_Configuration_Per_ORB.h @@ -26,7 +26,7 @@ class ACE_Service_Gestalt_Test : public ACE_Service_Gestalt { }; - ~ACE_Service_Gestalt_Test (void) + ~ACE_Service_Gestalt_Test () { if (this->teardown_) { diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.cpp b/TAO/tests/ORB_shutdown/Foo_Bar.cpp index 22288154860..bdf1fdec49a 100644 --- a/TAO/tests/ORB_shutdown/Foo_Bar.cpp +++ b/TAO/tests/ORB_shutdown/Foo_Bar.cpp @@ -5,7 +5,7 @@ Foo_Bar::Foo_Bar (CORBA::ORB_ptr orb) { } -Foo_Bar::~Foo_Bar (void) +Foo_Bar::~Foo_Bar () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Shutting down the ORB again\n")); diff --git a/TAO/tests/ORB_shutdown/Foo_Bar.h b/TAO/tests/ORB_shutdown/Foo_Bar.h index 21c0a669204..b5b4963dfb9 100644 --- a/TAO/tests/ORB_shutdown/Foo_Bar.h +++ b/TAO/tests/ORB_shutdown/Foo_Bar.h @@ -14,7 +14,7 @@ public: Foo_Bar (CORBA::ORB_ptr orb); /// Dtor - ~Foo_Bar (void); + ~Foo_Bar (); private: diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp index aaa376144d8..304a23bc09b 100644 --- a/TAO/tests/ORT/ORT_test_IORInterceptor.cpp +++ b/TAO/tests/ORT/ORT_test_IORInterceptor.cpp @@ -3,20 +3,20 @@ #include "tao/ORB_Constants.h" -ORT_test_IORInterceptor::ORT_test_IORInterceptor (void) +ORT_test_IORInterceptor::ORT_test_IORInterceptor () : establish_count_ (0), components_establish_count_ (0) { } char * -ORT_test_IORInterceptor::name (void) +ORT_test_IORInterceptor::name () { return CORBA::string_dup ("ORT_IORInterceptor"); } void -ORT_test_IORInterceptor::destroy (void) +ORT_test_IORInterceptor::destroy () { ACE_ASSERT (this->establish_count_ > 0 && this->components_establish_count_ > 0 diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h index b1ddb06e524..d92afd169f1 100644 --- a/TAO/tests/ORT/ORT_test_IORInterceptor.h +++ b/TAO/tests/ORT/ORT_test_IORInterceptor.h @@ -33,7 +33,7 @@ class ORT_test_IORInterceptor public virtual ::CORBA::LocalObject { public: - ORT_test_IORInterceptor (void); + ORT_test_IORInterceptor (); /** * @name Methods Required by the IOR Interceptor Interface @@ -44,10 +44,10 @@ public: */ //@{ /// Return the name of this IORInterceptor. - virtual char * name (void); + virtual char * name (); /// Cleanup resources acquired by this IORInterceptor. - virtual void destroy (void); + virtual void destroy (); /// Add the tagged components to the IOR. virtual void establish_components ( diff --git a/TAO/tests/ORT/ORT_test_i.cpp b/TAO/tests/ORT/ORT_test_i.cpp index 11cab5e8254..49fb852d921 100644 --- a/TAO/tests/ORT/ORT_test_i.cpp +++ b/TAO/tests/ORT/ORT_test_i.cpp @@ -6,13 +6,13 @@ ORT_test_i::ORT_test_i (CORBA::ORB_ptr orb) } CORBA::Boolean -ORT_test_i::request_server (void) +ORT_test_i::request_server () { return 0; } void -ORT_test_i::shutdown (void) +ORT_test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/ORT/ORT_test_i.h b/TAO/tests/ORT/ORT_test_i.h index 41857c1a258..fca38d4dd19 100644 --- a/TAO/tests/ORT/ORT_test_i.h +++ b/TAO/tests/ORT/ORT_test_i.h @@ -23,9 +23,9 @@ class ORT_test_i : public virtual POA_ObjectReferenceTemplate::ORT_test public: ORT_test_i (CORBA::ORB_ptr orb); - virtual CORBA::Boolean request_server (void); + virtual CORBA::Boolean request_server (); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/ORT/ObjectReferenceFactory.cpp b/TAO/tests/ORT/ObjectReferenceFactory.cpp index 7bc1831378c..c7cb240663c 100644 --- a/TAO/tests/ORT/ObjectReferenceFactory.cpp +++ b/TAO/tests/ORT/ObjectReferenceFactory.cpp @@ -10,7 +10,7 @@ ObjectReferenceFactory::ObjectReferenceFactory ( } ::CORBA::ValueBase * -ObjectReferenceFactory::_copy_value (void) +ObjectReferenceFactory::_copy_value () { ::CORBA::ValueBase *ret_val= 0; ACE_NEW_THROW_EX ( @@ -21,7 +21,7 @@ ObjectReferenceFactory::_copy_value (void) return ret_val; } -ObjectReferenceFactory::~ObjectReferenceFactory (void) +ObjectReferenceFactory::~ObjectReferenceFactory () { // No need to call CORBA::remove_ref() on this->old_orf_. It is a // "_var" object, meaning that will be done automatically. diff --git a/TAO/tests/ORT/ObjectReferenceFactory.h b/TAO/tests/ORT/ObjectReferenceFactory.h index 7eaa3fce6a6..06a0c3d9ac0 100644 --- a/TAO/tests/ORT/ObjectReferenceFactory.h +++ b/TAO/tests/ORT/ObjectReferenceFactory.h @@ -42,7 +42,7 @@ class ObjectReferenceFactory ObjectReferenceFactory ( PortableInterceptor::ObjectReferenceFactory * old_orf); - virtual ::CORBA::ValueBase *_copy_value (void); + virtual ::CORBA::ValueBase *_copy_value (); /** * @name PortableInterceptor::ObjectReferenceFactory Methods @@ -62,7 +62,7 @@ protected: * Protected destructor to enforce proper memory management via * reference counting. */ - ~ObjectReferenceFactory (void); + ~ObjectReferenceFactory (); private: /// The old ObjectReferenceFactory used to create object references. diff --git a/TAO/tests/ORT/ServerRequestInterceptor.cpp b/TAO/tests/ORT/ServerRequestInterceptor.cpp index 096d6e628d1..8b08aa66ef1 100644 --- a/TAO/tests/ORT/ServerRequestInterceptor.cpp +++ b/TAO/tests/ORT/ServerRequestInterceptor.cpp @@ -13,13 +13,13 @@ ServerRequestInterceptor::ServerRequestInterceptor ( } char * -ServerRequestInterceptor::name (void) +ServerRequestInterceptor::name () { return CORBA::string_dup ("ServerRequestInterceptor"); } void -ServerRequestInterceptor::destroy (void) +ServerRequestInterceptor::destroy () { } diff --git a/TAO/tests/ORT/ServerRequestInterceptor.h b/TAO/tests/ORT/ServerRequestInterceptor.h index 7158157b429..5e67b364566 100644 --- a/TAO/tests/ORT/ServerRequestInterceptor.h +++ b/TAO/tests/ORT/ServerRequestInterceptor.h @@ -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/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp index 34376b8cde5..582381f75db 100644 --- a/TAO/tests/Object_Loader/Loader.cpp +++ b/TAO/tests/Object_Loader/Loader.cpp @@ -1,7 +1,7 @@ #include "Loader.h" #include "Test_i.h" -Loader::Loader (void) +Loader::Loader () { } diff --git a/TAO/tests/Object_Loader/Loader.h b/TAO/tests/Object_Loader/Loader.h index a8c70cee8c3..e79c3adc196 100644 --- a/TAO/tests/Object_Loader/Loader.h +++ b/TAO/tests/Object_Loader/Loader.h @@ -23,7 +23,7 @@ class OLT_Export Loader : public TAO_Object_Loader { public: /// ctor - Loader (void); + Loader (); /// Create a new instance virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb, diff --git a/TAO/tests/Object_Loader/Test_i.cpp b/TAO/tests/Object_Loader/Test_i.cpp index 5df62655307..d858a4a5bd0 100644 --- a/TAO/tests/Object_Loader/Test_i.cpp +++ b/TAO/tests/Object_Loader/Test_i.cpp @@ -10,13 +10,13 @@ Test_i::Test_i (PortableServer::POA_ptr poa) } CORBA::Long -Test_i::instance_count (void) +Test_i::instance_count () { return Test_i::instance_count_; } void -Test_i::destroy (void) +Test_i::destroy () { PortableServer::POA_var poa = this->_default_POA (); @@ -26,7 +26,7 @@ Test_i::destroy (void) } PortableServer::POA_ptr -Test_i::_default_POA (void) +Test_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/tests/Object_Loader/Test_i.h b/TAO/tests/Object_Loader/Test_i.h index 25007c7610a..58548678371 100644 --- a/TAO/tests/Object_Loader/Test_i.h +++ b/TAO/tests/Object_Loader/Test_i.h @@ -25,11 +25,11 @@ public: /// ctor Test_i (PortableServer::POA_ptr poa); - CORBA::Long instance_count (void); + CORBA::Long instance_count (); - void destroy (void); + void destroy (); - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); private: /// The default POA used for this object diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp index 027c3d6683b..6a53f680d96 100644 --- a/TAO/tests/Objref_Sequence_Test/server.cpp +++ b/TAO/tests/Objref_Sequence_Test/server.cpp @@ -17,7 +17,7 @@ public: void DeleteExtra (const ServerSequence &seq); //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); //FUZZ: enable check_for_lack_ACE_OS private: @@ -101,7 +101,7 @@ ServerServant::DeleteExtra (const ServerSequence &seq) } void -ServerServant::shutdown (void) +ServerServant::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/OctetSeq/test_i.cpp b/TAO/tests/OctetSeq/test_i.cpp index faae9d09299..b1beb06c758 100644 --- a/TAO/tests/OctetSeq/test_i.cpp +++ b/TAO/tests/OctetSeq/test_i.cpp @@ -6,7 +6,7 @@ #include "test_i.inl" #endif /* __ACE_INLINE__ */ -Database_i::~Database_i (void) +Database_i::~Database_i () { delete[] this->elements_; } @@ -63,7 +63,7 @@ Database_i::get_crc (Test::Index i) } void -Database_i::shutdown (void) +Database_i::shutdown () { this->orb_->shutdown (); } diff --git a/TAO/tests/OctetSeq/test_i.h b/TAO/tests/OctetSeq/test_i.h index cfa06030369..49ccb8b14ed 100644 --- a/TAO/tests/OctetSeq/test_i.h +++ b/TAO/tests/OctetSeq/test_i.h @@ -26,7 +26,7 @@ public: Test::Index max_range); /// dtor - ~Database_i (void); + ~Database_i (); // = The Simple_Server methods. void set (Test::Index i, @@ -38,7 +38,7 @@ public: CORBA::ULong get_crc (Test::Index i); - void shutdown (void); + void shutdown (); private: /// The ORB pointer diff --git a/TAO/tests/Ondemand_Write/Hello.cpp b/TAO/tests/Ondemand_Write/Hello.cpp index 5509c723b4c..4d5856ce485 100644 --- a/TAO/tests/Ondemand_Write/Hello.cpp +++ b/TAO/tests/Ondemand_Write/Hello.cpp @@ -16,7 +16,7 @@ Hello::get_string ( } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Ondemand_Write/Hello.h b/TAO/tests/Ondemand_Write/Hello.h index 3cee6eba223..a8231962e86 100644 --- a/TAO/tests/Ondemand_Write/Hello.h +++ b/TAO/tests/Ondemand_Write/Hello.h @@ -20,7 +20,7 @@ public: ::CORBA::Long valueb, const char * inputb); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp index 787b2ab6caa..b2532a87e20 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.cpp @@ -14,18 +14,18 @@ Oneway_Buffering::receive_data (const Test::Payload &the_payload) } void -Oneway_Buffering::flush (void) +Oneway_Buffering::flush () { } void -Oneway_Buffering::sync (void) +Oneway_Buffering::sync () { this->admin_->flush (); } void -Oneway_Buffering::shutdown (void) +Oneway_Buffering::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h index e0a2593a1e2..4869811be8e 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.h +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.h @@ -17,11 +17,11 @@ public: // = The skeleton methods virtual void receive_data (const Test::Payload &the_payload); - virtual void flush (void); + virtual void flush (); - virtual void sync (void); + virtual void sync (); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to shutdown the application. diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp index 30685f48631..b91d0dce11f 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.cpp @@ -45,12 +45,12 @@ Oneway_Buffering_Admin::request_received (CORBA::ULong payload_length) } void -Oneway_Buffering_Admin::flush (void) +Oneway_Buffering_Admin::flush () { } void -Oneway_Buffering_Admin::shutdown (void) +Oneway_Buffering_Admin::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h index 8942925272f..70f71c799cf 100644 --- a/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h +++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering_Admin.h @@ -20,9 +20,9 @@ public: virtual void request_received (CORBA::ULong payload_length); - virtual void flush (void); + virtual void flush (); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to shutdown the application. diff --git a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp index 4e00819f0f5..ac119dcc052 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.cpp @@ -15,7 +15,7 @@ Client_Task::Client_Task (Test::Sender_ptr reply_gen, } int -Client_Task::svc (void) +Client_Task::svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); diff --git a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h index 838aee7e9e7..fa2065ae72b 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Client_Task.h @@ -22,7 +22,7 @@ public: Receiver_i * receiver_impl); /// Thread entry point - int svc (void); + int svc (); private: /// Reference to the test interface diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp index fff3f2968f8..c995acf9084 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.cpp @@ -10,12 +10,12 @@ Receiver_i::Receiver_i (CORBA::ORB_ptr orb, { } -Receiver_i::~Receiver_i (void) +Receiver_i::~Receiver_i () { } CORBA::Long -Receiver_i::receive_call (void) +Receiver_i::receive_call () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Doing a ping...\n")); @@ -32,7 +32,7 @@ Receiver_i::get_call_count ( /**/) } void -Receiver_i::shutdown (void) +Receiver_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) About to invoke shutdown...\n")); diff --git a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h index 111bf6147bd..1e5f30c10dd 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Receiver_i.h @@ -27,15 +27,15 @@ public: CORBA::ULong iter); ///Destructor - virtual ~Receiver_i (void); + virtual ~Receiver_i (); // = The skeleton methods - virtual CORBA::Long receive_call (void); + virtual CORBA::Long receive_call (); /// Retun the number of calls that every thread would make... - virtual CORBA::Long get_call_count (void); + virtual CORBA::Long get_call_count (); - virtual void shutdown (void); + virtual void shutdown (); /// Number of calls processed so far.. CORBA::ULong no_calls_; diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp index 3322734f790..ffba37e322f 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.cpp @@ -8,7 +8,7 @@ Sender_i::Sender_i (CORBA::ORB_ptr orb, { } -Sender_i::~Sender_i (void) +Sender_i::~Sender_i () { } @@ -45,7 +45,7 @@ Sender_i::ping ( /**/) } void -Sender_i::shutdown (void) +Sender_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) About to invoke shutdown...\n")); diff --git a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h index 2c045a7d8bd..ba0f87bbdfa 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Sender_i.h @@ -27,16 +27,16 @@ public: CORBA::ULong no); ///Destructor - virtual ~Sender_i (void); + virtual ~Sender_i (); // = The skeleton methods virtual void active_objects (CORBA::Short ao); virtual void send_ready_message (Test::Receiver_ptr receiver); - virtual void ping (void); + virtual void ping (); - virtual void shutdown (void); + virtual void shutdown (); private: /// Our local ORB ptr diff --git a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp index 86260515097..782e097b9a4 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp +++ b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.cpp @@ -9,7 +9,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb, } int -Server_Task::svc (void) +Server_Task::svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n")); try diff --git a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.h b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.h index b00eef99fbf..48fdbd39930 100644 --- a/TAO/tests/Oneways_Invoking_Twoways/Server_Task.h +++ b/TAO/tests/Oneways_Invoking_Twoways/Server_Task.h @@ -19,7 +19,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Reference to the ORB diff --git a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp index 6035eafe86f..68139aea534 100644 --- a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp +++ b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.cpp @@ -11,7 +11,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb) { } -ServantLocator::~ServantLocator (void) +ServantLocator::~ServantLocator () { } diff --git a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h index 38caae26934..eef4dec7c8f 100644 --- a/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h +++ b/TAO/tests/POA/Bug_1592_Regression/ServantLocator.h @@ -62,7 +62,7 @@ public: bool error_status_; protected: /// Destructor. - ~ServantLocator (void); + ~ServantLocator (); private: /// Pseudo-reference to the ORB. diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp index 11972183323..1e5fe385f82 100644 --- a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp +++ b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.cpp @@ -2,7 +2,7 @@ #include "tao/ORB_Constants.h" #include "Server_Request_Interceptor.h" -Server_ORBInitializer::Server_ORBInitializer (void) +Server_ORBInitializer::Server_ORBInitializer () { } diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h index 15846c31dd9..01220953a95 100644 --- a/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h +++ b/TAO/tests/POA/Bug_1592_Regression/Server_ORBInitializer.h @@ -36,7 +36,7 @@ class Server_ORBInitializer : { public: /// Constructor. - Server_ORBInitializer (void); + Server_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp index 8a9a3a32d87..6c6975dad68 100644 --- a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp +++ b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.cpp @@ -5,22 +5,22 @@ CORBA::Boolean receive_request_called = 0; CORBA::Boolean ending_interception_point_called = 0; -Server_Request_Interceptor::Server_Request_Interceptor (void) +Server_Request_Interceptor::Server_Request_Interceptor () { } -Server_Request_Interceptor::~Server_Request_Interceptor (void) +Server_Request_Interceptor::~Server_Request_Interceptor () { } char * -Server_Request_Interceptor::name (void) +Server_Request_Interceptor::name () { return CORBA::string_dup (""); // Anonymous } void -Server_Request_Interceptor::destroy (void) +Server_Request_Interceptor::destroy () { } diff --git a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h index df2471c7a8f..d75c1105ebe 100644 --- a/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h +++ b/TAO/tests/POA/Bug_1592_Regression/Server_Request_Interceptor.h @@ -43,7 +43,7 @@ class Server_Request_Interceptor { public: /// Constructor. - Server_Request_Interceptor (void); + Server_Request_Interceptor (); /** * @name Methods Required by the Server Request Interceptor @@ -55,9 +55,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); @@ -77,7 +77,7 @@ public: protected: /// Destructor. - ~Server_Request_Interceptor (void); + ~Server_Request_Interceptor (); }; #if defined(_MSC_VER) diff --git a/TAO/tests/POA/Bug_1592_Regression/test_i.cpp b/TAO/tests/POA/Bug_1592_Regression/test_i.cpp index c5df0e47b0c..ebc4ceb0c8d 100644 --- a/TAO/tests/POA/Bug_1592_Regression/test_i.cpp +++ b/TAO/tests/POA/Bug_1592_Regression/test_i.cpp @@ -7,12 +7,12 @@ test_i::test_i (CORBA::ORB_ptr orb) { } -test_i::~test_i (void) +test_i::~test_i () { } void -test_i::op (void) +test_i::op () { // PortableInterceptor::ServerRequestInterceptor::receive_request() // should have been invoked. @@ -28,7 +28,7 @@ test_i::op (void) } void -test_i::shutdown (void) +test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/POA/Bug_1592_Regression/test_i.h b/TAO/tests/POA/Bug_1592_Regression/test_i.h index 215f5fc1fa3..bab87491665 100644 --- a/TAO/tests/POA/Bug_1592_Regression/test_i.h +++ b/TAO/tests/POA/Bug_1592_Regression/test_i.h @@ -30,14 +30,14 @@ public: /// Constructor. test_i (CORBA::ORB_ptr orb); - virtual void op (void); + virtual void op (); /// Shutdown the ORB. - virtual void shutdown (void); + virtual void shutdown (); protected: /// Destructor. - ~test_i (void); + ~test_i (); private: /// Pseudo-reference to the ORB. diff --git a/TAO/tests/POA/Bug_2511_Regression/server.cpp b/TAO/tests/POA/Bug_2511_Regression/server.cpp index 7c406cdb756..40efbd8d9b2 100644 --- a/TAO/tests/POA/Bug_2511_Regression/server.cpp +++ b/TAO/tests/POA/Bug_2511_Regression/server.cpp @@ -24,11 +24,11 @@ class test_i : public: test_i (PortableServer::POA_ptr poa); - void normal (void); + void normal (); - void exceptional (void); + void exceptional (); - void notexisting (void); + void notexisting (); PortableServer::POA_var poa_; }; @@ -39,19 +39,19 @@ test_i::test_i (PortableServer::POA_ptr poa) } void -test_i::normal (void) +test_i::normal () { ACE_DEBUG ((LM_DEBUG, "executing normal\n")); } void -test_i::exceptional (void) +test_i::exceptional () { ACE_DEBUG ((LM_DEBUG, "executing exceptional\n")); } void -test_i::notexisting (void) +test_i::notexisting () { ACE_DEBUG ((LM_DEBUG, "executing notexisting\n")); } diff --git a/TAO/tests/POA/DSI/Database_i.cpp b/TAO/tests/POA/DSI/Database_i.cpp index 6b784f888bb..ffde543eed5 100644 --- a/TAO/tests/POA/DSI/Database_i.cpp +++ b/TAO/tests/POA/DSI/Database_i.cpp @@ -6,12 +6,12 @@ #include "tao/AnyTypeCode/TypeCode.h" #include "ace/Null_Mutex.h" -DatabaseImpl::Simpler_Database_Malloc::Simpler_Database_Malloc (void) +DatabaseImpl::Simpler_Database_Malloc::Simpler_Database_Malloc () // : DATABASE_MALLOC () { } -DatabaseImpl::Simpler_Database_Malloc::~Simpler_Database_Malloc (void) +DatabaseImpl::Simpler_Database_Malloc::~Simpler_Database_Malloc () { this->remove (); } @@ -30,7 +30,7 @@ DatabaseImpl::Entry::Entry (CORBA::ORB_ptr orb, PortableServer::Current::_narrow (obj.in ()); } -DatabaseImpl::Entry::~Entry (void) +DatabaseImpl::Entry::~Entry () { } @@ -106,7 +106,7 @@ DatabaseImpl::Entry::_primary_interface (const PortableServer::ObjectId &/*oid*/ } PortableServer::POA_ptr -DatabaseImpl::Entry::_default_POA (void) +DatabaseImpl::Entry::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -121,7 +121,7 @@ DatabaseImpl::Agent::Agent (CORBA::ORB_ptr orb, this->poa_->set_servant (&this->common_servant_); } -DatabaseImpl::Agent::~Agent (void) +DatabaseImpl::Agent::~Agent () { } @@ -261,13 +261,13 @@ DatabaseImpl::Agent::destroy_entry (const char *key, } void -DatabaseImpl::Agent::shutdown (void) +DatabaseImpl::Agent::shutdown () { this->orb_->shutdown (); } PortableServer::POA_ptr -DatabaseImpl::Agent::_default_POA (void) +DatabaseImpl::Agent::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -303,7 +303,7 @@ DatabaseImpl::Employee::Employee (const char* name, this->name (name); } -DatabaseImpl::Employee::~Employee (void) +DatabaseImpl::Employee::~Employee () { DATABASE::instance ()->free (this->name_); } diff --git a/TAO/tests/POA/DSI/Database_i.h b/TAO/tests/POA/DSI/Database_i.h index 93623274c11..a097500c96c 100644 --- a/TAO/tests/POA/DSI/Database_i.h +++ b/TAO/tests/POA/DSI/Database_i.h @@ -20,8 +20,8 @@ public: class Simpler_Database_Malloc : public DATABASE_MALLOC { public: - Simpler_Database_Malloc (void); - ~Simpler_Database_Malloc (void); + Simpler_Database_Malloc (); + ~Simpler_Database_Malloc (); }; typedef ACE_Singleton<Simpler_Database_Malloc, ACE_Null_Mutex> DATABASE; @@ -33,7 +33,7 @@ public: public: Entry (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - ~Entry (void); + ~Entry (); virtual void invoke (CORBA::ServerRequest_ptr request); // The invoke() method receives requests issued to any CORBA @@ -46,7 +46,7 @@ public: // a POA_ptr as input parameters and returns a valid RepositoryId // representing the most-derived interface for that oid. - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); // Returns the default POA for this servant. virtual void is_a (CORBA::ServerRequest_ptr request); @@ -68,7 +68,7 @@ public: public: Agent (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - ~Agent (void); + ~Agent (); virtual Database::Entry_ptr create_entry (const char *key, const char *entry_type, @@ -80,9 +80,9 @@ public: virtual void destroy_entry (const char *key, const char *entry_type); - virtual void shutdown (void); + virtual void shutdown (); - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); // Returns the default POA for this servant. protected: diff --git a/TAO/tests/POA/DSI/client.cpp b/TAO/tests/POA/DSI/client.cpp index fb704e0fde3..589b90aa958 100644 --- a/TAO/tests/POA/DSI/client.cpp +++ b/TAO/tests/POA/DSI/client.cpp @@ -64,7 +64,7 @@ parse_args (int argc, ACE_TCHAR **argv) } int -read_IOR_from_file (void) +read_IOR_from_file () { // Open the file for reading. ACE_HANDLE f_handle = diff --git a/TAO/tests/POA/Deactivate_Object/Hello.cpp b/TAO/tests/POA/Deactivate_Object/Hello.cpp index 1f1a0cbf0a9..465a1bb2de4 100644 --- a/TAO/tests/POA/Deactivate_Object/Hello.cpp +++ b/TAO/tests/POA/Deactivate_Object/Hello.cpp @@ -6,7 +6,7 @@ Hello::Hello (CORBA::ORB_ptr orb) } char * -Hello::get_string (void) +Hello::get_string () { return CORBA::string_dup ("Hello there!"); } diff --git a/TAO/tests/POA/Deactivate_Object/Hello.h b/TAO/tests/POA/Deactivate_Object/Hello.h index f802f09dd1d..05cf2daf9bf 100644 --- a/TAO/tests/POA/Deactivate_Object/Hello.h +++ b/TAO/tests/POA/Deactivate_Object/Hello.h @@ -14,7 +14,7 @@ public: Hello (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void); + virtual char * get_string (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/POA/Default_Servant2/File_i.cpp b/TAO/tests/POA/Default_Servant2/File_i.cpp index 141af0dbd9e..dfdc1f3496b 100644 --- a/TAO/tests/POA/Default_Servant2/File_i.cpp +++ b/TAO/tests/POA/Default_Servant2/File_i.cpp @@ -29,12 +29,12 @@ FileImpl::System::System (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa) poa->set_servant (&this->fd_servant_); } -FileImpl::System::~System (void) +FileImpl::System::~System () { } PortableServer::POA_ptr -FileImpl::System::_default_POA (void) +FileImpl::System::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -79,7 +79,7 @@ FileImpl::System::open (const char *file_name, } void -FileImpl::System::shutdown (void) +FileImpl::System::shutdown () { this->orb_->shutdown (false); } @@ -90,19 +90,19 @@ FileImpl::Descriptor::Descriptor (PortableServer::POA_ptr poa) { } -FileImpl::Descriptor::~Descriptor (void) +FileImpl::Descriptor::~Descriptor () { } PortableServer::POA_ptr -FileImpl::Descriptor::_default_POA (void) +FileImpl::Descriptor::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } //Extracts the ACE_HANDLE from the passed object reference ACE_HANDLE -FileImpl::Descriptor::fd (void) +FileImpl::Descriptor::fd () { // // One way of getting our id. @@ -202,7 +202,7 @@ FileImpl::Descriptor::lseek (CORBA::ULong offset, } void -FileImpl::Descriptor::destroy (void) +FileImpl::Descriptor::destroy () { // Get the ACE_HANDLE for this object reference ACE_HANDLE file_descriptor = this->fd (); diff --git a/TAO/tests/POA/Default_Servant2/File_i.h b/TAO/tests/POA/Default_Servant2/File_i.h index df1e8a47aa9..5a2faf71ea3 100644 --- a/TAO/tests/POA/Default_Servant2/File_i.h +++ b/TAO/tests/POA/Default_Servant2/File_i.h @@ -35,10 +35,10 @@ public: Descriptor (PortableServer::POA_ptr poa); /// Destructor - ~Descriptor (void); + ~Descriptor (); /// Returns the default POA of this object - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); /// write buffer to File corresponding to this Descriptor virtual CORBA::Long write (const File::Descriptor::DataBuffer &buffer); @@ -50,11 +50,11 @@ public: CORBA::Long whence); /// closes the file corresponding to the requested ObjectID - virtual void destroy (void); + virtual void destroy (); private: /// Extracts the ACE_HANDLE from the objectID - ACE_HANDLE fd (void); + ACE_HANDLE fd (); PortableServer::POA_var poa_; }; @@ -73,17 +73,17 @@ public: PortableServer::POA_ptr poa); ///Destructor - ~System (void); + ~System (); ///Returns the default POA of this object - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); /// Opens a file ,creates a Descriptor reference with the /// ACE_HANDLE and returns that reference File::Descriptor_ptr open (const char *file_name, CORBA::Long flags); - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/POA/EndpointPolicy/Hello.cpp b/TAO/tests/POA/EndpointPolicy/Hello.cpp index 0d000b9f195..bdfcac050fb 100644 --- a/TAO/tests/POA/EndpointPolicy/Hello.cpp +++ b/TAO/tests/POA/EndpointPolicy/Hello.cpp @@ -6,13 +6,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/tests/POA/EndpointPolicy/Hello.h b/TAO/tests/POA/EndpointPolicy/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/POA/EndpointPolicy/Hello.h +++ b/TAO/tests/POA/EndpointPolicy/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/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp index 524539b0e89..66b3a05fd9a 100644 --- a/TAO/tests/POA/Etherealization/Etherealization.cpp +++ b/TAO/tests/POA/Etherealization/Etherealization.cpp @@ -22,7 +22,7 @@ public: { } - ~test_i (void) + ~test_i () { ACE_DEBUG ((LM_DEBUG, "~test_i called\n")); } @@ -32,11 +32,11 @@ class test_i_with_reference_counting : public virtual POA_test { public: - void method (void) + void method () { } - ~test_i_with_reference_counting (void) + ~test_i_with_reference_counting () { ACE_DEBUG ((LM_DEBUG, "~test_i_with_reference_counting called\n")); } diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp index 2f82d6b08ac..49e25f17d4b 100644 --- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp +++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp @@ -18,9 +18,9 @@ class test_i : public POA_test { public: - void deactivate_self (void); + void deactivate_self (); - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); PortableServer::POA_var poa_; @@ -34,7 +34,7 @@ test_i::_default_POA ( /**/) } void -test_i::deactivate_self (void) +test_i::deactivate_self () { this->poa_->deactivate_object (this->id_); diff --git a/TAO/tests/POA/Forwarding/Servant_Activator.cpp b/TAO/tests/POA/Forwarding/Servant_Activator.cpp index 51be53d4109..2c107d09894 100644 --- a/TAO/tests/POA/Forwarding/Servant_Activator.cpp +++ b/TAO/tests/POA/Forwarding/Servant_Activator.cpp @@ -29,7 +29,7 @@ ServantActivator::etherealize (const PortableServer::ObjectId &, } void -ServantActivator::forward_requests (void) +ServantActivator::forward_requests () { if (CORBA::is_nil (this->forward_to_.in ())) throw test::Cannot_Forward (); diff --git a/TAO/tests/POA/Forwarding/Servant_Activator.h b/TAO/tests/POA/Forwarding/Servant_Activator.h index d5e18a9e2f6..5c6414e12af 100644 --- a/TAO/tests/POA/Forwarding/Servant_Activator.h +++ b/TAO/tests/POA/Forwarding/Servant_Activator.h @@ -41,7 +41,7 @@ public: CORBA::Boolean remaining_activations); /// Object should be forwarded from now on. - void forward_requests (void); + void forward_requests (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/POA/Forwarding/test_i.cpp b/TAO/tests/POA/Forwarding/test_i.cpp index 23134929959..dd47e8a2326 100644 --- a/TAO/tests/POA/Forwarding/test_i.cpp +++ b/TAO/tests/POA/Forwarding/test_i.cpp @@ -14,13 +14,13 @@ test_i::test_i (CORBA::ORB_ptr orb, } CORBA::Long -test_i::doit (void) +test_i::doit () { return this->value_++; } void -test_i::forward (void) +test_i::forward () { this->activator_.forward_requests (); @@ -32,13 +32,13 @@ test_i::forward (void) void -test_i::shutdown (void) +test_i::shutdown () { this->orb_->shutdown (false); } PortableServer::POA_ptr -test_i::_default_POA (void) +test_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/tests/POA/Forwarding/test_i.h b/TAO/tests/POA/Forwarding/test_i.h index 65d96ac8ce3..8098fd029fa 100644 --- a/TAO/tests/POA/Forwarding/test_i.h +++ b/TAO/tests/POA/Forwarding/test_i.h @@ -22,15 +22,15 @@ public: ServantActivator &activator, CORBA::Long value); - virtual CORBA::Long doit (void); + virtual CORBA::Long doit (); // Setup forwarding - virtual void forward (void); + virtual void forward (); - virtual void shutdown (void); + virtual void shutdown (); /// Returns the default POA for this servant. - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); protected: CORBA::ORB_var orb_; diff --git a/TAO/tests/POA/Generic_Servant/test_i.cpp b/TAO/tests/POA/Generic_Servant/test_i.cpp index 01a1c126ffa..bc4a01965df 100644 --- a/TAO/tests/POA/Generic_Servant/test_i.cpp +++ b/TAO/tests/POA/Generic_Servant/test_i.cpp @@ -11,18 +11,18 @@ test_i::test_i (CORBA::ORB_ptr orb, } PortableServer::POA_ptr -test_i::_default_POA (void) +test_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } void -test_i::method (void) +test_i::method () { } void -test_i::oneway_method (void) +test_i::oneway_method () { } @@ -57,7 +57,7 @@ test_i::timed_oneway_method (CORBA::ULong timeout) } void -test_i::shutdown (void) +test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/POA/Generic_Servant/test_i.h b/TAO/tests/POA/Generic_Servant/test_i.h index 85e4a2d6d06..2a41e38bf17 100644 --- a/TAO/tests/POA/Generic_Servant/test_i.h +++ b/TAO/tests/POA/Generic_Servant/test_i.h @@ -19,13 +19,13 @@ public: PortableServer::POA_ptr poa); /// Returns the Default POA of this servant - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); /// A twoway operation. - void method (void); + void method (); /// A oneway operation. - void oneway_method (void); + void oneway_method (); /// A timed twoway operation. void timed_method (CORBA::ULong timeout); @@ -34,7 +34,7 @@ public: void timed_oneway_method (CORBA::ULong timeout); /// Shutdown the ORB - void shutdown (void); + void shutdown (); /// Sleep for some time. void sleep (CORBA::ULong timeout, diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp index 5755fb27a36..4f386626926 100644 --- a/TAO/tests/POA/Identity/Identity.cpp +++ b/TAO/tests/POA/Identity/Identity.cpp @@ -23,7 +23,7 @@ public: { } - PortableServer::POA_ptr _default_POA (void) + PortableServer::POA_ptr _default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/tests/POA/Loader/Server_Manager.cpp b/TAO/tests/POA/Loader/Server_Manager.cpp index c08515ff8ad..d349f30162c 100644 --- a/TAO/tests/POA/Loader/Server_Manager.cpp +++ b/TAO/tests/POA/Loader/Server_Manager.cpp @@ -2,13 +2,13 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -Server_i::Server_i (void) +Server_i::Server_i () : ior_output_file_ (0), policies_ (4) { } -Server_i::~Server_i (void) +Server_i::~Server_i () { delete this->servant_activator_; delete this->servant_locator_; @@ -302,7 +302,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa) // The execution process of the server. int -Server_i::run (void) +Server_i::run () { try { diff --git a/TAO/tests/POA/Loader/Server_Manager.h b/TAO/tests/POA/Loader/Server_Manager.h index 69901de9fef..fc8944a259f 100644 --- a/TAO/tests/POA/Loader/Server_Manager.h +++ b/TAO/tests/POA/Loader/Server_Manager.h @@ -31,10 +31,10 @@ class Server_i { public: /// Initialisation. - Server_i (void); + Server_i (); /// Destruction. - ~Server_i (void); + ~Server_i (); /// Initialisation of the ORB and poa. int init (int argc, ACE_TCHAR **argv); @@ -56,7 +56,7 @@ public: int create_locator (PortableServer::POA_var second_poa); /// The server is executed. - int run (void); + int run (); private: /// Parses the input arguments. diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp index 85ccbdeda82..5f562c6fab7 100644 --- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp +++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp @@ -23,7 +23,7 @@ class test_i : public: test_i (PortableServer::POA_ptr poa); - void method (void); + void method (); PortableServer::POA_var poa_; }; @@ -34,7 +34,7 @@ test_i::test_i (PortableServer::POA_ptr poa) } void -test_i::method (void) +test_i::method () { } @@ -43,7 +43,7 @@ class Task : public ACE_Task_Base public: void object (test_ptr test); - int svc (void); + int svc (); test_var test_; @@ -59,7 +59,7 @@ Task::object (test_ptr test) } int -Task::svc (void) +Task::svc () { this->test_->method (); this->test_ = diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp index b2280398638..74c4a3797d3 100644 --- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp +++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp @@ -22,9 +22,9 @@ class test_i : public: test_i (PortableServer::POA_ptr poa); - ~test_i (void); + ~test_i (); - void method (void); + void method (); PortableServer::POA_var poa_; }; @@ -37,7 +37,7 @@ test_i::test_i (PortableServer::POA_ptr poa) this)); } -test_i::~test_i (void) +test_i::~test_i () { ACE_DEBUG ((LM_DEBUG, "test_i destroyed: instance %x\n", @@ -45,7 +45,7 @@ test_i::~test_i (void) } void -test_i::method (void) +test_i::method () { } @@ -55,7 +55,7 @@ public: Object_Activator (ACE_Thread_Manager &thread_manager, PortableServer::POA_ptr poa); - int svc (void); + int svc (); ACE_Auto_Event object_activated_; @@ -71,7 +71,7 @@ Object_Activator::Object_Activator (ACE_Thread_Manager &thread_manager, } int -Object_Activator::svc (void) +Object_Activator::svc () { try { diff --git a/TAO/tests/POA/Non_Retain_System_Id/test.cpp b/TAO/tests/POA/Non_Retain_System_Id/test.cpp index 301e8aaef1d..7a22cc244e7 100644 --- a/TAO/tests/POA/Non_Retain_System_Id/test.cpp +++ b/TAO/tests/POA/Non_Retain_System_Id/test.cpp @@ -20,7 +20,7 @@ class ID_Check_i : public POA_ID_Check { public: ID_Check_i (int num); - ~ID_Check_i (void); + ~ID_Check_i (); void set_id (int index, PortableServer::ObjectId_var oid); @@ -46,7 +46,7 @@ ID_Check_i::ID_Check_i (int num) oids_ = new PortableServer::ObjectId_var[num]; } -ID_Check_i::~ID_Check_i (void) +ID_Check_i::~ID_Check_i () { delete [] oids_; } diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp index f3958139f0c..3e8eb181281 100644 --- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp +++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp @@ -21,7 +21,7 @@ class test_i : public: test_i (test_i *other); - ~test_i (void); + ~test_i (); test_i *other_; }; @@ -31,7 +31,7 @@ test_i::test_i (test_i *other) { } -test_i::~test_i (void) +test_i::~test_i () { ACE_DEBUG ((LM_DEBUG, "(%t) test_i::~test_i\n")); diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp index 4303b2aa470..30e7e8ea7e8 100644 --- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp +++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp @@ -50,7 +50,7 @@ class test_i : public POA_test public: test_i (ACE_Auto_Event &event); - void deactivate_self (void); + void deactivate_self (); private: ACE_Auto_Event &event_; @@ -62,7 +62,7 @@ test_i::test_i (ACE_Auto_Event &event) } void -test_i::deactivate_self (void) +test_i::deactivate_self () { PortableServer::POA_var poa = this->_default_POA (); @@ -95,7 +95,7 @@ public: PortableServer::Servant servant, const ACE_CString &task_id, const PortableServer::ObjectId &id); - int svc (void); + int svc (); private: test_var test_; @@ -122,7 +122,7 @@ Activator::Activator (test_ptr t, } int -Activator::svc (void) +Activator::svc () { if (debug) ACE_DEBUG ((LM_DEBUG, "(%t) Waiting for deactivation to complete\n")); @@ -162,7 +162,7 @@ class Deactivator : public ACE_Task_Base { public: Deactivator (test_ptr t); - int svc (void); + int svc (); private: test_var test_; @@ -174,7 +174,7 @@ Deactivator::Deactivator (test_ptr t) } int -Deactivator::svc (void) +Deactivator::svc () { try { diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp index a5658c56d49..c016fbdee32 100644 --- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp +++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.cpp @@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { int status = 0; try diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h index a57c7bee437..abb02ea2152 100644 --- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h +++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Client_Task.h @@ -21,7 +21,7 @@ public: CORBA::Boolean exception); /// Thread entry point - int svc (void); + int svc (); private: const ACE_TCHAR *input_; diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp index da78afe52c6..6f3c5e42c98 100644 --- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp +++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.cpp @@ -43,7 +43,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output, } int -Server_Task::svc (void) +Server_Task::svc () { try { diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h index cea47faeb95..9f6a4ffa912 100644 --- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h +++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/Server_Task.h @@ -27,7 +27,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Output file for IOR diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp index 81d081c8b6b..067f1780165 100644 --- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp +++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.cpp @@ -13,12 +13,12 @@ test_i::test_i (CORBA::ORB_ptr orb, } void -test_i::method (void) +test_i::method () { } char * -test_i::get_string (void) +test_i::get_string () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Upcall in process ..\n")); diff --git a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.h b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.h index 685c5de2b5f..33dabade22b 100644 --- a/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.h +++ b/TAO/tests/POA/On_Demand_Act_Direct_Coll/test_i.h @@ -20,11 +20,11 @@ public: ACE_thread_t thr_id); /// A twoway operation. - void method (void); + void method (); /// A twoway operation. char * - get_string (void); + get_string (); protected: /// Our ORB. diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp index 130b92172bd..74191316e78 100644 --- a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp +++ b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.cpp @@ -21,7 +21,7 @@ ServantManager_i::ServantManager_i (CORBA::ORB_ptr orb) } // Destruction. -ServantManager_i::~ServantManager_i (void) +ServantManager_i::~ServantManager_i () { } diff --git a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h index 16b8cdb3228..8aca1431706 100644 --- a/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h +++ b/TAO/tests/POA/On_Demand_Loading/Servant_Manager.h @@ -48,7 +48,7 @@ public: ServantManager_i (CORBA::ORB_ptr orb); /// Destruction. - ~ServantManager_i (void); + ~ServantManager_i (); /** * Returns an ObjectId when given an DLL name and the factory method diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp index 897aab72173..45f5412c753 100644 --- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp +++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.cpp @@ -2,7 +2,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" -Server_i::Server_i(void) +Server_i::Server_i() : ior_output_file_ (0), policies_ (4), servant_activator_impl_ (0), @@ -10,7 +10,7 @@ Server_i::Server_i(void) { } -Server_i::~Server_i(void) +Server_i::~Server_i() { delete servant_activator_impl_; delete servant_locator_impl_; @@ -299,7 +299,7 @@ Server_i::create_locator (PortableServer::POA_var second_poa) // The execution process of the server. int -Server_i::run (void) +Server_i::run () { try { diff --git a/TAO/tests/POA/On_Demand_Loading/Server_Manager.h b/TAO/tests/POA/On_Demand_Loading/Server_Manager.h index da3c669f680..3d0500d647c 100644 --- a/TAO/tests/POA/On_Demand_Loading/Server_Manager.h +++ b/TAO/tests/POA/On_Demand_Loading/Server_Manager.h @@ -30,10 +30,10 @@ class Server_i { public: /// Initialisation. - Server_i (void); + Server_i (); /// Destruction. - ~Server_i (void); + ~Server_i (); /// Initialisation of the ORB and poa. int init (int argc, ACE_TCHAR **argv); @@ -55,7 +55,7 @@ public: int create_locator (PortableServer::POA_var second_poa); /// The server is executed. - int run (void); + int run (); private: /// Parses the input arguments. diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp index 433e84c9c72..614d5b21089 100644 --- a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp +++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp @@ -16,11 +16,11 @@ class test_i : public POA_test { public: - void destroy_poa (void); + void destroy_poa (); }; void -test_i::destroy_poa (void) +test_i::destroy_poa () { PortableServer::POA_var poa = this->_default_POA (); diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp index 551ea4575c0..06ba954cf45 100644 --- a/TAO/tests/POA/Persistent_ID/server.cpp +++ b/TAO/tests/POA/Persistent_ID/server.cpp @@ -23,17 +23,17 @@ public: test_i (CORBA::ORB_ptr orb_ptr, PortableServer::POA_ptr poa); - void method (void); + void method (); //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); - test_ptr create_POA (void); + test_ptr create_POA (); - void destroy_POA (void); + void destroy_POA (); - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); protected: CORBA::ORB_var orb_; @@ -50,7 +50,7 @@ test_i::test_i (CORBA::ORB_ptr orb, } void -test_i::method (void) +test_i::method () { CORBA::Object_var obj = this->orb_->resolve_initial_references ("POACurrent"); @@ -70,19 +70,19 @@ test_i::method (void) } void -test_i::shutdown (void) +test_i::shutdown () { this->orb_->shutdown (false); } PortableServer::POA_ptr -test_i::_default_POA (void) +test_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } test_ptr -test_i::create_POA (void) +test_i::create_POA () { CORBA::PolicyList policies (2); policies.length (2); @@ -137,7 +137,7 @@ test_i::create_POA (void) } void -test_i::destroy_POA (void) +test_i::destroy_POA () { this->child_poa_->destroy (1, 0); } diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp index d86e66c9e3f..c9b0dfd8d59 100644 --- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp +++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp @@ -22,9 +22,9 @@ class test_i : public virtual POA_test public: test_i (PortableServer::POA_ptr poa); - void method (void); + void method (); - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); private: PortableServer::POA_var poa_; @@ -38,7 +38,7 @@ test_i::test_i (PortableServer::POA_ptr poa) } void -test_i::method (void) +test_i::method () { ACE_DEBUG ((LM_DEBUG, "Entering Worker::svc from %t and sleeping....\n")); @@ -67,7 +67,7 @@ test_i::method (void) } PortableServer::POA_ptr -test_i::_default_POA (void) +test_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -76,7 +76,7 @@ class Worker : public ACE_Task_Base { public: Worker (test_ptr t); - int svc (void); + int svc (); private: test_var test_; @@ -88,7 +88,7 @@ Worker::Worker (test_ptr t) } int -Worker::svc (void) +Worker::svc () { try { diff --git a/TAO/tests/POA/TIE/test_i.cpp b/TAO/tests/POA/TIE/test_i.cpp index 4e10342787f..2e4df217e53 100644 --- a/TAO/tests/POA/TIE/test_i.cpp +++ b/TAO/tests/POA/TIE/test_i.cpp @@ -19,13 +19,13 @@ Tie_i::Tie_i (CORBA::Long value) } // Destructor -Tie_i::~Tie_i (void) +Tie_i::~Tie_i () { } // Return this->value CORBA::Long -Tie_i::doit (void) +Tie_i::doit () { return this->value_; } @@ -40,14 +40,14 @@ A_i::A_i (CORBA::Long value, // Return this->value CORBA::Long -A_i::doit (void) +A_i::doit () { return this->value_; } // Return the Default POA of this Servant PortableServer::POA_ptr -A_i::_default_POA (void) +A_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -62,14 +62,14 @@ Outer_i::B_i::B_i (CORBA::Long value, // Return this->value CORBA::Long -Outer_i::B_i::doit (void) +Outer_i::B_i::doit () { return this->value_; } // Return the Default POA of this Servant PortableServer::POA_ptr -Outer_i::B_i::_default_POA (void) +Outer_i::B_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -84,14 +84,14 @@ Outer_i::Inner_i::C_i::C_i (CORBA::Long value, // Return this->value CORBA::Long -Outer_i::Inner_i::C_i::doit (void) +Outer_i::Inner_i::C_i::doit () { return this->value_; } // Return the Default POA of this Servant PortableServer::POA_ptr -Outer_i::Inner_i::C_i::_default_POA (void) +Outer_i::Inner_i::C_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/tests/POA/TIE/test_i.h b/TAO/tests/POA/TIE/test_i.h index 498d3620db1..0cdc235ffad 100644 --- a/TAO/tests/POA/TIE/test_i.h +++ b/TAO/tests/POA/TIE/test_i.h @@ -20,10 +20,10 @@ public: Tie_i (CORBA::Long value); /// Destructor. - virtual ~Tie_i (void); + virtual ~Tie_i (); // Simple doit method - virtual CORBA::Long doit (void); + virtual CORBA::Long doit (); protected: CORBA::Long value_; @@ -37,10 +37,10 @@ public: PortableServer::POA_ptr poa); // Simple doit method - virtual CORBA::Long doit (void); + virtual CORBA::Long doit (); // Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); protected: CORBA::Long value_; @@ -60,10 +60,10 @@ public: PortableServer::POA_ptr poa); // Simple doit method - virtual CORBA::Long doit (void); + virtual CORBA::Long doit (); // Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); protected: CORBA::Long value_; @@ -83,10 +83,10 @@ public: PortableServer::POA_ptr poa); // Simple doit method - virtual CORBA::Long doit (void); + virtual CORBA::Long doit (); // Returns the Default POA of this Servant object - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); protected: CORBA::Long value_; diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp index c93b7869de2..b538f64f982 100644 --- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp +++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp @@ -15,7 +15,7 @@ class test_i : public POA_test { public: - void destroy_poa (void); + void destroy_poa (); void test_poa (PortableServer::POA_ptr poa); @@ -29,7 +29,7 @@ test_i::test_poa (PortableServer::POA_ptr poa) } void -test_i::destroy_poa (void) +test_i::destroy_poa () { CORBA::Boolean etherealize_objects = 1; CORBA::Boolean wait_for_completion = 1; diff --git a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp index 17607898770..83e6ffe6929 100644 --- a/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp +++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.cpp @@ -6,13 +6,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/tests/Parallel_Connect_Strategy/Test_i.h b/TAO/tests/Parallel_Connect_Strategy/Test_i.h index 7bdf685ff97..0eff73b74dd 100644 --- a/TAO/tests/Parallel_Connect_Strategy/Test_i.h +++ b/TAO/tests/Parallel_Connect_Strategy/Test_i.h @@ -16,9 +16,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/tests/Param_Test/any.cpp b/TAO/tests/Param_Test/any.cpp index 5b596b6eb96..8f44fe95b87 100644 --- a/TAO/tests/Param_Test/any.cpp +++ b/TAO/tests/Param_Test/any.cpp @@ -20,14 +20,14 @@ size_t Test_Any::counter = 0; -Test_Any::Test_Any (void) +Test_Any::Test_Any () : opname_ (CORBA::string_dup ("test_any")), out_ (new CORBA::Any), ret_ (new CORBA::Any) { } -Test_Any::~Test_Any (void) +Test_Any::~Test_Any () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -99,7 +99,7 @@ Test_Any::init_parameters (Param_Test_ptr objref) } int -Test_Any::reset_parameters (void) +Test_Any::reset_parameters () { Generator *gen = GENERATOR::instance (); // value generator CORBA::ULong index = (counter++ % Test_Any::ANY_LAST_TEST_ITEM); @@ -273,7 +273,7 @@ Test_Any::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Any::check_validity (void) +Test_Any::check_validity () { CORBA::Short short_in, short_inout, short_out, short_ret; const char *str_in; @@ -462,6 +462,6 @@ Test_Any::check_validity (CORBA::Request_ptr /*req*/) } void -Test_Any::print_values (void) +Test_Any::print_values () { } diff --git a/TAO/tests/Param_Test/any.h b/TAO/tests/Param_Test/any.h index b0515dfb0ef..80183699b2e 100644 --- a/TAO/tests/Param_Test/any.h +++ b/TAO/tests/Param_Test/any.h @@ -22,10 +22,10 @@ class Test_Any { public: /// ctor - Test_Any (void); + Test_Any (); /// dtor - ~Test_Any (void); + ~Test_Any (); enum { @@ -51,16 +51,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/bd_array_seq.cpp b/TAO/tests/Param_Test/bd_array_seq.cpp index 8616f65d5e4..6cbb5664177 100644 --- a/TAO/tests/Param_Test/bd_array_seq.cpp +++ b/TAO/tests/Param_Test/bd_array_seq.cpp @@ -19,7 +19,7 @@ const CORBA::ULong MAX_ARRAYSEQ_LEN = 1; // Test_Bounded_Array_Sequence // ************************************************************************ -Test_Bounded_Array_Sequence::Test_Bounded_Array_Sequence (void) +Test_Bounded_Array_Sequence::Test_Bounded_Array_Sequence () : opname_ (CORBA::string_dup ("test_bounded_array_sequence")), inout_ (new Param_Test::Bounded_ArraySeq), out_ (new Param_Test::Bounded_ArraySeq), @@ -27,7 +27,7 @@ Test_Bounded_Array_Sequence::Test_Bounded_Array_Sequence (void) { } -Test_Bounded_Array_Sequence::~Test_Bounded_Array_Sequence (void) +Test_Bounded_Array_Sequence::~Test_Bounded_Array_Sequence () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -102,7 +102,7 @@ Test_Bounded_Array_Sequence::init_parameters (Param_Test_ptr) } int -Test_Bounded_Array_Sequence::reset_parameters (void) +Test_Bounded_Array_Sequence::reset_parameters () { // Delete the previous ones. this->inout_ = new Param_Test::Bounded_ArraySeq; @@ -133,7 +133,7 @@ Test_Bounded_Array_Sequence::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Bounded_Array_Sequence::check_validity (void) +Test_Bounded_Array_Sequence::check_validity () { if (this->compare (this->in_, this->inout_.in ()) && this->compare (this->in_, this->out_.in ()) && @@ -150,7 +150,7 @@ Test_Bounded_Array_Sequence::check_validity (CORBA::Request_ptr) } void -Test_Bounded_Array_Sequence::print_values (void) +Test_Bounded_Array_Sequence::print_values () { ACE_DEBUG ((LM_DEBUG, "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n" diff --git a/TAO/tests/Param_Test/bd_array_seq.h b/TAO/tests/Param_Test/bd_array_seq.h index aa65c023b62..12ebaefa8c0 100644 --- a/TAO/tests/Param_Test/bd_array_seq.h +++ b/TAO/tests/Param_Test/bd_array_seq.h @@ -23,10 +23,10 @@ class Test_Bounded_Array_Sequence { public: /// ctor - Test_Bounded_Array_Sequence (void); + Test_Bounded_Array_Sequence (); /// dtor - ~Test_Bounded_Array_Sequence (void); + ~Test_Bounded_Array_Sequence (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -38,16 +38,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/bd_long_seq.cpp b/TAO/tests/Param_Test/bd_long_seq.cpp index 1e7190fd7ea..60354698a60 100644 --- a/TAO/tests/Param_Test/bd_long_seq.cpp +++ b/TAO/tests/Param_Test/bd_long_seq.cpp @@ -17,7 +17,7 @@ // Test_Bounded_Long_Sequence // ************************************************************************ -Test_Bounded_Long_Sequence::Test_Bounded_Long_Sequence (void) +Test_Bounded_Long_Sequence::Test_Bounded_Long_Sequence () : opname_ (CORBA::string_dup ("test_bounded_long_sequence")), in_ (new Param_Test::Bounded_Long_Seq), inout_ (new Param_Test::Bounded_Long_Seq), @@ -26,7 +26,7 @@ Test_Bounded_Long_Sequence::Test_Bounded_Long_Sequence (void) { } -Test_Bounded_Long_Sequence::~Test_Bounded_Long_Sequence (void) +Test_Bounded_Long_Sequence::~Test_Bounded_Long_Sequence () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -87,7 +87,7 @@ Test_Bounded_Long_Sequence::init_parameters (Param_Test_ptr) } int -Test_Bounded_Long_Sequence::reset_parameters (void) +Test_Bounded_Long_Sequence::reset_parameters () { this->inout_ = new Param_Test::Bounded_Long_Seq; // delete the previous ones this->out_ = new Param_Test::Bounded_Long_Seq; @@ -120,7 +120,7 @@ Test_Bounded_Long_Sequence::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Bounded_Long_Sequence::check_validity (void) +Test_Bounded_Long_Sequence::check_validity () { CORBA::Boolean flag = 0; if ((this->in_->length () == this->inout_->length ()) && @@ -149,7 +149,7 @@ Test_Bounded_Long_Sequence::check_validity (CORBA::Request_ptr req) } void -Test_Bounded_Long_Sequence::print_values (void) +Test_Bounded_Long_Sequence::print_values () { CORBA::ULong i; ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n")); diff --git a/TAO/tests/Param_Test/bd_long_seq.h b/TAO/tests/Param_Test/bd_long_seq.h index fc0c65c72c6..ee9f22ff23c 100644 --- a/TAO/tests/Param_Test/bd_long_seq.h +++ b/TAO/tests/Param_Test/bd_long_seq.h @@ -23,10 +23,10 @@ class Test_Bounded_Long_Sequence { public: /// ctor - Test_Bounded_Long_Sequence (void); + Test_Bounded_Long_Sequence (); /// dtor - ~Test_Bounded_Long_Sequence (void); + ~Test_Bounded_Long_Sequence (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -38,16 +38,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/bd_short_seq.cpp b/TAO/tests/Param_Test/bd_short_seq.cpp index a87ad18369c..5b88ceff92a 100644 --- a/TAO/tests/Param_Test/bd_short_seq.cpp +++ b/TAO/tests/Param_Test/bd_short_seq.cpp @@ -17,7 +17,7 @@ // Test_Bounded_Short_Sequence // ************************************************************************ -Test_Bounded_Short_Sequence::Test_Bounded_Short_Sequence (void) +Test_Bounded_Short_Sequence::Test_Bounded_Short_Sequence () : opname_ (CORBA::string_dup ("test_bounded_short_sequence")), in_ (new Param_Test::Bounded_Short_Seq), inout_ (new Param_Test::Bounded_Short_Seq), @@ -26,7 +26,7 @@ Test_Bounded_Short_Sequence::Test_Bounded_Short_Sequence (void) { } -Test_Bounded_Short_Sequence::~Test_Bounded_Short_Sequence (void) +Test_Bounded_Short_Sequence::~Test_Bounded_Short_Sequence () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -92,7 +92,7 @@ Test_Bounded_Short_Sequence::init_parameters (Param_Test_ptr /*objref*/ } int -Test_Bounded_Short_Sequence::reset_parameters (void) +Test_Bounded_Short_Sequence::reset_parameters () { this->inout_ = new Param_Test::Bounded_Short_Seq; // delete the previous ones this->out_ = new Param_Test::Bounded_Short_Seq; @@ -126,7 +126,7 @@ Test_Bounded_Short_Sequence::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Bounded_Short_Sequence::check_validity (void) +Test_Bounded_Short_Sequence::check_validity () { CORBA::Boolean flag = 0; if ((this->in_->length () == this->inout_->length ()) && @@ -154,7 +154,7 @@ Test_Bounded_Short_Sequence::check_validity (CORBA::Request_ptr /*req*/) } void -Test_Bounded_Short_Sequence::print_values (void) +Test_Bounded_Short_Sequence::print_values () { CORBA::ULong i; ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n")); diff --git a/TAO/tests/Param_Test/bd_short_seq.h b/TAO/tests/Param_Test/bd_short_seq.h index f148bba9f5a..74e9e1b46f5 100644 --- a/TAO/tests/Param_Test/bd_short_seq.h +++ b/TAO/tests/Param_Test/bd_short_seq.h @@ -23,10 +23,10 @@ class Test_Bounded_Short_Sequence { public: /// ctor - Test_Bounded_Short_Sequence (void); + Test_Bounded_Short_Sequence (); /// dtor - ~Test_Bounded_Short_Sequence (void); + ~Test_Bounded_Short_Sequence (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -38,16 +38,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp index fadfb85b3e4..fc6ef3a1585 100644 --- a/TAO/tests/Param_Test/bd_str_seq.cpp +++ b/TAO/tests/Param_Test/bd_str_seq.cpp @@ -17,7 +17,7 @@ // Test_Bounded_String_Sequence // ************************************************************************ -Test_Bounded_String_Sequence::Test_Bounded_String_Sequence (void) +Test_Bounded_String_Sequence::Test_Bounded_String_Sequence () : opname_ (CORBA::string_dup ("test_bounded_strseq")), in_ (new Param_Test::Bounded_StrSeq), inout_ (new Param_Test::Bounded_StrSeq), @@ -26,7 +26,7 @@ Test_Bounded_String_Sequence::Test_Bounded_String_Sequence (void) { } -Test_Bounded_String_Sequence::~Test_Bounded_String_Sequence (void) +Test_Bounded_String_Sequence::~Test_Bounded_String_Sequence () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -89,7 +89,7 @@ Test_Bounded_String_Sequence::init_parameters (Param_Test_ptr) } int -Test_Bounded_String_Sequence::reset_parameters (void) +Test_Bounded_String_Sequence::reset_parameters () { this->inout_ = new Param_Test::Bounded_StrSeq; // delete the previous ones this->out_ = new Param_Test::Bounded_StrSeq; @@ -118,7 +118,7 @@ Test_Bounded_String_Sequence::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Bounded_String_Sequence::check_validity (void) +Test_Bounded_String_Sequence::check_validity () { CORBA::Boolean flag = 0; if ((this->in_->length () == this->inout_->length ()) && @@ -147,7 +147,7 @@ Test_Bounded_String_Sequence::check_validity (CORBA::Request_ptr /*req*/) } void -Test_Bounded_String_Sequence::print_values (void) +Test_Bounded_String_Sequence::print_values () { CORBA::ULong i; ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n")); diff --git a/TAO/tests/Param_Test/bd_str_seq.h b/TAO/tests/Param_Test/bd_str_seq.h index 1b4fb023039..4de9b57f7a8 100644 --- a/TAO/tests/Param_Test/bd_str_seq.h +++ b/TAO/tests/Param_Test/bd_str_seq.h @@ -23,10 +23,10 @@ class Test_Bounded_String_Sequence { public: /// ctor - Test_Bounded_String_Sequence (void); + Test_Bounded_String_Sequence (); /// dtor - ~Test_Bounded_String_Sequence (void); + ~Test_Bounded_String_Sequence (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -38,16 +38,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/bd_string.cpp b/TAO/tests/Param_Test/bd_string.cpp index c9062c29397..3b1ac0fbada 100644 --- a/TAO/tests/Param_Test/bd_string.cpp +++ b/TAO/tests/Param_Test/bd_string.cpp @@ -17,7 +17,7 @@ // Test_Bounded_String // ************************************************************************ -Test_Bounded_String::Test_Bounded_String (void) +Test_Bounded_String::Test_Bounded_String () : opname_ (CORBA::string_dup ("test_bounded_string")), in_ (0), inout_ (0), @@ -26,7 +26,7 @@ Test_Bounded_String::Test_Bounded_String (void) { } -Test_Bounded_String::~Test_Bounded_String (void) +Test_Bounded_String::~Test_Bounded_String () { CORBA::string_free (this->opname_); CORBA::string_free (this->in_); @@ -96,7 +96,7 @@ Test_Bounded_String::init_parameters (Param_Test_ptr) } int -Test_Bounded_String::reset_parameters (void) +Test_Bounded_String::reset_parameters () { // release any previously occupied values CORBA::string_free (this->inout_); @@ -131,7 +131,7 @@ Test_Bounded_String::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Bounded_String::check_validity (void) +Test_Bounded_String::check_validity () { CORBA::ULong len = ACE_OS::strlen (this->in_); @@ -154,7 +154,7 @@ Test_Bounded_String::check_validity (CORBA::Request_ptr) } void -Test_Bounded_String::print_values (void) +Test_Bounded_String::print_values () { ACE_DEBUG ((LM_DEBUG, "\n=*=*=*=*=*=*\n" diff --git a/TAO/tests/Param_Test/bd_string.h b/TAO/tests/Param_Test/bd_string.h index a7202b49cac..25778f332cd 100644 --- a/TAO/tests/Param_Test/bd_string.h +++ b/TAO/tests/Param_Test/bd_string.h @@ -22,10 +22,10 @@ class Test_Bounded_String { public: /// ctor - Test_Bounded_String (void); + Test_Bounded_String (); /// dtor - ~Test_Bounded_String (void); + ~Test_Bounded_String (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -37,16 +37,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/bd_struct_seq.cpp b/TAO/tests/Param_Test/bd_struct_seq.cpp index 76456620945..bfdd0a5bb40 100644 --- a/TAO/tests/Param_Test/bd_struct_seq.cpp +++ b/TAO/tests/Param_Test/bd_struct_seq.cpp @@ -19,7 +19,7 @@ const CORBA::ULong MAX_STRUCTSEQ_LEN = 1; // Test_Bounded_Struct_Sequence // ************************************************************************ -Test_Bounded_Struct_Sequence::Test_Bounded_Struct_Sequence (void) +Test_Bounded_Struct_Sequence::Test_Bounded_Struct_Sequence () : opname_ (CORBA::string_dup ("test_bounded_struct_sequence")), inout_ (new Param_Test::Bounded_StructSeq), out_ (new Param_Test::Bounded_StructSeq), @@ -27,7 +27,7 @@ Test_Bounded_Struct_Sequence::Test_Bounded_Struct_Sequence (void) { } -Test_Bounded_Struct_Sequence::~Test_Bounded_Struct_Sequence (void) +Test_Bounded_Struct_Sequence::~Test_Bounded_Struct_Sequence () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -90,7 +90,7 @@ Test_Bounded_Struct_Sequence::init_parameters (Param_Test_ptr /* objref */ } int -Test_Bounded_Struct_Sequence::reset_parameters (void) +Test_Bounded_Struct_Sequence::reset_parameters () { this->inout_ = new Param_Test::Bounded_StructSeq; // delete the previous ones this->out_ = new Param_Test::Bounded_StructSeq; @@ -124,7 +124,7 @@ Test_Bounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Bounded_Struct_Sequence::check_validity (void) +Test_Bounded_Struct_Sequence::check_validity () { if (this->compare (this->in_, this->inout_.in ()) && this->compare (this->in_, this->out_.in ()) && @@ -141,7 +141,7 @@ Test_Bounded_Struct_Sequence::check_validity (CORBA::Request_ptr) } void -Test_Bounded_Struct_Sequence::print_values (void) +Test_Bounded_Struct_Sequence::print_values () { ACE_DEBUG ((LM_DEBUG, "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n" diff --git a/TAO/tests/Param_Test/bd_struct_seq.h b/TAO/tests/Param_Test/bd_struct_seq.h index bbda8071ff4..df9fce48977 100644 --- a/TAO/tests/Param_Test/bd_struct_seq.h +++ b/TAO/tests/Param_Test/bd_struct_seq.h @@ -23,10 +23,10 @@ class Test_Bounded_Struct_Sequence { public: /// ctor - Test_Bounded_Struct_Sequence (void); + Test_Bounded_Struct_Sequence (); /// dtor - ~Test_Bounded_Struct_Sequence (void); + ~Test_Bounded_Struct_Sequence (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -38,16 +38,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/bd_wstr_seq.cpp b/TAO/tests/Param_Test/bd_wstr_seq.cpp index 6b52e20bf89..75f9cb78dc8 100644 --- a/TAO/tests/Param_Test/bd_wstr_seq.cpp +++ b/TAO/tests/Param_Test/bd_wstr_seq.cpp @@ -18,7 +18,7 @@ // Test_Bounded_WString_Sequence // ************************************************************************ -Test_Bounded_WString_Sequence::Test_Bounded_WString_Sequence (void) +Test_Bounded_WString_Sequence::Test_Bounded_WString_Sequence () : opname_ (CORBA::string_dup ("test_bounded_wstrseq")), in_ (new Param_Test::Bounded_WStrSeq), inout_ (new Param_Test::Bounded_WStrSeq), @@ -27,7 +27,7 @@ Test_Bounded_WString_Sequence::Test_Bounded_WString_Sequence (void) { } -Test_Bounded_WString_Sequence::~Test_Bounded_WString_Sequence (void) +Test_Bounded_WString_Sequence::~Test_Bounded_WString_Sequence () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -89,7 +89,7 @@ Test_Bounded_WString_Sequence::init_parameters (Param_Test_ptr) } int -Test_Bounded_WString_Sequence::reset_parameters (void) +Test_Bounded_WString_Sequence::reset_parameters () { this->inout_ = new Param_Test::Bounded_WStrSeq; // delete the previous ones this->out_ = new Param_Test::Bounded_WStrSeq; @@ -118,7 +118,7 @@ Test_Bounded_WString_Sequence::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Bounded_WString_Sequence::check_validity (void) +Test_Bounded_WString_Sequence::check_validity () { CORBA::Boolean flag = 0; if ((this->in_->length () == this->inout_->length ()) && @@ -146,6 +146,6 @@ Test_Bounded_WString_Sequence::check_validity (CORBA::Request_ptr) } void -Test_Bounded_WString_Sequence::print_values (void) +Test_Bounded_WString_Sequence::print_values () { } diff --git a/TAO/tests/Param_Test/bd_wstr_seq.h b/TAO/tests/Param_Test/bd_wstr_seq.h index c9a754dde2e..e8e8481a365 100644 --- a/TAO/tests/Param_Test/bd_wstr_seq.h +++ b/TAO/tests/Param_Test/bd_wstr_seq.h @@ -23,10 +23,10 @@ class Test_Bounded_WString_Sequence { public: /// ctor - Test_Bounded_WString_Sequence (void); + Test_Bounded_WString_Sequence (); /// dtor - ~Test_Bounded_WString_Sequence (void); + ~Test_Bounded_WString_Sequence (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -38,16 +38,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/bd_wstring.cpp b/TAO/tests/Param_Test/bd_wstring.cpp index 904158bd400..afed5732f77 100644 --- a/TAO/tests/Param_Test/bd_wstring.cpp +++ b/TAO/tests/Param_Test/bd_wstring.cpp @@ -18,7 +18,7 @@ // Test_Bounded_WString // ************************************************************************ -Test_Bounded_WString::Test_Bounded_WString (void) +Test_Bounded_WString::Test_Bounded_WString () : opname_ (CORBA::string_dup ("test_bounded_wstring")), in_ (0), inout_ (0), @@ -27,7 +27,7 @@ Test_Bounded_WString::Test_Bounded_WString (void) { } -Test_Bounded_WString::~Test_Bounded_WString (void) +Test_Bounded_WString::~Test_Bounded_WString () { CORBA::string_free (this->opname_); CORBA::wstring_free (this->in_); @@ -97,7 +97,7 @@ Test_Bounded_WString::init_parameters (Param_Test_ptr) } int -Test_Bounded_WString::reset_parameters (void) +Test_Bounded_WString::reset_parameters () { // release any previously occupied values CORBA::wstring_free (this->inout_); @@ -132,7 +132,7 @@ Test_Bounded_WString::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Bounded_WString::check_validity (void) +Test_Bounded_WString::check_validity () { CORBA::ULong len = ACE_OS::wslen (this->in_); @@ -155,6 +155,6 @@ Test_Bounded_WString::check_validity (CORBA::Request_ptr) } void -Test_Bounded_WString::print_values (void) +Test_Bounded_WString::print_values () { } diff --git a/TAO/tests/Param_Test/bd_wstring.h b/TAO/tests/Param_Test/bd_wstring.h index 7c691d97a4f..5481e25babe 100644 --- a/TAO/tests/Param_Test/bd_wstring.h +++ b/TAO/tests/Param_Test/bd_wstring.h @@ -22,10 +22,10 @@ class Test_Bounded_WString { public: /// ctor - Test_Bounded_WString (void); + Test_Bounded_WString (); /// dtor - ~Test_Bounded_WString (void); + ~Test_Bounded_WString (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -37,16 +37,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/big_union.cpp b/TAO/tests/Param_Test/big_union.cpp index edaac0d77f3..f1826497abe 100644 --- a/TAO/tests/Param_Test/big_union.cpp +++ b/TAO/tests/Param_Test/big_union.cpp @@ -19,12 +19,12 @@ size_t Test_Big_Union::counter = 0; -Test_Big_Union::Test_Big_Union (void) +Test_Big_Union::Test_Big_Union () : opname_ (CORBA::string_dup ("test_big_union")) { } -Test_Big_Union::~Test_Big_Union (void) +Test_Big_Union::~Test_Big_Union () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -86,7 +86,7 @@ Test_Big_Union::init_parameters (Param_Test_ptr objref) } int -Test_Big_Union::reset_parameters (void) +Test_Big_Union::reset_parameters () { Generator *gen = GENERATOR::instance (); // value generator CORBA::ULong index = (counter++ % Test_Big_Union::BIG_UNION_N_BRANCHES); @@ -233,7 +233,7 @@ Test_Big_Union::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Big_Union::check_validity (void) +Test_Big_Union::check_validity () { if (this->in_._d () != this->inout_._d () || this->in_._d () != this->out_->_d () @@ -547,6 +547,6 @@ Test_Big_Union::check_validity (CORBA::Request_ptr /*req*/) } void -Test_Big_Union::print_values (void) +Test_Big_Union::print_values () { } diff --git a/TAO/tests/Param_Test/big_union.h b/TAO/tests/Param_Test/big_union.h index 07e4deb5422..ac05429bb2e 100644 --- a/TAO/tests/Param_Test/big_union.h +++ b/TAO/tests/Param_Test/big_union.h @@ -22,10 +22,10 @@ class Test_Big_Union { public: /// ctor - Test_Big_Union (void); + Test_Big_Union (); /// dtor - ~Test_Big_Union (void); + ~Test_Big_Union (); enum { BIG_UNION_N_BRANCHES = 12 @@ -41,16 +41,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/client.cpp b/TAO/tests/Param_Test/client.cpp index 6fa43b8100d..c163d094f6f 100644 --- a/TAO/tests/Param_Test/client.cpp +++ b/TAO/tests/Param_Test/client.cpp @@ -31,14 +31,14 @@ Param_Test_Client<T>::Param_Test_Client (CORBA::ORB_ptr orb, // destructor template <class T> -Param_Test_Client<T>::~Param_Test_Client (void) +Param_Test_Client<T>::~Param_Test_Client () { delete this->test_object_; } // All the individual tests. template <class T> int -Param_Test_Client<T>::run_sii_test (void) +Param_Test_Client<T>::run_sii_test () { CORBA::ULong i = 0; // loop index Options *opt = OPTIONS::instance (); // get the options @@ -144,7 +144,7 @@ Param_Test_Client<T>::run_sii_test (void) // use DII template <class T> int -Param_Test_Client<T>::run_dii_test (void) +Param_Test_Client<T>::run_dii_test () { const char *opname = this->test_object_->opname (); Options *opt = OPTIONS::instance (); diff --git a/TAO/tests/Param_Test/client.h b/TAO/tests/Param_Test/client.h index d4a139e5bd7..1989cac7797 100644 --- a/TAO/tests/Param_Test/client.h +++ b/TAO/tests/Param_Test/client.h @@ -40,13 +40,13 @@ public: Param_Test_ptr objref, T *); - ~Param_Test_Client (void); + ~Param_Test_Client (); /// run the SII test - int run_sii_test (void); + int run_sii_test (); /// run the DII test - int run_dii_test (void); + int run_dii_test (); private: /// underlying ORB diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp index 29a9ca724d3..d13c60fb285 100644 --- a/TAO/tests/Param_Test/complex_any.cpp +++ b/TAO/tests/Param_Test/complex_any.cpp @@ -25,14 +25,14 @@ const int LEVEL_3_LENGTH = 3; size_t Test_Complex_Any::counter = 0; -Test_Complex_Any::Test_Complex_Any (void) +Test_Complex_Any::Test_Complex_Any () : opname_ (CORBA::string_dup ("test_complex_any")), out_ (new CORBA::Any), ret_ (new CORBA::Any) { } -Test_Complex_Any::~Test_Complex_Any (void) +Test_Complex_Any::~Test_Complex_Any () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -84,7 +84,7 @@ Test_Complex_Any::init_parameters (Param_Test_ptr) // <- boolean // <- short int -Test_Complex_Any::reset_parameters (void) +Test_Complex_Any::reset_parameters () { Generator *gen = GENERATOR::instance (); // value generator @@ -172,7 +172,7 @@ Test_Complex_Any::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Complex_Any::check_validity (void) +Test_Complex_Any::check_validity () { const CORBA::AnySeq *level2_in_seq = 0; const CORBA::AnySeq *level2_test_seq = 0; @@ -306,6 +306,6 @@ Test_Complex_Any::check_validity (CORBA::Request_ptr /*req*/) } void -Test_Complex_Any::print_values (void) +Test_Complex_Any::print_values () { } diff --git a/TAO/tests/Param_Test/complex_any.h b/TAO/tests/Param_Test/complex_any.h index b0ac49b1ecc..d21e9c17b0c 100644 --- a/TAO/tests/Param_Test/complex_any.h +++ b/TAO/tests/Param_Test/complex_any.h @@ -24,10 +24,10 @@ class Test_Complex_Any { public: /// ctor - Test_Complex_Any (void); + Test_Complex_Any (); /// dtor - ~Test_Complex_Any (void); + ~Test_Complex_Any (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -39,16 +39,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp index c8f09c69933..c1271859d7f 100644 --- a/TAO/tests/Param_Test/driver.cpp +++ b/TAO/tests/Param_Test/driver.cpp @@ -49,11 +49,11 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) } // constructor -Driver::Driver (void) +Driver::Driver () { } -Driver::~Driver (void) +Driver::~Driver () { } @@ -111,7 +111,7 @@ Driver::init (int argc, ACE_TCHAR **argv) } int -Driver::run (void) +Driver::run () { // serves as a factory of Param_Client objects. It is also responsible to // start the test diff --git a/TAO/tests/Param_Test/driver.h b/TAO/tests/Param_Test/driver.h index dcc0778dd65..1385df06df4 100644 --- a/TAO/tests/Param_Test/driver.h +++ b/TAO/tests/Param_Test/driver.h @@ -27,14 +27,14 @@ class Driver { public: // = Constructor and destructor. - Driver (void); - ~Driver (void); + Driver (); + ~Driver (); /// Initialize the driver object int init (int argc, ACE_TCHAR **argv); /// Execute client example code. - int run (void); + int run (); private: /// underlying ORB (we do not own it) diff --git a/TAO/tests/Param_Test/except.cpp b/TAO/tests/Param_Test/except.cpp index 49084a4b258..d7216acb86f 100644 --- a/TAO/tests/Param_Test/except.cpp +++ b/TAO/tests/Param_Test/except.cpp @@ -20,13 +20,13 @@ // Test_Exception // ************************************************************************ -Test_Exception::Test_Exception (void) +Test_Exception::Test_Exception () : opname_ (CORBA::string_dup ("test_exception")), iterations_ (0) { } -Test_Exception::~Test_Exception (void) +Test_Exception::~Test_Exception () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -230,7 +230,7 @@ Test_Exception::init_parameters (Param_Test_ptr) } int -Test_Exception::reset_parameters (void) +Test_Exception::reset_parameters () { this->inout_ = 0; this->out_ = 0; @@ -380,7 +380,7 @@ Test_Exception::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Exception::check_validity (void) +Test_Exception::check_validity () { if (this->inout_ == this->in_ * 2 && this->out_ == this->in_ * 3 && @@ -399,7 +399,7 @@ Test_Exception::check_validity (CORBA::Request_ptr) } void -Test_Exception::print_values (void) +Test_Exception::print_values () { ACE_DEBUG ((LM_DEBUG, "\n=*=*=*=*=*=*\n" diff --git a/TAO/tests/Param_Test/except.h b/TAO/tests/Param_Test/except.h index 6bb02bd3d81..11953410c4e 100644 --- a/TAO/tests/Param_Test/except.h +++ b/TAO/tests/Param_Test/except.h @@ -19,10 +19,10 @@ class Test_Exception { public: /// ctor - Test_Exception (void); + Test_Exception (); /// dtor - ~Test_Exception (void); + ~Test_Exception (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -34,16 +34,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/fixed_array.cpp b/TAO/tests/Param_Test/fixed_array.cpp index 61f5c079118..20118bc7838 100644 --- a/TAO/tests/Param_Test/fixed_array.cpp +++ b/TAO/tests/Param_Test/fixed_array.cpp @@ -17,13 +17,13 @@ // Test_Fixed_Array // ************************************************************************ -Test_Fixed_Array::Test_Fixed_Array (void) +Test_Fixed_Array::Test_Fixed_Array () : opname_ (CORBA::string_dup ("test_fixed_array")), ret_ (new Param_Test::Fixed_Array) { } -Test_Fixed_Array::~Test_Fixed_Array (void) +Test_Fixed_Array::~Test_Fixed_Array () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -78,7 +78,7 @@ Test_Fixed_Array::init_parameters (Param_Test_ptr /*objref*/ } int -Test_Fixed_Array::reset_parameters (void) +Test_Fixed_Array::reset_parameters () { for (CORBA::ULong i=0; i < Param_Test::DIM1; i++) { @@ -111,7 +111,7 @@ Test_Fixed_Array::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Fixed_Array::check_validity (void) +Test_Fixed_Array::check_validity () { if (this->compare (this->in_, this->inout_) && this->compare (this->in_, this->out_) && @@ -141,7 +141,7 @@ Test_Fixed_Array::compare (const Param_Test::Fixed_Array_slice *a1, } void -Test_Fixed_Array::print_values (void) +Test_Fixed_Array::print_values () { ACE_DEBUG ((LM_DEBUG, "IN array\n")); this->print (this->in_); diff --git a/TAO/tests/Param_Test/fixed_array.h b/TAO/tests/Param_Test/fixed_array.h index f6cec4953e6..ace255104ef 100644 --- a/TAO/tests/Param_Test/fixed_array.h +++ b/TAO/tests/Param_Test/fixed_array.h @@ -22,10 +22,10 @@ class Test_Fixed_Array { public: /// ctor - Test_Fixed_Array (void); + Test_Fixed_Array (); /// dtor - ~Test_Fixed_Array (void); + ~Test_Fixed_Array (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -37,16 +37,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/fixed_struct.cpp b/TAO/tests/Param_Test/fixed_struct.cpp index 15c7488bdca..9e6c2fdc2f4 100644 --- a/TAO/tests/Param_Test/fixed_struct.cpp +++ b/TAO/tests/Param_Test/fixed_struct.cpp @@ -17,12 +17,12 @@ // Test_Fixed_Struct // ************************************************************************ -Test_Fixed_Struct::Test_Fixed_Struct (void) +Test_Fixed_Struct::Test_Fixed_Struct () : opname_ (CORBA::string_dup ("test_fixed_struct")) { } -Test_Fixed_Struct::~Test_Fixed_Struct (void) +Test_Fixed_Struct::~Test_Fixed_Struct () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -75,7 +75,7 @@ Test_Fixed_Struct::init_parameters (Param_Test_ptr /*objref*/ } int -Test_Fixed_Struct::reset_parameters (void) +Test_Fixed_Struct::reset_parameters () { ACE_OS::memset (&this->inout_, 0, @@ -111,7 +111,7 @@ Test_Fixed_Struct::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Fixed_Struct::check_validity (void) +Test_Fixed_Struct::check_validity () { if (this->in_.l == this->inout_.l && this->in_.c == this->inout_.c && @@ -147,7 +147,7 @@ Test_Fixed_Struct::check_validity (CORBA::Request_ptr /*req*/) } void -Test_Fixed_Struct::print_values (void) +Test_Fixed_Struct::print_values () { ACE_DEBUG ((LM_DEBUG, "\n=*=*=*=*=*=*\n" diff --git a/TAO/tests/Param_Test/fixed_struct.h b/TAO/tests/Param_Test/fixed_struct.h index ac0393a0303..b874bed5250 100644 --- a/TAO/tests/Param_Test/fixed_struct.h +++ b/TAO/tests/Param_Test/fixed_struct.h @@ -22,10 +22,10 @@ class Test_Fixed_Struct { public: /// ctor - Test_Fixed_Struct (void); + Test_Fixed_Struct (); /// dtor - ~Test_Fixed_Struct (void); + ~Test_Fixed_Struct (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -37,16 +37,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/helper.cpp b/TAO/tests/Param_Test/helper.cpp index 8e5b49caf59..048284a6e59 100644 --- a/TAO/tests/Param_Test/helper.cpp +++ b/TAO/tests/Param_Test/helper.cpp @@ -16,28 +16,28 @@ const CORBA::ULong TEST_BUFSIZE = 128; -Generator::Generator (void) +Generator::Generator () { } -Generator::~Generator (void) +Generator::~Generator () { } CORBA::Short -Generator::gen_short (void) +Generator::gen_short () { return (CORBA::Short) (ACE_OS::rand () % TEST_BUFSIZE); } CORBA::Long -Generator::gen_long (void) +Generator::gen_long () { return ::ACE_OS::rand () % TEST_BUFSIZE; } char * -Generator::gen_string (void) +Generator::gen_string () { return gen_string (TEST_BUFSIZE); } @@ -64,7 +64,7 @@ Generator::gen_string (int max_length) } CORBA::WChar * -Generator::gen_wstring (void) +Generator::gen_wstring () { return gen_wstring (TEST_BUFSIZE); } @@ -92,7 +92,7 @@ Generator::gen_wstring (int max_length) } const Param_Test::Fixed_Struct -Generator::gen_fixed_struct (void) +Generator::gen_fixed_struct () { this->fixed_struct_.l = ACE_OS::rand (); this->fixed_struct_.c = ACE_OS::rand () % 128; @@ -105,7 +105,7 @@ Generator::gen_fixed_struct (void) } const Param_Test::Step -Generator::gen_step (void) +Generator::gen_step () { this->step_.name.id = this->gen_string (); this->step_.name.kind = this->gen_string (); diff --git a/TAO/tests/Param_Test/helper.h b/TAO/tests/Param_Test/helper.h index 57648202ecf..37523be1c30 100644 --- a/TAO/tests/Param_Test/helper.h +++ b/TAO/tests/Param_Test/helper.h @@ -22,19 +22,19 @@ class Generator { public: /// constructor - Generator (void); + Generator (); /// destructor - ~Generator (void); + ~Generator (); - CORBA::Short gen_short (void); - CORBA::Long gen_long (void); - char* gen_string (void); + CORBA::Short gen_short (); + CORBA::Long gen_long (); + char* gen_string (); char* gen_string (int maxlength); - CORBA::WChar* gen_wstring (void); + CORBA::WChar* gen_wstring (); CORBA::WChar* gen_wstring (int maxlength); - const Param_Test::Fixed_Struct gen_fixed_struct (void); - const Param_Test::Step gen_step (void); + const Param_Test::Fixed_Struct gen_fixed_struct (); + const Param_Test::Step gen_step (); private: Param_Test::Fixed_Struct fixed_struct_; Param_Test::Step step_; diff --git a/TAO/tests/Param_Test/multdim_array.cpp b/TAO/tests/Param_Test/multdim_array.cpp index 4711438c044..e5b09dba3b2 100644 --- a/TAO/tests/Param_Test/multdim_array.cpp +++ b/TAO/tests/Param_Test/multdim_array.cpp @@ -18,7 +18,7 @@ // Test_Multdim_Array // ************************************************************************ -Test_Multdim_Array::Test_Multdim_Array (void) +Test_Multdim_Array::Test_Multdim_Array () : opname_ (CORBA::string_dup ("test_multdim_array")), in_ (new Param_Test::Multdim_Array), inout_ (new Param_Test::Multdim_Array), @@ -27,7 +27,7 @@ Test_Multdim_Array::Test_Multdim_Array (void) { } -Test_Multdim_Array::~Test_Multdim_Array (void) +Test_Multdim_Array::~Test_Multdim_Array () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -87,7 +87,7 @@ Test_Multdim_Array::init_parameters (Param_Test_ptr /*objref*/ } int -Test_Multdim_Array::reset_parameters (void) +Test_Multdim_Array::reset_parameters () { Generator *gen = GENERATOR::instance (); // value generator @@ -140,7 +140,7 @@ Test_Multdim_Array::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Multdim_Array::check_validity (void) +Test_Multdim_Array::check_validity () { if (this->compare (this->in_.in (), this->inout_.in ()) && @@ -179,7 +179,7 @@ Test_Multdim_Array::compare (const Param_Test::Multdim_Array_slice *a1, } void -Test_Multdim_Array::print_values (void) +Test_Multdim_Array::print_values () { ACE_DEBUG ((LM_DEBUG, "IN array\n")); this->print (this->in_.in ()); diff --git a/TAO/tests/Param_Test/multdim_array.h b/TAO/tests/Param_Test/multdim_array.h index af149eafb9e..ff6aaa28572 100644 --- a/TAO/tests/Param_Test/multdim_array.h +++ b/TAO/tests/Param_Test/multdim_array.h @@ -22,10 +22,10 @@ class Test_Multdim_Array { public: /// ctor - Test_Multdim_Array (void); + Test_Multdim_Array (); /// dtor - ~Test_Multdim_Array (void); + ~Test_Multdim_Array (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -37,16 +37,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp index c12b5d945c3..5d444cae5d2 100644 --- a/TAO/tests/Param_Test/nested_struct.cpp +++ b/TAO/tests/Param_Test/nested_struct.cpp @@ -17,7 +17,7 @@ // Test_Nested_Struct // ************************************************************************ -Test_Nested_Struct::Test_Nested_Struct (void) +Test_Nested_Struct::Test_Nested_Struct () : opname_ (CORBA::string_dup ("test_nested_struct")), inout_ (new Param_Test::Nested_Struct), out_ (new Param_Test::Nested_Struct), @@ -25,7 +25,7 @@ Test_Nested_Struct::Test_Nested_Struct (void) { } -Test_Nested_Struct::~Test_Nested_Struct (void) +Test_Nested_Struct::~Test_Nested_Struct () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -100,7 +100,7 @@ Test_Nested_Struct::init_parameters (Param_Test_ptr) } int -Test_Nested_Struct::reset_parameters (void) +Test_Nested_Struct::reset_parameters () { this->inout_ = new Param_Test::Nested_Struct; // delete the previous ones this->out_ = new Param_Test::Nested_Struct; @@ -137,7 +137,7 @@ Test_Nested_Struct::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Nested_Struct::check_validity (void) +Test_Nested_Struct::check_validity () { CORBA::Boolean flag = 0; if ((this->in_.vs.seq.length () == this->inout_->vs.seq.length ()) && @@ -166,7 +166,7 @@ Test_Nested_Struct::check_validity (CORBA::Request_ptr /*req*/) } void -Test_Nested_Struct::print_values (void) +Test_Nested_Struct::print_values () { for (CORBA::ULong i=0; i < this->in_.vs.seq.length (); i++) { diff --git a/TAO/tests/Param_Test/nested_struct.h b/TAO/tests/Param_Test/nested_struct.h index 2ca813c4142..6138f5ca459 100644 --- a/TAO/tests/Param_Test/nested_struct.h +++ b/TAO/tests/Param_Test/nested_struct.h @@ -23,10 +23,10 @@ class Test_Nested_Struct { public: /// ctor - Test_Nested_Struct (void); + Test_Nested_Struct (); /// dtor - ~Test_Nested_Struct (void); + ~Test_Nested_Struct (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -38,16 +38,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/objref.cpp b/TAO/tests/Param_Test/objref.cpp index 74dad5fa189..e86581104f8 100644 --- a/TAO/tests/Param_Test/objref.cpp +++ b/TAO/tests/Param_Test/objref.cpp @@ -17,12 +17,12 @@ // Test_ObjRef // ************************************************************************ -Test_ObjRef::Test_ObjRef (void) +Test_ObjRef::Test_ObjRef () : opname_ (CORBA::string_dup ("test_objref")) { } -Test_ObjRef::~Test_ObjRef (void) +Test_ObjRef::~Test_ObjRef () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -106,7 +106,7 @@ Test_ObjRef::init_parameters (Param_Test_ptr objref) } int -Test_ObjRef::reset_parameters (void) +Test_ObjRef::reset_parameters () { // Environemnt variable Coffee::Desc desc; @@ -154,7 +154,7 @@ Test_ObjRef::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_ObjRef::check_validity (void) +Test_ObjRef::check_validity () { // Environemnt variable @@ -209,7 +209,7 @@ Test_ObjRef::check_validity (CORBA::Request_ptr) } void -Test_ObjRef::print_values (void) +Test_ObjRef::print_values () { // Env. variable diff --git a/TAO/tests/Param_Test/objref.h b/TAO/tests/Param_Test/objref.h index 9f2aa04c937..672ffd948d4 100644 --- a/TAO/tests/Param_Test/objref.h +++ b/TAO/tests/Param_Test/objref.h @@ -22,10 +22,10 @@ class Test_ObjRef { public: /// ctor - Test_ObjRef (void); + Test_ObjRef (); /// dtor - ~Test_ObjRef (void); + ~Test_ObjRef (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -37,16 +37,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp index 188a7011a87..834d50f3212 100644 --- a/TAO/tests/Param_Test/objref_struct.cpp +++ b/TAO/tests/Param_Test/objref_struct.cpp @@ -17,7 +17,7 @@ // Test_Objref_Struct // ************************************************************************ -Test_Objref_Struct::Test_Objref_Struct (void) +Test_Objref_Struct::Test_Objref_Struct () : opname_ (CORBA::string_dup ("test_objref_struct")), inout_ (new Param_Test::Objref_Struct), out_ (new Param_Test::Objref_Struct), @@ -25,7 +25,7 @@ Test_Objref_Struct::Test_Objref_Struct (void) { } -Test_Objref_Struct::~Test_Objref_Struct (void) +Test_Objref_Struct::~Test_Objref_Struct () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -99,7 +99,7 @@ Test_Objref_Struct::init_parameters (Param_Test_ptr objref) } int -Test_Objref_Struct::reset_parameters (void) +Test_Objref_Struct::reset_parameters () { this->inout_ = new Param_Test::Objref_Struct; // delete the previous ones this->out_ = new Param_Test::Objref_Struct; @@ -136,7 +136,7 @@ Test_Objref_Struct::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Objref_Struct::check_validity (void) +Test_Objref_Struct::check_validity () { if (this->in_.x != this->inout_->x || this->in_.x != this->out_->x @@ -185,7 +185,7 @@ Test_Objref_Struct::check_validity (CORBA::Request_ptr /*req*/) } void -Test_Objref_Struct::print_values (void) +Test_Objref_Struct::print_values () { ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n" diff --git a/TAO/tests/Param_Test/objref_struct.h b/TAO/tests/Param_Test/objref_struct.h index a7b8fb748a3..e5f26fb392b 100644 --- a/TAO/tests/Param_Test/objref_struct.h +++ b/TAO/tests/Param_Test/objref_struct.h @@ -23,10 +23,10 @@ class Test_Objref_Struct { public: /// ctor - Test_Objref_Struct (void); + Test_Objref_Struct (); /// dtor - ~Test_Objref_Struct (void); + ~Test_Objref_Struct (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -38,16 +38,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/options.cpp b/TAO/tests/Param_Test/options.cpp index 6db5429ab92..b029769a160 100644 --- a/TAO/tests/Param_Test/options.cpp +++ b/TAO/tests/Param_Test/options.cpp @@ -19,7 +19,7 @@ #include "ace/Log_Msg.h" // Constructor. -Options::Options (void) +Options::Options () : ior_ (CORBA::string_dup ("file://test.ior")), test_type_ (Options::NO_TEST), invoke_type_ (Options::SII), @@ -29,7 +29,7 @@ Options::Options (void) { } -Options::~Options (void) +Options::~Options () { } @@ -200,19 +200,19 @@ Options::param_test_ior () const } Options::TEST_TYPE -Options::test_type (void) +Options::test_type () { return this->test_type_; } Options::INVOKE_TYPE -Options::invoke_type (void) +Options::invoke_type () { return this->invoke_type_; } CORBA::ULong -Options::loop_count (void) +Options::loop_count () { return this->loop_count_; } diff --git a/TAO/tests/Param_Test/options.h b/TAO/tests/Param_Test/options.h index 1659ce72f23..75d7b99cab2 100644 --- a/TAO/tests/Param_Test/options.h +++ b/TAO/tests/Param_Test/options.h @@ -74,10 +74,10 @@ public: }; /// constructor - Options (void); + Options (); /// destructor - ~Options (void); + ~Options (); /// Parses the arguments passed on the command line. int parse_args (int argc, ACE_TCHAR **argv); @@ -86,13 +86,13 @@ public: char const * param_test_ior () const; /// what test to run - TEST_TYPE test_type (void); + TEST_TYPE test_type (); /// whether to use SII or DII - INVOKE_TYPE invoke_type (void); + INVOKE_TYPE invoke_type (); /// number of times to run the test - CORBA::ULong loop_count (void); + CORBA::ULong loop_count (); /// whether debug option is on or not CORBA::Boolean debug () const; diff --git a/TAO/tests/Param_Test/param_test_i.cpp b/TAO/tests/Param_Test/param_test_i.cpp index 4a044735a8b..c53230df70b 100644 --- a/TAO/tests/Param_Test/param_test_i.cpp +++ b/TAO/tests/Param_Test/param_test_i.cpp @@ -25,7 +25,7 @@ Coffee_i::Coffee_i (const char *name) // Destructor -Coffee_i::~Coffee_i (void) +Coffee_i::~Coffee_i () { } @@ -60,7 +60,7 @@ Param_Test_i::Param_Test_i (const char *coffee_name, // Destructor -Param_Test_i::~Param_Test_i (void) +Param_Test_i::~Param_Test_i () { } @@ -627,7 +627,7 @@ Param_Test_i::test_objref_struct (const Param_Test::Objref_Struct &s1, // make a Coffee object Coffee_ptr -Param_Test_i::make_coffee (void) +Param_Test_i::make_coffee () { return this->obj_._this (); } @@ -973,13 +973,13 @@ Param_Test_i::test_multdim_array (const Param_Test::Multdim_Array a1, } void -Param_Test_i::shutdown (void) +Param_Test_i::shutdown () { this->orb_->shutdown (); } void -Param_Test_i::throw_badboy (void) +Param_Test_i::throw_badboy () { throw Param_Test::BadBoy (); } diff --git a/TAO/tests/Param_Test/param_test_i.h b/TAO/tests/Param_Test/param_test_i.h index 8c8af88d3ec..454158c2183 100644 --- a/TAO/tests/Param_Test/param_test_i.h +++ b/TAO/tests/Param_Test/param_test_i.h @@ -22,12 +22,12 @@ public: Coffee_i (const char *name); /// destructor - ~Coffee_i (void); + ~Coffee_i (); // =methods for the attribute /// get attribute - virtual Coffee::Desc * description (void); + virtual Coffee::Desc * description (); /// set attribute virtual void description (const Coffee::Desc &description); @@ -53,7 +53,7 @@ public: CORBA::ORB_ptr orb); /// Destructor - ~Param_Test_i (void); + ~Param_Test_i (); /// test for shorts virtual CORBA::Short test_short (CORBA::Short s1, @@ -183,7 +183,7 @@ public: /// make a coffee object virtual Coffee_ptr - make_coffee (void); + make_coffee (); /// test for object references virtual Coffee_ptr @@ -245,7 +245,7 @@ public: Param_Test::Multdim_Array , Param_Test::Multdim_Array_out); - void shutdown (void); + void shutdown (); private: @@ -261,7 +261,7 @@ private: * not in its THROW_SPEC, but still test TAO's * conversion of such an exception to UNKNOWN. */ - void throw_badboy (void); + void throw_badboy (); }; #endif /* PARAM_TEST_I_H */ diff --git a/TAO/tests/Param_Test/recursive_struct.cpp b/TAO/tests/Param_Test/recursive_struct.cpp index 328bed47e5a..c05eb8f3c90 100644 --- a/TAO/tests/Param_Test/recursive_struct.cpp +++ b/TAO/tests/Param_Test/recursive_struct.cpp @@ -20,12 +20,12 @@ const CORBA::ULong MAX_SEQ_LENGTH = 3; // Test_Recursive_Struct // ************************************************************************ -Test_Recursive_Struct::Test_Recursive_Struct (void) +Test_Recursive_Struct::Test_Recursive_Struct () : opname_ (CORBA::string_dup ("test_recursive_struct")) { } -Test_Recursive_Struct::~Test_Recursive_Struct (void) +Test_Recursive_Struct::~Test_Recursive_Struct () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -75,7 +75,7 @@ Test_Recursive_Struct::init_parameters (Param_Test_ptr) } int -Test_Recursive_Struct::reset_parameters (void) +Test_Recursive_Struct::reset_parameters () { // Since these are _vars, we do this the first call and // every call thereafter (if any). @@ -124,7 +124,7 @@ Test_Recursive_Struct::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Recursive_Struct::check_validity (void) +Test_Recursive_Struct::check_validity () { // Pair in_ with each of the returned values and call the // helper function with that pair. @@ -164,7 +164,7 @@ Test_Recursive_Struct::check_validity (CORBA::Request_ptr) } void -Test_Recursive_Struct::print_values (void) +Test_Recursive_Struct::print_values () { } diff --git a/TAO/tests/Param_Test/recursive_struct.h b/TAO/tests/Param_Test/recursive_struct.h index 3e4141324a1..4fe7bdb9bed 100644 --- a/TAO/tests/Param_Test/recursive_struct.h +++ b/TAO/tests/Param_Test/recursive_struct.h @@ -25,10 +25,10 @@ class Test_Recursive_Struct { public: /// ctor - Test_Recursive_Struct (void); + Test_Recursive_Struct (); /// dtor - ~Test_Recursive_Struct (void); + ~Test_Recursive_Struct (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -40,16 +40,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/recursive_union.cpp b/TAO/tests/Param_Test/recursive_union.cpp index a6500e251e9..ca65bc1ffaa 100644 --- a/TAO/tests/Param_Test/recursive_union.cpp +++ b/TAO/tests/Param_Test/recursive_union.cpp @@ -19,12 +19,12 @@ const CORBA::ULong MAX_SEQ_LENGTH = 2; // Test_Recursive_Union // ************************************************************************ -Test_Recursive_Union::Test_Recursive_Union (void) +Test_Recursive_Union::Test_Recursive_Union () : opname_ (CORBA::string_dup ("test_recursive_union")) { } -Test_Recursive_Union::~Test_Recursive_Union (void) +Test_Recursive_Union::~Test_Recursive_Union () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -74,7 +74,7 @@ Test_Recursive_Union::init_parameters (Param_Test_ptr) } int -Test_Recursive_Union::reset_parameters (void) +Test_Recursive_Union::reset_parameters () { // Since these are _vars, we do this the first call and // every call thereafter (if any). @@ -125,7 +125,7 @@ Test_Recursive_Union::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Recursive_Union::check_validity (void) +Test_Recursive_Union::check_validity () { // Pair in_ with each of the returned values and call the // helper function with that pair. @@ -165,7 +165,7 @@ Test_Recursive_Union::check_validity (CORBA::Request_ptr) } void -Test_Recursive_Union::print_values (void) +Test_Recursive_Union::print_values () { } diff --git a/TAO/tests/Param_Test/recursive_union.h b/TAO/tests/Param_Test/recursive_union.h index 8b62bfea172..62c729412c7 100644 --- a/TAO/tests/Param_Test/recursive_union.h +++ b/TAO/tests/Param_Test/recursive_union.h @@ -24,10 +24,10 @@ class Test_Recursive_Union { public: /// ctor - Test_Recursive_Union (void); + Test_Recursive_Union (); /// dtor - ~Test_Recursive_Union (void); + ~Test_Recursive_Union (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -39,16 +39,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/results.cpp b/TAO/tests/Param_Test/results.cpp index 87fb68e2caa..9c298261969 100644 --- a/TAO/tests/Param_Test/results.cpp +++ b/TAO/tests/Param_Test/results.cpp @@ -14,17 +14,17 @@ #include "tao/debug.h" #include "ace/Log_Msg.h" -Results::Results (void) +Results::Results () { } -Results::~Results (void) +Results::~Results () { delete [] this->elapsed_time_; } void -Results::print_stats (void) +Results::print_stats () { double avg_real_time = 0, @@ -103,20 +103,20 @@ Results::print_exception (const char * /* call_name */) } void -Results::start_timer (void) +Results::start_timer () { this->timer_.start (); } void -Results::stop_timer (void) +Results::stop_timer () { this->timer_.stop (); this->timer_.elapsed_time (this->elapsed_time_[this->call_count_-1]); } CORBA::ULong -Results::call_count (void) +Results::call_count () { return this->call_count_; } @@ -128,7 +128,7 @@ Results::call_count (CORBA::ULong c) } CORBA::ULong -Results::error_count (void) +Results::error_count () { return this->error_count_; } diff --git a/TAO/tests/Param_Test/results.h b/TAO/tests/Param_Test/results.h index dd2e62756f7..0607cc430e9 100644 --- a/TAO/tests/Param_Test/results.h +++ b/TAO/tests/Param_Test/results.h @@ -33,31 +33,31 @@ class Results { public: /// ctor - Results (void); + Results (); /// destructor - ~Results (void); + ~Results (); /// prints the time stats - void print_stats (void); + void print_stats (); /// print the exception void print_exception (const char *call_name); /// start timing - void start_timer (void); + void start_timer (); /// stop timing - void stop_timer (void); + void stop_timer (); /// return call count - CORBA::ULong call_count (void); + CORBA::ULong call_count (); /// set the call count void call_count (CORBA::ULong); /// return the error count - CORBA::ULong error_count (void); + CORBA::ULong error_count (); /// set error count void error_count (CORBA::ULong); diff --git a/TAO/tests/Param_Test/short.cpp b/TAO/tests/Param_Test/short.cpp index f2b36b8d046..3fd478cd8d9 100644 --- a/TAO/tests/Param_Test/short.cpp +++ b/TAO/tests/Param_Test/short.cpp @@ -17,12 +17,12 @@ // Test_Short // ************************************************************************ -Test_Short::Test_Short (void) +Test_Short::Test_Short () : opname_ (CORBA::string_dup ("test_short")) { } -Test_Short::~Test_Short (void) +Test_Short::~Test_Short () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -67,7 +67,7 @@ Test_Short::init_parameters (Param_Test_ptr /*objref*/) } int -Test_Short::reset_parameters (void) +Test_Short::reset_parameters () { this->inout_ = 0; this->out_ = 0; @@ -94,7 +94,7 @@ Test_Short::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Short::check_validity (void) +Test_Short::check_validity () { if (this->inout_ == this->in_ * 2 && this->out_ == this->in_ * 3 && @@ -111,7 +111,7 @@ Test_Short::check_validity (CORBA::Request_ptr /*req*/) } void -Test_Short::print_values (void) +Test_Short::print_values () { ACE_DEBUG ((LM_DEBUG, "\n=*=*=*=*=*=*\n" diff --git a/TAO/tests/Param_Test/short.h b/TAO/tests/Param_Test/short.h index 3434515f78e..f95f247001f 100644 --- a/TAO/tests/Param_Test/short.h +++ b/TAO/tests/Param_Test/short.h @@ -22,10 +22,10 @@ class Test_Short { public: /// ctor - Test_Short (void); + Test_Short (); /// dtor - ~Test_Short (void); + ~Test_Short (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -37,16 +37,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/small_union.cpp b/TAO/tests/Param_Test/small_union.cpp index a3f799d1576..8f00ade64f4 100644 --- a/TAO/tests/Param_Test/small_union.cpp +++ b/TAO/tests/Param_Test/small_union.cpp @@ -19,12 +19,12 @@ size_t Test_Small_Union::counter = 0; -Test_Small_Union::Test_Small_Union (void) +Test_Small_Union::Test_Small_Union () : opname_ (CORBA::string_dup ("test_small_union")) { } -Test_Small_Union::~Test_Small_Union (void) +Test_Small_Union::~Test_Small_Union () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -86,7 +86,7 @@ Test_Small_Union::init_parameters (Param_Test_ptr objref) } int -Test_Small_Union::reset_parameters (void) +Test_Small_Union::reset_parameters () { Generator *gen = GENERATOR::instance (); // value generator CORBA::ULong index = (counter++ % 2); @@ -133,7 +133,7 @@ Test_Small_Union::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Small_Union::check_validity (void) +Test_Small_Union::check_validity () { if (this->in_._d () != this->inout_._d () || this->in_._d () != this->out_->_d () @@ -183,6 +183,6 @@ Test_Small_Union::check_validity (CORBA::Request_ptr /*req*/) } void -Test_Small_Union::print_values (void) +Test_Small_Union::print_values () { } diff --git a/TAO/tests/Param_Test/small_union.h b/TAO/tests/Param_Test/small_union.h index 5a0479ba21c..c489d47dafb 100644 --- a/TAO/tests/Param_Test/small_union.h +++ b/TAO/tests/Param_Test/small_union.h @@ -22,10 +22,10 @@ class Test_Small_Union { public: /// ctor - Test_Small_Union (void); + Test_Small_Union (); /// dtor - ~Test_Small_Union (void); + ~Test_Small_Union (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -37,16 +37,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/typecode.cpp b/TAO/tests/Param_Test/typecode.cpp index edad685cef6..12f1cf02337 100644 --- a/TAO/tests/Param_Test/typecode.cpp +++ b/TAO/tests/Param_Test/typecode.cpp @@ -17,12 +17,12 @@ // Test_TypeCode // ************************************************************************ -Test_TypeCode::Test_TypeCode (void) +Test_TypeCode::Test_TypeCode () : opname_ (CORBA::string_dup ("test_typecode")) { } -Test_TypeCode::~Test_TypeCode (void) +Test_TypeCode::~Test_TypeCode () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -94,7 +94,7 @@ Test_TypeCode::init_parameters (Param_Test_ptr) } int -Test_TypeCode::reset_parameters (void) +Test_TypeCode::reset_parameters () { this->in_ = this->tc_holder_; this->inout_ = CORBA::TypeCode::_duplicate (CORBA::_tc_null); @@ -124,7 +124,7 @@ Test_TypeCode::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_TypeCode::check_validity (void) +Test_TypeCode::check_validity () { try { @@ -155,6 +155,6 @@ Test_TypeCode::check_validity (CORBA::Request_ptr) } void -Test_TypeCode::print_values (void) +Test_TypeCode::print_values () { } diff --git a/TAO/tests/Param_Test/typecode.h b/TAO/tests/Param_Test/typecode.h index 93c83c58b7d..16f261be28d 100644 --- a/TAO/tests/Param_Test/typecode.h +++ b/TAO/tests/Param_Test/typecode.h @@ -22,10 +22,10 @@ class Test_TypeCode { public: /// ctor - Test_TypeCode (void); + Test_TypeCode (); /// dtor - ~Test_TypeCode (void); + ~Test_TypeCode (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -37,16 +37,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/ub_any_seq.cpp b/TAO/tests/Param_Test/ub_any_seq.cpp index f1e3064a337..b471b54a13f 100644 --- a/TAO/tests/Param_Test/ub_any_seq.cpp +++ b/TAO/tests/Param_Test/ub_any_seq.cpp @@ -21,7 +21,7 @@ const CORBA::ULong NUM_TEST_TYPES = 4; // Test_AnySeq // ************************************************************************ -Test_AnySeq::Test_AnySeq (void) +Test_AnySeq::Test_AnySeq () : opname_ (CORBA::string_dup ("test_anyseq")), in_ (new CORBA::AnySeq (TEST_SEQ_LENGTH)), inout_ (new CORBA::AnySeq (TEST_SEQ_LENGTH)), @@ -30,7 +30,7 @@ Test_AnySeq::Test_AnySeq (void) { } -Test_AnySeq::~Test_AnySeq (void) +Test_AnySeq::~Test_AnySeq () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -140,7 +140,7 @@ Test_AnySeq::init_parameters (Param_Test_ptr objref) } int -Test_AnySeq::reset_parameters (void) +Test_AnySeq::reset_parameters () { Generator *gen = GENERATOR::instance (); // value generator @@ -203,7 +203,7 @@ Test_AnySeq::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_AnySeq::check_validity (void) +Test_AnySeq::check_validity () { CORBA::Short short_in, short_inout, short_out, short_ret; const char *str_in; @@ -286,7 +286,7 @@ Test_AnySeq::check_validity (CORBA::Request_ptr) } void -Test_AnySeq::print_values (void) +Test_AnySeq::print_values () { ACE_DEBUG ((LM_DEBUG, "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n" diff --git a/TAO/tests/Param_Test/ub_any_seq.h b/TAO/tests/Param_Test/ub_any_seq.h index 50e8431a480..03134228487 100644 --- a/TAO/tests/Param_Test/ub_any_seq.h +++ b/TAO/tests/Param_Test/ub_any_seq.h @@ -22,10 +22,10 @@ class Test_AnySeq { public: /// ctor - Test_AnySeq (void); + Test_AnySeq (); /// dtor - ~Test_AnySeq (void); + ~Test_AnySeq (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -37,16 +37,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/ub_array_seq.cpp b/TAO/tests/Param_Test/ub_array_seq.cpp index b6bc5487c9a..2b4370ab015 100644 --- a/TAO/tests/Param_Test/ub_array_seq.cpp +++ b/TAO/tests/Param_Test/ub_array_seq.cpp @@ -17,7 +17,7 @@ // Test_Array_Sequence // ************************************************************************ -Test_Array_Sequence::Test_Array_Sequence (void) +Test_Array_Sequence::Test_Array_Sequence () : opname_ (CORBA::string_dup ("test_array_sequence")), inout_ (new Param_Test::ArraySeq), out_ (new Param_Test::ArraySeq), @@ -25,7 +25,7 @@ Test_Array_Sequence::Test_Array_Sequence (void) { } -Test_Array_Sequence::~Test_Array_Sequence (void) +Test_Array_Sequence::~Test_Array_Sequence () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -104,7 +104,7 @@ Test_Array_Sequence::init_parameters (Param_Test_ptr) } int -Test_Array_Sequence::reset_parameters (void) +Test_Array_Sequence::reset_parameters () { // Delete the previous ones. this->inout_ = new Param_Test::ArraySeq; @@ -134,7 +134,7 @@ Test_Array_Sequence::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Array_Sequence::check_validity (void) +Test_Array_Sequence::check_validity () { if (this->compare (this->in_, this->inout_.in ()) && this->compare (this->in_, this->out_.in ()) && @@ -151,7 +151,7 @@ Test_Array_Sequence::check_validity (CORBA::Request_ptr ) } void -Test_Array_Sequence::print_values (void) +Test_Array_Sequence::print_values () { ACE_DEBUG ((LM_DEBUG, "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n" diff --git a/TAO/tests/Param_Test/ub_array_seq.h b/TAO/tests/Param_Test/ub_array_seq.h index 87701ffaee7..c2328da91c3 100644 --- a/TAO/tests/Param_Test/ub_array_seq.h +++ b/TAO/tests/Param_Test/ub_array_seq.h @@ -23,10 +23,10 @@ class Test_Array_Sequence { public: /// ctor - Test_Array_Sequence (void); + Test_Array_Sequence (); /// dtor - ~Test_Array_Sequence (void); + ~Test_Array_Sequence (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -38,16 +38,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/ub_long_seq.cpp b/TAO/tests/Param_Test/ub_long_seq.cpp index ace32631e54..2066e19c357 100644 --- a/TAO/tests/Param_Test/ub_long_seq.cpp +++ b/TAO/tests/Param_Test/ub_long_seq.cpp @@ -17,7 +17,7 @@ // Test_Long_Sequence // ************************************************************************ -Test_Long_Sequence::Test_Long_Sequence (void) +Test_Long_Sequence::Test_Long_Sequence () : opname_ (CORBA::string_dup ("test_long_sequence")), in_ (new CORBA::LongSeq), inout_ (new CORBA::LongSeq), @@ -26,7 +26,7 @@ Test_Long_Sequence::Test_Long_Sequence (void) { } -Test_Long_Sequence::~Test_Long_Sequence (void) +Test_Long_Sequence::~Test_Long_Sequence () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -85,7 +85,7 @@ Test_Long_Sequence::init_parameters (Param_Test_ptr) } int -Test_Long_Sequence::reset_parameters (void) +Test_Long_Sequence::reset_parameters () { this->inout_ = new CORBA::LongSeq; // delete the previous ones this->out_ = new CORBA::LongSeq; @@ -114,7 +114,7 @@ Test_Long_Sequence::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Long_Sequence::check_validity (void) +Test_Long_Sequence::check_validity () { CORBA::Boolean flag = 0; if ((this->in_->length () == this->inout_->length ()) && @@ -142,7 +142,7 @@ Test_Long_Sequence::check_validity (CORBA::Request_ptr ) } void -Test_Long_Sequence::print_values (void) +Test_Long_Sequence::print_values () { CORBA::ULong i; ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n")); diff --git a/TAO/tests/Param_Test/ub_long_seq.h b/TAO/tests/Param_Test/ub_long_seq.h index 4050e7dc570..1c0408c8c2f 100644 --- a/TAO/tests/Param_Test/ub_long_seq.h +++ b/TAO/tests/Param_Test/ub_long_seq.h @@ -23,10 +23,10 @@ class Test_Long_Sequence { public: /// ctor - Test_Long_Sequence (void); + Test_Long_Sequence (); /// dtor - ~Test_Long_Sequence (void); + ~Test_Long_Sequence (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -38,16 +38,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/ub_objref_seq.cpp b/TAO/tests/Param_Test/ub_objref_seq.cpp index a0984f2250a..29c31d7cd3f 100644 --- a/TAO/tests/Param_Test/ub_objref_seq.cpp +++ b/TAO/tests/Param_Test/ub_objref_seq.cpp @@ -26,7 +26,7 @@ static const char *Coffee_Flavor [] = { "Swiss Chocolate Mocha" }; -Test_ObjRef_Sequence::Test_ObjRef_Sequence (void) +Test_ObjRef_Sequence::Test_ObjRef_Sequence () : opname_ (CORBA::string_dup ("test_coffe_mix")), inout_ (new Param_Test::Coffee_Mix), out_ (new Param_Test::Coffee_Mix), @@ -34,7 +34,7 @@ Test_ObjRef_Sequence::Test_ObjRef_Sequence (void) { } -Test_ObjRef_Sequence::~Test_ObjRef_Sequence (void) +Test_ObjRef_Sequence::~Test_ObjRef_Sequence () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -115,7 +115,7 @@ Test_ObjRef_Sequence::init_parameters (Param_Test_ptr objref) } int -Test_ObjRef_Sequence::reset_parameters (void) +Test_ObjRef_Sequence::reset_parameters () { this->inout_ = new Param_Test::Coffee_Mix; // delete the previous ones this->out_ = new Param_Test::Coffee_Mix; @@ -144,7 +144,7 @@ Test_ObjRef_Sequence::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_ObjRef_Sequence::check_validity (void) +Test_ObjRef_Sequence::check_validity () { try { @@ -174,7 +174,7 @@ Test_ObjRef_Sequence::check_validity (CORBA::Request_ptr ) } void -Test_ObjRef_Sequence::print_values (void) +Test_ObjRef_Sequence::print_values () { ACE_DEBUG ((LM_DEBUG, "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n" diff --git a/TAO/tests/Param_Test/ub_objref_seq.h b/TAO/tests/Param_Test/ub_objref_seq.h index b9165d990cb..79c70d8bf1f 100644 --- a/TAO/tests/Param_Test/ub_objref_seq.h +++ b/TAO/tests/Param_Test/ub_objref_seq.h @@ -23,10 +23,10 @@ class Test_ObjRef_Sequence { public: /// ctor - Test_ObjRef_Sequence (void); + Test_ObjRef_Sequence (); /// dtor - ~Test_ObjRef_Sequence (void); + ~Test_ObjRef_Sequence (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -38,16 +38,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/ub_short_seq.cpp b/TAO/tests/Param_Test/ub_short_seq.cpp index c0d44106fe3..b87466b81d7 100644 --- a/TAO/tests/Param_Test/ub_short_seq.cpp +++ b/TAO/tests/Param_Test/ub_short_seq.cpp @@ -17,7 +17,7 @@ // Test_Short_Sequence // ************************************************************************ -Test_Short_Sequence::Test_Short_Sequence (void) +Test_Short_Sequence::Test_Short_Sequence () : opname_ (CORBA::string_dup ("test_short_sequence")), in_ (new CORBA::ShortSeq), inout_ (new CORBA::ShortSeq), @@ -26,7 +26,7 @@ Test_Short_Sequence::Test_Short_Sequence (void) { } -Test_Short_Sequence::~Test_Short_Sequence (void) +Test_Short_Sequence::~Test_Short_Sequence () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -87,7 +87,7 @@ Test_Short_Sequence::init_parameters (Param_Test_ptr) } int -Test_Short_Sequence::reset_parameters (void) +Test_Short_Sequence::reset_parameters () { this->inout_ = new CORBA::ShortSeq; // delete the previous ones this->out_ = new CORBA::ShortSeq; @@ -116,7 +116,7 @@ Test_Short_Sequence::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Short_Sequence::check_validity (void) +Test_Short_Sequence::check_validity () { CORBA::Boolean flag = 0; if ((this->in_->length () == this->inout_->length ()) && @@ -144,7 +144,7 @@ Test_Short_Sequence::check_validity (CORBA::Request_ptr ) } void -Test_Short_Sequence::print_values (void) +Test_Short_Sequence::print_values () { CORBA::ULong i; ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n")); diff --git a/TAO/tests/Param_Test/ub_short_seq.h b/TAO/tests/Param_Test/ub_short_seq.h index 1105cae9bf7..1aafe12fa2f 100644 --- a/TAO/tests/Param_Test/ub_short_seq.h +++ b/TAO/tests/Param_Test/ub_short_seq.h @@ -23,10 +23,10 @@ class Test_Short_Sequence { public: /// ctor - Test_Short_Sequence (void); + Test_Short_Sequence (); /// dtor - ~Test_Short_Sequence (void); + ~Test_Short_Sequence (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -38,16 +38,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp index 42059a4cc16..979ee4d1ff2 100644 --- a/TAO/tests/Param_Test/ub_str_seq.cpp +++ b/TAO/tests/Param_Test/ub_str_seq.cpp @@ -17,7 +17,7 @@ // Test_String_Sequence // ************************************************************************ -Test_String_Sequence::Test_String_Sequence (void) +Test_String_Sequence::Test_String_Sequence () : opname_ (CORBA::string_dup ("test_strseq")), in_ (new CORBA::StringSeq), inout_ (new CORBA::StringSeq), @@ -26,7 +26,7 @@ Test_String_Sequence::Test_String_Sequence (void) { } -Test_String_Sequence::~Test_String_Sequence (void) +Test_String_Sequence::~Test_String_Sequence () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -91,7 +91,7 @@ Test_String_Sequence::init_parameters (Param_Test_ptr) } int -Test_String_Sequence::reset_parameters (void) +Test_String_Sequence::reset_parameters () { this->inout_ = new CORBA::StringSeq; // delete the previous ones this->out_ = new CORBA::StringSeq; @@ -120,7 +120,7 @@ Test_String_Sequence::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_String_Sequence::check_validity (void) +Test_String_Sequence::check_validity () { CORBA::Boolean flag = 0; if ((this->in_->length () == this->inout_->length ()) && @@ -148,7 +148,7 @@ Test_String_Sequence::check_validity (CORBA::Request_ptr ) } void -Test_String_Sequence::print_values (void) +Test_String_Sequence::print_values () { CORBA::ULong i; ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n")); diff --git a/TAO/tests/Param_Test/ub_str_seq.h b/TAO/tests/Param_Test/ub_str_seq.h index a4340e8c5d5..28392276af0 100644 --- a/TAO/tests/Param_Test/ub_str_seq.h +++ b/TAO/tests/Param_Test/ub_str_seq.h @@ -23,10 +23,10 @@ class Test_String_Sequence { public: /// ctor - Test_String_Sequence (void); + Test_String_Sequence (); /// dtor - ~Test_String_Sequence (void); + ~Test_String_Sequence (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -38,16 +38,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/ub_string.cpp b/TAO/tests/Param_Test/ub_string.cpp index c155a65bf85..75c70bd84b8 100644 --- a/TAO/tests/Param_Test/ub_string.cpp +++ b/TAO/tests/Param_Test/ub_string.cpp @@ -17,7 +17,7 @@ // Test_Unbounded_String // ************************************************************************ -Test_Unbounded_String::Test_Unbounded_String (void) +Test_Unbounded_String::Test_Unbounded_String () : opname_ (CORBA::string_dup ("test_unbounded_string")), in_ (0), inout_ (0), @@ -26,7 +26,7 @@ Test_Unbounded_String::Test_Unbounded_String (void) { } -Test_Unbounded_String::~Test_Unbounded_String (void) +Test_Unbounded_String::~Test_Unbounded_String () { CORBA::string_free (this->opname_); CORBA::string_free (this->in_); @@ -97,7 +97,7 @@ Test_Unbounded_String::init_parameters (Param_Test_ptr) } int -Test_Unbounded_String::reset_parameters (void) +Test_Unbounded_String::reset_parameters () { // release any previously occupied values CORBA::string_free (this->inout_); @@ -132,7 +132,7 @@ Test_Unbounded_String::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Unbounded_String::check_validity (void) +Test_Unbounded_String::check_validity () { CORBA::ULong len = ACE_OS::strlen (this->in_); @@ -155,7 +155,7 @@ Test_Unbounded_String::check_validity (CORBA::Request_ptr ) } void -Test_Unbounded_String::print_values (void) +Test_Unbounded_String::print_values () { ACE_DEBUG ((LM_DEBUG, "\n=*=*=*=*=*=*\n" diff --git a/TAO/tests/Param_Test/ub_string.h b/TAO/tests/Param_Test/ub_string.h index d633291c015..92f0f4f61c6 100644 --- a/TAO/tests/Param_Test/ub_string.h +++ b/TAO/tests/Param_Test/ub_string.h @@ -21,10 +21,10 @@ class Test_Unbounded_String { public: /// ctor - Test_Unbounded_String (void); + Test_Unbounded_String (); /// dtor - ~Test_Unbounded_String (void); + ~Test_Unbounded_String (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -36,16 +36,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/ub_struct_seq.cpp b/TAO/tests/Param_Test/ub_struct_seq.cpp index 694796a5990..41b7bfa40ec 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.cpp +++ b/TAO/tests/Param_Test/ub_struct_seq.cpp @@ -18,7 +18,7 @@ // Test_Struct_Sequence // ************************************************************************ -Test_Struct_Sequence::Test_Struct_Sequence (void) +Test_Struct_Sequence::Test_Struct_Sequence () : opname_ (CORBA::string_dup ("test_struct_sequence")), inout_ (new Param_Test::StructSeq), out_ (new Param_Test::StructSeq), @@ -26,7 +26,7 @@ Test_Struct_Sequence::Test_Struct_Sequence (void) { } -Test_Struct_Sequence::~Test_Struct_Sequence (void) +Test_Struct_Sequence::~Test_Struct_Sequence () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -89,7 +89,7 @@ Test_Struct_Sequence::init_parameters (Param_Test_ptr) } int -Test_Struct_Sequence::reset_parameters (void) +Test_Struct_Sequence::reset_parameters () { this->inout_ = new Param_Test::StructSeq; // delete the previous one this->out_ = new Param_Test::StructSeq; @@ -118,7 +118,7 @@ Test_Struct_Sequence::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Struct_Sequence::check_validity (void) +Test_Struct_Sequence::check_validity () { if (this->compare (this->in_, this->inout_.in ()) && this->compare (this->in_, this->out_.in ()) && @@ -135,7 +135,7 @@ Test_Struct_Sequence::check_validity (CORBA::Request_ptr ) } void -Test_Struct_Sequence::print_values (void) +Test_Struct_Sequence::print_values () { ACE_DEBUG ((LM_DEBUG, "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n" @@ -214,7 +214,7 @@ Test_Struct_Sequence::print_sequence (const Param_Test::StructSeq &s) // Test_Unbounded_Struct_Sequence // ************************************************************************ -Test_Unbounded_Struct_Sequence::Test_Unbounded_Struct_Sequence (void) +Test_Unbounded_Struct_Sequence::Test_Unbounded_Struct_Sequence () : opname_ (CORBA::string_dup ("test_unbounded_struct_sequence")), inout_ (new Param_Test::PathSpec), out_ (new Param_Test::PathSpec), @@ -222,7 +222,7 @@ Test_Unbounded_Struct_Sequence::Test_Unbounded_Struct_Sequence (void) { } -Test_Unbounded_Struct_Sequence::~Test_Unbounded_Struct_Sequence (void) +Test_Unbounded_Struct_Sequence::~Test_Unbounded_Struct_Sequence () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -286,7 +286,7 @@ Test_Unbounded_Struct_Sequence::init_parameters (Param_Test_ptr) } int -Test_Unbounded_Struct_Sequence::reset_parameters (void) +Test_Unbounded_Struct_Sequence::reset_parameters () { this->inout_ = new Param_Test::PathSpec; // delete the previous one this->out_ = new Param_Test::PathSpec; @@ -306,7 +306,7 @@ Test_Unbounded_Struct_Sequence::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Unbounded_Struct_Sequence::check_validity (void) +Test_Unbounded_Struct_Sequence::check_validity () { if (this->compare (this->in_, this->inout_.in ()) && this->compare (this->in_, this->out_.in ()) && @@ -323,7 +323,7 @@ Test_Unbounded_Struct_Sequence::check_validity (CORBA::Request_ptr ) } void -Test_Unbounded_Struct_Sequence::print_values (void) +Test_Unbounded_Struct_Sequence::print_values () { ACE_DEBUG ((LM_DEBUG, "*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*=*\n" diff --git a/TAO/tests/Param_Test/ub_struct_seq.h b/TAO/tests/Param_Test/ub_struct_seq.h index 22c18764a05..835b2abc195 100644 --- a/TAO/tests/Param_Test/ub_struct_seq.h +++ b/TAO/tests/Param_Test/ub_struct_seq.h @@ -23,10 +23,10 @@ class Test_Struct_Sequence { public: /// ctor - Test_Struct_Sequence (void); + Test_Struct_Sequence (); /// dtor - ~Test_Struct_Sequence (void); + ~Test_Struct_Sequence (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -38,16 +38,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); @@ -83,10 +83,10 @@ class Test_Unbounded_Struct_Sequence { public: /// ctor - Test_Unbounded_Struct_Sequence (void); + Test_Unbounded_Struct_Sequence (); /// dtor - ~Test_Unbounded_Struct_Sequence (void); + ~Test_Unbounded_Struct_Sequence (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -98,16 +98,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/ub_wstr_seq.cpp b/TAO/tests/Param_Test/ub_wstr_seq.cpp index c2777d6a899..732dfa60d43 100644 --- a/TAO/tests/Param_Test/ub_wstr_seq.cpp +++ b/TAO/tests/Param_Test/ub_wstr_seq.cpp @@ -18,7 +18,7 @@ // Test_WString_Sequence // ************************************************************************ -Test_WString_Sequence::Test_WString_Sequence (void) +Test_WString_Sequence::Test_WString_Sequence () : opname_ (CORBA::string_dup ("test_wstrseq")), in_ (new CORBA::WStringSeq), inout_ (new CORBA::WStringSeq), @@ -27,7 +27,7 @@ Test_WString_Sequence::Test_WString_Sequence (void) { } -Test_WString_Sequence::~Test_WString_Sequence (void) +Test_WString_Sequence::~Test_WString_Sequence () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -87,7 +87,7 @@ Test_WString_Sequence::init_parameters (Param_Test_ptr) } int -Test_WString_Sequence::reset_parameters (void) +Test_WString_Sequence::reset_parameters () { this->inout_ = new CORBA::WStringSeq; // delete the previous ones this->out_ = new CORBA::WStringSeq; @@ -116,7 +116,7 @@ Test_WString_Sequence::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_WString_Sequence::check_validity (void) +Test_WString_Sequence::check_validity () { CORBA::Boolean flag = 0; if ((this->in_->length () == this->inout_->length ()) && @@ -144,6 +144,6 @@ Test_WString_Sequence::check_validity (CORBA::Request_ptr ) } void -Test_WString_Sequence::print_values (void) +Test_WString_Sequence::print_values () { } diff --git a/TAO/tests/Param_Test/ub_wstr_seq.h b/TAO/tests/Param_Test/ub_wstr_seq.h index 8e30b16baf3..2c9f0e1ecd5 100644 --- a/TAO/tests/Param_Test/ub_wstr_seq.h +++ b/TAO/tests/Param_Test/ub_wstr_seq.h @@ -23,10 +23,10 @@ class Test_WString_Sequence { public: /// ctor - Test_WString_Sequence (void); + Test_WString_Sequence (); /// dtor - ~Test_WString_Sequence (void); + ~Test_WString_Sequence (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -38,16 +38,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/ub_wstring.cpp b/TAO/tests/Param_Test/ub_wstring.cpp index 0c29105ecc3..a7cb2661178 100644 --- a/TAO/tests/Param_Test/ub_wstring.cpp +++ b/TAO/tests/Param_Test/ub_wstring.cpp @@ -18,7 +18,7 @@ // Test_Unbounded_WString // ************************************************************************ -Test_Unbounded_WString::Test_Unbounded_WString (void) +Test_Unbounded_WString::Test_Unbounded_WString () : opname_ (CORBA::string_dup ("test_unbounded_wstring")), in_ (0), inout_ (0), @@ -27,7 +27,7 @@ Test_Unbounded_WString::Test_Unbounded_WString (void) { } -Test_Unbounded_WString::~Test_Unbounded_WString (void) +Test_Unbounded_WString::~Test_Unbounded_WString () { CORBA::string_free (this->opname_); CORBA::wstring_free (this->in_); @@ -97,7 +97,7 @@ Test_Unbounded_WString::init_parameters (Param_Test_ptr) } int -Test_Unbounded_WString::reset_parameters (void) +Test_Unbounded_WString::reset_parameters () { // release any previously occupied values CORBA::wstring_free (this->inout_); @@ -132,7 +132,7 @@ Test_Unbounded_WString::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Unbounded_WString::check_validity (void) +Test_Unbounded_WString::check_validity () { CORBA::ULong len = ACE_OS::wslen (this->in_); @@ -155,6 +155,6 @@ Test_Unbounded_WString::check_validity (CORBA::Request_ptr ) } void -Test_Unbounded_WString::print_values (void) +Test_Unbounded_WString::print_values () { } diff --git a/TAO/tests/Param_Test/ub_wstring.h b/TAO/tests/Param_Test/ub_wstring.h index 9363e126dc9..f8a4b2869cc 100644 --- a/TAO/tests/Param_Test/ub_wstring.h +++ b/TAO/tests/Param_Test/ub_wstring.h @@ -22,10 +22,10 @@ class Test_Unbounded_WString { public: /// ctor - Test_Unbounded_WString (void); + Test_Unbounded_WString (); /// dtor - ~Test_Unbounded_WString (void); + ~Test_Unbounded_WString (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -37,16 +37,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/ulonglong.cpp b/TAO/tests/Param_Test/ulonglong.cpp index 241323e65f2..f605579e183 100644 --- a/TAO/tests/Param_Test/ulonglong.cpp +++ b/TAO/tests/Param_Test/ulonglong.cpp @@ -13,12 +13,12 @@ #include "helper.h" #include "ulonglong.h" -Test_ULongLong::Test_ULongLong (void) +Test_ULongLong::Test_ULongLong () : opname_ (CORBA::string_dup ("test_ulonglong")) { } -Test_ULongLong::~Test_ULongLong (void) +Test_ULongLong::~Test_ULongLong () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -63,7 +63,7 @@ Test_ULongLong::init_parameters (Param_Test_ptr) } int -Test_ULongLong::reset_parameters (void) +Test_ULongLong::reset_parameters () { this->inout_ = 0; this->out_ = 0; @@ -91,7 +91,7 @@ Test_ULongLong::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_ULongLong::check_validity (void) +Test_ULongLong::check_validity () { if (this->inout_ == this->in_ * 2 && this->out_ == this->in_ * 3 && @@ -108,7 +108,7 @@ Test_ULongLong::check_validity (CORBA::Request_ptr ) } void -Test_ULongLong::print_values (void) +Test_ULongLong::print_values () { ACE_DEBUG ((LM_DEBUG, "\n=*=*=*=*=*=*\n" diff --git a/TAO/tests/Param_Test/ulonglong.h b/TAO/tests/Param_Test/ulonglong.h index 3ac6270a6a9..44c091b0f52 100644 --- a/TAO/tests/Param_Test/ulonglong.h +++ b/TAO/tests/Param_Test/ulonglong.h @@ -19,10 +19,10 @@ class Test_ULongLong { public: /// ctor - Test_ULongLong (void); + Test_ULongLong (); /// dtor - ~Test_ULongLong (void); + ~Test_ULongLong (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -34,16 +34,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/var_array.cpp b/TAO/tests/Param_Test/var_array.cpp index 21b03d99ff2..52697acbe29 100644 --- a/TAO/tests/Param_Test/var_array.cpp +++ b/TAO/tests/Param_Test/var_array.cpp @@ -17,14 +17,14 @@ // Test_Var_Array // ************************************************************************ -Test_Var_Array::Test_Var_Array (void) +Test_Var_Array::Test_Var_Array () : opname_ (CORBA::string_dup ("test_var_array")), out_ (new Param_Test::Var_Array), ret_ (new Param_Test::Var_Array) { } -Test_Var_Array::~Test_Var_Array (void) +Test_Var_Array::~Test_Var_Array () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -79,7 +79,7 @@ Test_Var_Array::init_parameters (Param_Test_ptr) } int -Test_Var_Array::reset_parameters (void) +Test_Var_Array::reset_parameters () { // free the out, and return value arrays Param_Test::Var_Array_free (this->out_._retn ()); @@ -109,7 +109,7 @@ Test_Var_Array::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Var_Array::check_validity (void) +Test_Var_Array::check_validity () { if (this->compare (this->in_, this->inout_) && this->compare (this->in_, this->out_.in ()) && @@ -138,7 +138,7 @@ Test_Var_Array::compare (const Param_Test::Var_Array_slice *a1, } void -Test_Var_Array::print_values (void) +Test_Var_Array::print_values () { ACE_DEBUG ((LM_DEBUG, "IN array\n")); this->print (this->in_); diff --git a/TAO/tests/Param_Test/var_array.h b/TAO/tests/Param_Test/var_array.h index 6bdfb158f99..a2819a96748 100644 --- a/TAO/tests/Param_Test/var_array.h +++ b/TAO/tests/Param_Test/var_array.h @@ -22,10 +22,10 @@ class Test_Var_Array { public: /// ctor - Test_Var_Array (void); + Test_Var_Array (); /// dtor - ~Test_Var_Array (void); + ~Test_Var_Array (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -37,16 +37,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp index f574a260093..e865893a4bc 100644 --- a/TAO/tests/Param_Test/var_struct.cpp +++ b/TAO/tests/Param_Test/var_struct.cpp @@ -17,7 +17,7 @@ // Test_Var_Struct // ************************************************************************ -Test_Var_Struct::Test_Var_Struct (void) +Test_Var_Struct::Test_Var_Struct () : opname_ (CORBA::string_dup ("test_var_struct")), inout_ (new Param_Test::Var_Struct), out_ (new Param_Test::Var_Struct), @@ -25,7 +25,7 @@ Test_Var_Struct::Test_Var_Struct (void) { } -Test_Var_Struct::~Test_Var_Struct (void) +Test_Var_Struct::~Test_Var_Struct () { CORBA::string_free (this->opname_); this->opname_ = 0; @@ -102,7 +102,7 @@ Test_Var_Struct::init_parameters (Param_Test_ptr) } int -Test_Var_Struct::reset_parameters (void) +Test_Var_Struct::reset_parameters () { this->inout_ = new Param_Test::Var_Struct; // delete the previous ones this->out_ = new Param_Test::Var_Struct; @@ -139,7 +139,7 @@ Test_Var_Struct::run_sii_test (Param_Test_ptr objref) } CORBA::Boolean -Test_Var_Struct::check_validity (void) +Test_Var_Struct::check_validity () { CORBA::Boolean flag = 0; if (ACE::is_equal (this->in_.dbl, this->inout_->dbl) && @@ -182,7 +182,7 @@ Test_Var_Struct::check_validity (CORBA::Request_ptr ) } void -Test_Var_Struct::print_values (void) +Test_Var_Struct::print_values () { ACE_DEBUG ((LM_DEBUG, "\n*=*=*=*=*=*=*=*=*=*=\n" diff --git a/TAO/tests/Param_Test/var_struct.h b/TAO/tests/Param_Test/var_struct.h index 810060418bd..63744ac5301 100644 --- a/TAO/tests/Param_Test/var_struct.h +++ b/TAO/tests/Param_Test/var_struct.h @@ -23,10 +23,10 @@ class Test_Var_Struct { public: /// ctor - Test_Var_Struct (void); + Test_Var_Struct (); /// dtor - ~Test_Var_Struct (void); + ~Test_Var_Struct (); /// run the SII test int run_sii_test (Param_Test_ptr objref); @@ -38,16 +38,16 @@ public: int init_parameters (Param_Test_ptr objref); /// reset values for CORBA - int reset_parameters (void); + int reset_parameters (); /// check if results are valid - CORBA::Boolean check_validity (void); + CORBA::Boolean check_validity (); /// check if results are valid. This is used for DII results CORBA::Boolean check_validity (CORBA::Request_ptr req); /// print all the values - void print_values (void); + void print_values (); /// invoke DII request with appropriate exception handling. void dii_req_invoke (CORBA::Request *); diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp index 1c8ca3a272f..1138c02984e 100644 --- a/TAO/tests/Policies/Manipulation.cpp +++ b/TAO/tests/Policies/Manipulation.cpp @@ -269,7 +269,7 @@ Manipulation::perform_iteration (unsigned int *seed, int -Manipulation::svc (void) +Manipulation::svc () { try { diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp index 470fb405b73..bb5950624a9 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.cpp @@ -17,18 +17,18 @@ unsigned long Echo_Client_Request_Interceptor::other_count = 0; unsigned long Echo_Client_Request_Interceptor::exception_count = 0; Echo_Client_Request_Interceptor:: -Echo_Client_Request_Interceptor (void) +Echo_Client_Request_Interceptor () { } char * -Echo_Client_Request_Interceptor::name (void) +Echo_Client_Request_Interceptor::name () { return CORBA::string_dup ("Echo_Client_Interceptor"); } void -Echo_Client_Request_Interceptor::destroy (void) +Echo_Client_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h index 9caeacbf816..423d2b4c3c5 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/AMI/Client_Interceptor.h @@ -16,17 +16,17 @@ class Echo_Client_Request_Interceptor , public virtual ::CORBA::LocalObject { public: - Echo_Client_Request_Interceptor (void); + Echo_Client_Request_Interceptor (); static unsigned long request_count; static unsigned long reply_count; static unsigned long other_count; static unsigned long exception_count; - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo.cpp index 6c61020b8ad..8f2d59e1c85 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Echo.cpp @@ -17,7 +17,7 @@ Echo::echo_operation(char const * the_input) } void -Echo::shutdown(void) +Echo::shutdown() { this->orb_->shutdown(0); } diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo.h b/TAO/tests/Portable_Interceptors/AMI/Echo.h index 08ccf99822a..cfeeb682916 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo.h +++ b/TAO/tests/Portable_Interceptors/AMI/Echo.h @@ -16,7 +16,7 @@ public: Echo(CORBA::ORB_ptr orb); virtual char * echo_operation(char const * the_input); - virtual void shutdown(void); + virtual void shutdown(); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp index f42f292c474..5035f9222a8 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp @@ -5,7 +5,7 @@ */ #include "Echo_Handler.h" -Echo_Handler::Echo_Handler(void) +Echo_Handler::Echo_Handler() : replies_ (0) { } @@ -22,7 +22,7 @@ Echo_Handler::echo_operation_excep (::Messaging::ExceptionHolder *) } void -Echo_Handler::shutdown (void) +Echo_Handler::shutdown () { } diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h index da7f3446d66..c6724297e0f 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h +++ b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.h @@ -13,11 +13,11 @@ class Echo_Handler : public POA_Test::AMI_EchoHandler { public: - Echo_Handler(void); + Echo_Handler(); virtual void echo_operation(char const * retval); virtual void echo_operation_excep(::Messaging::ExceptionHolder * h); - virtual void shutdown(void); + virtual void shutdown(); virtual void shutdown_excep(::Messaging::ExceptionHolder * h); CORBA::ULong replies () const; diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp index 8c66d25f688..4ad01b0f983 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.cpp @@ -9,18 +9,18 @@ #include "tao/OctetSeqC.h" #include "ace/OS_NS_string.h" -Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) +Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor () { } char * -Echo_Server_Request_Interceptor::name (void) +Echo_Server_Request_Interceptor::name () { return CORBA::string_dup ("Echo_Server_Interceptor"); } void -Echo_Server_Request_Interceptor::destroy (void) +Echo_Server_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h index 9c1a3479fd2..642eb6ed55f 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/AMI/Server_Interceptor.h @@ -18,9 +18,9 @@ class Echo_Server_Request_Interceptor public: Echo_Server_Request_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/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp index 90f68a20090..3937b416bee 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.cpp @@ -7,7 +7,7 @@ #include "Server_ORBInitializer.h" #include "Server_Interceptor.h" -Server_ORBInitializer::Server_ORBInitializer (void) +Server_ORBInitializer::Server_ORBInitializer () { } diff --git a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h index e7d40ed1447..22e298362fe 100644 --- a/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/AMI/Server_ORBInitializer.h @@ -16,7 +16,7 @@ class Server_ORBInitializer , public virtual ::CORBA::LocalObject { public: - Server_ORBInitializer (void); + Server_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp index 62e80790483..2b058217bb8 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp @@ -8,7 +8,7 @@ const CORBA::ULong request_ctx_id = 0xdead; //const CORBA::ULong reply_ctx_id = 0xbeef; // Never used. -Vault_Client_Request_Interceptor::Vault_Client_Request_Interceptor (void) +Vault_Client_Request_Interceptor::Vault_Client_Request_Interceptor () : myname_ ("Vault_Client_Interceptor") { } @@ -18,13 +18,13 @@ Vault_Client_Request_Interceptor::~Vault_Client_Request_Interceptor () } char * -Vault_Client_Request_Interceptor::name (void) +Vault_Client_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Vault_Client_Request_Interceptor::destroy (void) +Vault_Client_Request_Interceptor::destroy () { } @@ -119,7 +119,7 @@ Vault_Client_Request_Interceptor::receive_exception ( ////////////////////////////////// Context ///////////////////////// -Vault_Client_Request_Context_Interceptor::Vault_Client_Request_Context_Interceptor (void) +Vault_Client_Request_Context_Interceptor::Vault_Client_Request_Context_Interceptor () : myname_ ("Vault_Client_Context_Interceptor") { } @@ -205,7 +205,7 @@ Vault_Client_Request_Context_Interceptor::receive_exception ( ///////////////////////////////////Dynamic //////////////////////////////////// -Vault_Client_Request_Dynamic_Interceptor::Vault_Client_Request_Dynamic_Interceptor (void) +Vault_Client_Request_Dynamic_Interceptor::Vault_Client_Request_Dynamic_Interceptor () : myname_ ("Vault_Client_Dynamic_Interceptor") { } @@ -318,7 +318,7 @@ Vault_Client_Request_Dynamic_Interceptor::receive_exception ( //////////////////////////////NOOP/////////////////////////////////////// -Vault_Client_Request_NOOP_Interceptor::Vault_Client_Request_NOOP_Interceptor (void) +Vault_Client_Request_NOOP_Interceptor::Vault_Client_Request_NOOP_Interceptor () : myname_ ("Vault_Client_NOOP_Interceptor") { } @@ -328,7 +328,7 @@ Vault_Client_Request_NOOP_Interceptor::~Vault_Client_Request_NOOP_Interceptor () } char * -Vault_Client_Request_NOOP_Interceptor::name (void) +Vault_Client_Request_NOOP_Interceptor::name () { return CORBA::string_dup (this->myname_); } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h index de95918d721..c03c79af263 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.h @@ -23,15 +23,15 @@ class Vault_Client_Request_Interceptor { // = Client-side Vault interceptor. For checking interceptor visually only. public: - Vault_Client_Request_Interceptor (void); + Vault_Client_Request_Interceptor (); // ctor. virtual ~Vault_Client_Request_Interceptor (); // dtor. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); @@ -53,15 +53,15 @@ class Vault_Client_Request_Context_Interceptor { // = Client-side Vault interceptor. For checking interceptor visually only. public: - Vault_Client_Request_Context_Interceptor (void); + Vault_Client_Request_Context_Interceptor (); // ctor. virtual ~Vault_Client_Request_Context_Interceptor (); // dtor. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); @@ -83,15 +83,15 @@ class Vault_Client_Request_Dynamic_Interceptor { // = Client-side Vault interceptor. For checking interceptor visually only. public: - Vault_Client_Request_Dynamic_Interceptor (void); + Vault_Client_Request_Dynamic_Interceptor (); // ctor. virtual ~Vault_Client_Request_Dynamic_Interceptor (); // dtor. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); @@ -113,15 +113,15 @@ class Vault_Client_Request_NOOP_Interceptor { // = Client-side Vault interceptor. For checking interceptor visually only. public: - Vault_Client_Request_NOOP_Interceptor (void); + Vault_Client_Request_NOOP_Interceptor (); // ctor. virtual ~Vault_Client_Request_NOOP_Interceptor (); // dtor. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp index eaf668deda6..ca63b652bc1 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp @@ -8,7 +8,7 @@ const CORBA::ULong request_ctx_id = 0xdead; //const CORBA::ULong reply_ctx_id = 0xbeef; // Never used. -Vault_Server_Request_Interceptor::Vault_Server_Request_Interceptor (void) +Vault_Server_Request_Interceptor::Vault_Server_Request_Interceptor () : myname_ ("Vault_Server_Interceptor") { } @@ -18,13 +18,13 @@ Vault_Server_Request_Interceptor::~Vault_Server_Request_Interceptor () } char * -Vault_Server_Request_Interceptor::name (void) +Vault_Server_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Vault_Server_Request_Interceptor::destroy (void) +Vault_Server_Request_Interceptor::destroy () { } @@ -100,7 +100,7 @@ Vault_Server_Request_Interceptor::send_other ( ////////////////////////////////// Context ///////////////////////// -Vault_Server_Request_Context_Interceptor::Vault_Server_Request_Context_Interceptor (void) +Vault_Server_Request_Context_Interceptor::Vault_Server_Request_Context_Interceptor () : myname_ ("Vault_Server_Context_Interceptor") { } @@ -162,7 +162,7 @@ Vault_Server_Request_Context_Interceptor::send_other ( ///////////////////////////////////Dynamic //////////////////////////////////// -Vault_Server_Request_Dynamic_Interceptor::Vault_Server_Request_Dynamic_Interceptor (void) +Vault_Server_Request_Dynamic_Interceptor::Vault_Server_Request_Dynamic_Interceptor () : myname_ ("Vault_Server_Dynamic_Interceptor") { } @@ -258,7 +258,7 @@ Vault_Server_Request_Dynamic_Interceptor::send_other ( //////////////////////////////NOOP/////////////////////////////////////// -Vault_Server_Request_NOOP_Interceptor::Vault_Server_Request_NOOP_Interceptor (void) +Vault_Server_Request_NOOP_Interceptor::Vault_Server_Request_NOOP_Interceptor () : myname_ ("Vault_Server_NOOP_Interceptor") { } @@ -268,7 +268,7 @@ Vault_Server_Request_NOOP_Interceptor::~Vault_Server_Request_NOOP_Interceptor () } char * -Vault_Server_Request_NOOP_Interceptor::name (void) +Vault_Server_Request_NOOP_Interceptor::name () { return CORBA::string_dup (this->myname_); } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h index 0f2492ffa39..81b3db59fea 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.h @@ -23,15 +23,15 @@ class Vault_Server_Request_Interceptor { // = Server-side Vault interceptor. For checking interceptor visually only. public: - Vault_Server_Request_Interceptor (void); + Vault_Server_Request_Interceptor (); // cotr. ~Vault_Server_Request_Interceptor (); // dotr. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); @@ -54,15 +54,15 @@ class Vault_Server_Request_Context_Interceptor { // = Server-side Vault interceptor. For checking interceptor visually only. public: - Vault_Server_Request_Context_Interceptor (void); + Vault_Server_Request_Context_Interceptor (); // cotr. ~Vault_Server_Request_Context_Interceptor (); // dotr. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); @@ -85,15 +85,15 @@ class Vault_Server_Request_Dynamic_Interceptor { // = Server-side Vault interceptor. For checking interceptor visually only. public: - Vault_Server_Request_Dynamic_Interceptor (void); + Vault_Server_Request_Dynamic_Interceptor (); // cotr. ~Vault_Server_Request_Dynamic_Interceptor (); // dotr. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); @@ -116,15 +116,15 @@ class Vault_Server_Request_NOOP_Interceptor { // = Server-side Vault interceptor. For checking interceptor visually only. public: - Vault_Server_Request_NOOP_Interceptor (void); + Vault_Server_Request_NOOP_Interceptor (); // cotr. ~Vault_Server_Request_NOOP_Interceptor (); // dotr. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp index 292c6e6a067..83e4589c1ee 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.cpp @@ -9,7 +9,7 @@ Secure_Vault_i::Secure_Vault_i (CORBA::ORB_ptr orb) // ctor CORBA::Short -Secure_Vault_i::ready (void) +Secure_Vault_i::ready () { return 1; } @@ -29,7 +29,7 @@ return 1; } void -Secure_Vault_i::shutdown (void) +Secure_Vault_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h index 9a5a3bb48b1..e851bded5d1 100644 --- a/TAO/tests/Portable_Interceptors/Benchmark/test_i.h +++ b/TAO/tests/Portable_Interceptors/Benchmark/test_i.h @@ -24,7 +24,7 @@ public: /// ctor Secure_Vault_i (CORBA::ORB_ptr orb); - virtual CORBA::Short ready (void); + virtual CORBA::Short ready (); /// Passwd sent in the service context list virtual void authenticate (const char * user); @@ -32,7 +32,7 @@ public: virtual CORBA::Long update_records (CORBA::Long id, const Test_Interceptors::Secure_Vault::Record & val); - virtual void shutdown (void); + virtual void shutdown (); private: /// The ORB pointer (for shutdown.) diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp index a70f9da6453..566d38b8efb 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.cpp @@ -2,7 +2,7 @@ #include "Client_ORBInitializer.h" #include "client_interceptor.h" -Client_ORBInitializer::Client_ORBInitializer (void) +Client_ORBInitializer::Client_ORBInitializer () { } diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h index e8e845f1793..a9108fadae8 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Client_ORBInitializer.h @@ -26,7 +26,7 @@ class Client_ORBInitializer : { public: /// Constructor - Client_ORBInitializer (void); + Client_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp index 83fff97dd0e..ebcb1dea9b6 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.cpp @@ -1,7 +1,7 @@ // -*- C++ -*- #include "Server_ORBInitializer.h" -Server_ORBInitializer::Server_ORBInitializer (void) +Server_ORBInitializer::Server_ORBInitializer () { } @@ -27,7 +27,7 @@ Server_ORBInitializer::post_init ( } Echo_Server_Request_Interceptor * -Server_ORBInitializer::server_interceptor (void) +Server_ORBInitializer::server_interceptor () { return this->server_interceptor_; } diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h index 78a1655f7cd..5e0bcf8d23d 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/Server_ORBInitializer.h @@ -27,7 +27,7 @@ class Server_ORBInitializer : { public: /// Constructor - Server_ORBInitializer (void); + Server_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); @@ -35,7 +35,7 @@ public: /// Return the created server request interceptor. Only valid after /// post_init(), i.e. ORB_init(), has been called. - Echo_Server_Request_Interceptor * server_interceptor (void); + Echo_Server_Request_Interceptor * server_interceptor (); private: /// Pointer to the server request interceptor. ORB is responsible diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp index 985f0a49049..31bcf86a546 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.cpp @@ -18,18 +18,18 @@ Echo_Client_Request_Interceptor (const char *id) { } -Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) +Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () { } char * -Echo_Client_Request_Interceptor::name (void) +Echo_Client_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (void) +Echo_Client_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h index 571addecc3e..2d45f3da618 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/client_interceptor.h @@ -28,10 +28,10 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp index a6ed938f31b..2754caf08c9 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.cpp @@ -11,7 +11,7 @@ const char *forward_msg = "FORWARD message"; int send_request_count = 0; int exception_count = 0; -Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) +Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor () : myname_ ("Echo_Server_Interceptor") { } @@ -22,7 +22,7 @@ Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (CORBA::Object_ { } -Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) +Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () { } @@ -39,13 +39,13 @@ Echo_Server_Request_Interceptor::forward_reference (CORBA::Object_ptr forward_lo } char * -Echo_Server_Request_Interceptor::name (void) +Echo_Server_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (void) +Echo_Server_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h index 940b75fd189..ddad3bc28d5 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/server_interceptor.h @@ -22,7 +22,7 @@ class Echo_Server_Request_Interceptor { // = Server-side echo interceptor. For checking interceptor visually only. public: - Echo_Server_Request_Interceptor (void); + Echo_Server_Request_Interceptor (); // cotr. Echo_Server_Request_Interceptor (CORBA::Object_ptr forward_location); @@ -32,10 +32,10 @@ public: void forward_reference (CORBA::Object_ptr forward_location); - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp index 268a43a0843..782c68db4b9 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.cpp @@ -12,27 +12,27 @@ Visual_i::normal (CORBA::Long arg) } void -Visual_i::nothing (void) +Visual_i::nothing () { ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n")); } void -Visual_i::user (void) +Visual_i::user () { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n")); throw Test_Interceptors::Silly (); } void -Visual_i::system (void) +Visual_i::system () { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); throw CORBA::INV_OBJREF (); } void -Visual_i::shutdown (void) +Visual_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h index f53eeb2cb07..9575ea19d64 100644 --- a/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_1559/test_i.h @@ -26,13 +26,13 @@ public: void normal (CORBA::Long arg); - void nothing (void); + void nothing (); - void user (void); + void user (); - void system (void); + void system (); - void shutdown (void); + void shutdown (); private: /// The ORB pseudo-reference (for shutdown). diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h index 8370ccc962f..e9a21bcabfb 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_2088/Client_ORBInitializer.h @@ -26,7 +26,7 @@ class Client_ORBInitializer : { public: /// Constructor - Client_ORBInitializer (void); + Client_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp index 3c88fae18c2..776f2b80058 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2133/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/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h index 36235e54b3a..1ba41d68aba 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2133/ClientRequest_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_2133/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/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp index e161807d365..61c8e926566 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.cpp @@ -2,7 +2,7 @@ #include "Client_ORBInitializer.h" #include "client_interceptor.h" -Client_ORBInitializer::Client_ORBInitializer (void) +Client_ORBInitializer::Client_ORBInitializer () { } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h index e8e845f1793..a9108fadae8 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Client_ORBInitializer.h @@ -26,7 +26,7 @@ class Client_ORBInitializer : { public: /// Constructor - Client_ORBInitializer (void); + Client_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp index bf5d836fee0..151590a95a5 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.cpp @@ -31,7 +31,7 @@ Server_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) } Echo_Server_Request_Interceptor * -Server_ORBInitializer::server_interceptor (void) +Server_ORBInitializer::server_interceptor () { return this->server_interceptor_; } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h index 78a1655f7cd..5e0bcf8d23d 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/Server_ORBInitializer.h @@ -27,7 +27,7 @@ class Server_ORBInitializer : { public: /// Constructor - Server_ORBInitializer (void); + Server_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); @@ -35,7 +35,7 @@ public: /// Return the created server request interceptor. Only valid after /// post_init(), i.e. ORB_init(), has been called. - Echo_Server_Request_Interceptor * server_interceptor (void); + Echo_Server_Request_Interceptor * server_interceptor (); private: /// Pointer to the server request interceptor. ORB is responsible diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp index ae8793e46e2..7b759392ab7 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.cpp @@ -13,18 +13,18 @@ Echo_Client_Request_Interceptor () { } -Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) +Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () { } char * -Echo_Client_Request_Interceptor::name (void) +Echo_Client_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (void) +Echo_Client_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h index 33ed2b76898..b95a9c42942 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/client_interceptor.h @@ -28,10 +28,10 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp index ebd31a9366d..a72fdff27e8 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.cpp @@ -8,23 +8,23 @@ const IOP::ServiceId service_id = 0x08154711; const char * const request_msg = "TEST 0123456789 TEST"; PortableInterceptor::SlotId slotId = 0; -Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) +Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor () : myname_ ("Echo_Server_Interceptor") { } -Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) +Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () { } char * -Echo_Server_Request_Interceptor::name (void) +Echo_Server_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (void) +Echo_Server_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h index 40f5e613113..d1a0232cc2c 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/server_interceptor.h @@ -22,16 +22,16 @@ class Echo_Server_Request_Interceptor { // = Server-side echo interceptor. For checking interceptor visually only. public: - Echo_Server_Request_Interceptor (void); + Echo_Server_Request_Interceptor (); // cotr. ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp index 8c8edb1a9b0..e49d7dc6140 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.cpp @@ -49,7 +49,7 @@ Visual_i::normal (CORBA::Long arg) } void -Visual_i::shutdown (void) +Visual_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h index 4dd3a4a22de..907bd7cf5c1 100644 --- a/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_2510_Regression/test_i.h @@ -25,7 +25,7 @@ public: Visual_i (CORBA::ORB_ptr orb); void normal (CORBA::Long arg); - void shutdown (void); + void shutdown (); private: /// The ORB pseudo-reference (for shutdown). diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp index 3847c69378d..2bbe7130977 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.cpp @@ -19,13 +19,13 @@ Client_Request_Interceptor::Client_Request_Interceptor ( } char * -Client_Request_Interceptor::name (void) +Client_Request_Interceptor::name () { return CORBA::string_dup ("Client_Request_Interceptor"); } void -Client_Request_Interceptor::destroy (void) +Client_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h index f9b84bd9681..f49952472cb 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_3079/Client_Request_Interceptor.h @@ -42,9 +42,9 @@ public: */ //@{ /// Return the name of this ClientRequestinterceptor. - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void send_request ( PortableInterceptor::ClientRequestInfo_ptr ri); diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp index a59e89f3924..8102a86f94b 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.cpp @@ -6,7 +6,7 @@ #include "Server_Request_Interceptor.h" #include "tao/ORB_Constants.h" -Server_ORBInitializer::Server_ORBInitializer (void) +Server_ORBInitializer::Server_ORBInitializer () { } diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h index 116752a998e..d00d8969405 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_ORBInitializer.h @@ -31,7 +31,7 @@ class Server_ORBInitializer : { public: /// Constructor. - Server_ORBInitializer (void); + Server_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp index a30c6d173d6..cfd431d23c5 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.cpp @@ -4,23 +4,23 @@ #include "ace/Log_Msg.h" #include "CrashPoint.h" -Server_Request_Interceptor::Server_Request_Interceptor (void) +Server_Request_Interceptor::Server_Request_Interceptor () : request_count_ (0) { } -Server_Request_Interceptor::~Server_Request_Interceptor (void) +Server_Request_Interceptor::~Server_Request_Interceptor () { } 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/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h index 5907543ac8b..dfe78ead1d4 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_3079/Server_Request_Interceptor.h @@ -27,7 +27,7 @@ class Server_Request_Interceptor { public: /// Constructor. - Server_Request_Interceptor (void); + Server_Request_Interceptor (); /** * @name Methods Required by the Server Request Interceptor @@ -39,9 +39,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); @@ -61,7 +61,7 @@ public: protected: /// Destructor. - ~Server_Request_Interceptor (void); + ~Server_Request_Interceptor (); private: /// The number of requests intercepted by this interceptor. diff --git a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp index 74f41eb6ccf..e86eaeb1744 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3079/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/tests/Portable_Interceptors/Bug_3079/test_i.h b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.h index 64c03e24b9f..230593e47fb 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3079/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_3079/test_i.h @@ -20,13 +20,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/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp index 696af631cbd..98c570dbe97 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.cpp @@ -3,7 +3,7 @@ #include "testC.h" #include "ace/Log_Msg.h" -Client_Request_Interceptor::Client_Request_Interceptor (void) +Client_Request_Interceptor::Client_Request_Interceptor () : request_count_ (0), receive_exception_count_ (0) { @@ -22,13 +22,13 @@ Client_Request_Interceptor::request_count () const } char * -Client_Request_Interceptor::name (void) +Client_Request_Interceptor::name () { return CORBA::string_dup ("Client_Request_Interceptor"); } void -Client_Request_Interceptor::destroy (void) +Client_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h index cb3426d1ee7..1f0022bb517 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_3080/Client_Request_Interceptor.h @@ -28,7 +28,7 @@ class Client_Request_Interceptor { public: /// Constructor. - Client_Request_Interceptor (void); + Client_Request_Interceptor (); /** * @name Methods Required by the Client Request Interceptor @@ -40,9 +40,9 @@ public: */ //@{ /// Return the name of this ClientRequestinterceptor. - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void send_request ( PortableInterceptor::ClientRequestInfo_ptr ri); diff --git a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp index 74f41eb6ccf..e86eaeb1744 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3080/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/tests/Portable_Interceptors/Bug_3080/test_i.h b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.h index 64c03e24b9f..230593e47fb 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3080/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_3080/test_i.h @@ -20,13 +20,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/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp index d8033778330..d525a2c6d2b 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.cpp @@ -16,13 +16,13 @@ Client_Request_Interceptor::Client_Request_Interceptor ( } char * -Client_Request_Interceptor::name (void) +Client_Request_Interceptor::name () { return CORBA::string_dup ("Client_Request_Interceptor"); } void -Client_Request_Interceptor::destroy (void) +Client_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h index c9090eae741..c2e3149538d 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Bug_3582/Client_Request_Interceptor.h @@ -41,9 +41,9 @@ public: */ //@{ /// Return the name of this ClientRequestinterceptor. - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void send_request ( PortableInterceptor::ClientRequestInfo_ptr ri); diff --git a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp index 74f41eb6ccf..e86eaeb1744 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Bug_3582/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/tests/Portable_Interceptors/Bug_3582/test_i.h b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.h index 04dd1446685..59f89e64428 100644 --- a/TAO/tests/Portable_Interceptors/Bug_3582/test_i.h +++ b/TAO/tests/Portable_Interceptors/Bug_3582/test_i.h @@ -21,13 +21,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/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp index 7c427559c30..b09c3d471ea 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.cpp @@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { try { diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h index b72e0b2835b..e2771dc35d1 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Client_Task.h @@ -21,7 +21,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); void run_test (Test_Interceptors::Visual_ptr server); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp index c1ed4d78e36..02379f9d593 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/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/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h index 23dfac6b088..4d610d156c7 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h @@ -27,7 +27,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Output file for IOR diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp index 948d7cbffa9..d3bc9c6d76f 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp @@ -10,7 +10,7 @@ const char *reply_msg = "The Echo_Request_Interceptor reply message"; CORBA::ULong Echo_Client_Request_Interceptor::client_interceptor_check_ = 0; CORBA::ULong Echo_Server_Request_Interceptor::server_interceptor_check_ = 0; -Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (void) +Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor () : myname_ ("Echo_Client_Interceptor") { } @@ -20,13 +20,13 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () } char * -Echo_Client_Request_Interceptor::name (void) +Echo_Client_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (void) +Echo_Client_Request_Interceptor::destroy () { } @@ -163,7 +163,7 @@ Echo_Client_Request_Interceptor::receive_exception ( exception_id.in ())); } -Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) +Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor () : myname_ ("Echo_Server_Interceptor") { } @@ -173,13 +173,13 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () } char * -Echo_Server_Request_Interceptor::name (void) +Echo_Server_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (void) +Echo_Server_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h index 84d7fffcbd4..48808b448be 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.h @@ -24,15 +24,15 @@ class Echo_Client_Request_Interceptor { // = Client-side echo interceptor. For checking interceptor visually only. public: - Echo_Client_Request_Interceptor (void); + Echo_Client_Request_Interceptor (); // ctor. virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void send_poll ( PortableInterceptor::ClientRequestInfo_ptr); @@ -59,15 +59,15 @@ class Echo_Server_Request_Interceptor { // = Server-side echo interceptor. For checking interceptor visually only. public: - Echo_Server_Request_Interceptor (void); + Echo_Server_Request_Interceptor (); // cotr. ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp index 24d6b91041f..bf3e91814a7 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp @@ -22,21 +22,21 @@ Visual_i::calculate (CORBA::Long one, } void -Visual_i::user (void) +Visual_i::user () { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n")); throw Test_Interceptors::Silly (); } void -Visual_i::system (void) +Visual_i::system () { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); throw CORBA::INV_OBJREF (); } void -Visual_i::shutdown (void) +Visual_i::shutdown () { this->_remove_ref (); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h index 6029ec925fd..5a33574f133 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.h @@ -30,11 +30,11 @@ public: CORBA::Long one, CORBA::Long two); - void user (void); + void user (); - void system (void); + void system (); - void shutdown (void); + void shutdown (); private: /// The ORB pointer (for shutdown.) diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp index 22691fc3001..ccbc53f7bfe 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.cpp @@ -12,7 +12,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { try { diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h index 45ea7e8eeb8..9def7b204d8 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Client_Task.h @@ -23,7 +23,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); void run_test (Test_Interceptors::Visual_ptr server); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp index 5445f920662..30a760155d1 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.cpp @@ -2,7 +2,7 @@ #include "interceptors.h" #include "ace/OS_NS_string.h" -Collocated_ORBInitializer::Collocated_ORBInitializer (void) +Collocated_ORBInitializer::Collocated_ORBInitializer () { } diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h index 7d7fd7ebafe..6f89c98c60b 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_ORBInitializer.h @@ -24,7 +24,7 @@ class Collocated_ORBInitializer : { public: /// Constructor - Collocated_ORBInitializer (void); + Collocated_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp index 9217cbc8aae..352a9d43559 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp @@ -15,7 +15,7 @@ Server_Task::Server_Task (const ACE_TCHAR *output, } int -Server_Task::svc (void) +Server_Task::svc () { try { diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h index 022376a0ccd..2700b4b77c3 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.h @@ -26,7 +26,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Output file for IOR diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp index 32f5ba5dd10..b2fafc6a4f3 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.cpp @@ -14,18 +14,18 @@ Echo_Client_Request_Interceptor (const char *id) { } -Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) +Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () { } char * -Echo_Client_Request_Interceptor::name (void) +Echo_Client_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (void) +Echo_Client_Request_Interceptor::destroy () { } @@ -243,24 +243,24 @@ Echo_Client_Request_Interceptor::receive_exception ( } } -Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) +Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor () : myname_ ("Echo_Server_Interceptor") { } -Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) +Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () { ACE_DEBUG ((LM_DEBUG,"(%P|%t) ~Echo_Server_Request_Interceptor\n")); } char * -Echo_Server_Request_Interceptor::name (void) +Echo_Server_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (void) +Echo_Server_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h index 009b2779714..c82ef51c8ee 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/interceptors.h @@ -28,10 +28,10 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); @@ -59,16 +59,16 @@ class Echo_Server_Request_Interceptor { // = Server-side echo interceptor. For checking interceptor visually only. public: - Echo_Server_Request_Interceptor (void); + Echo_Server_Request_Interceptor (); // cotr. ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp index 651aa681fc6..f255f6fad0f 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.cpp @@ -12,27 +12,27 @@ Visual_i::normal (CORBA::Long) } void -Visual_i::nothing (void) +Visual_i::nothing () { // ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n")); } void -Visual_i::user (void) +Visual_i::user () { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n")); throw Test_Interceptors::Silly (); } void -Visual_i::system (void) +Visual_i::system () { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); throw CORBA::INV_OBJREF (); } void -Visual_i::shutdown (void) +Visual_i::shutdown () { // this->_remove_ref (); ACE_DEBUG ((LM_DEBUG,"(%P|%t) visual_i::shutdown\n")); diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h index f6cd81bb42a..4593c3e7f18 100644 --- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h +++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/test_i.h @@ -24,13 +24,13 @@ public: void normal (CORBA::Long arg); - void nothing (void); + void nothing (); - void user (void); + void user (); - void system (void); + void system (); - void shutdown (void); + void shutdown (); private: /// The ORB pseudo-reference (for shutdown). diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp index 90cc634d689..472d2c4b846 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.cpp @@ -21,7 +21,7 @@ Client_Request_Interceptor::name () } void -Client_Request_Interceptor::destroy (void) +Client_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h index df858f6df1f..100a1c7de26 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Client_Request_Interceptor.h @@ -62,9 +62,9 @@ public: */ //@{ /// Return the name of this ClientRequestinterceptor. - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void send_request ( PortableInterceptor::ClientRequestInfo_ptr ri); diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp index d014deb7204..8ee1d22830c 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.cpp @@ -7,7 +7,7 @@ #include "tao/ORB_Constants.h" -Server_ORBInitializer::Server_ORBInitializer (void) +Server_ORBInitializer::Server_ORBInitializer () : server_interceptor_ () { } @@ -38,7 +38,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/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h index de10ccbcdaf..31dab8edb87 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/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/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp index 961fea9f416..4bb03f0dea1 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.cpp @@ -4,14 +4,14 @@ #include "tao/ORB_Constants.h" #include "ace/Log_Msg.h" -Server_Request_Interceptor::Server_Request_Interceptor (void) +Server_Request_Interceptor::Server_Request_Interceptor () : request_count_ (0) { this->obj_[0] = CORBA::Object::_nil (); this->obj_[1] = CORBA::Object::_nil (); } -Server_Request_Interceptor::~Server_Request_Interceptor (void) +Server_Request_Interceptor::~Server_Request_Interceptor () { } @@ -32,13 +32,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/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h index 9d7bb209a90..0afdbc2cc13 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/Server_Request_Interceptor.h @@ -58,7 +58,7 @@ class Server_Request_Interceptor { public: /// Constructor. - Server_Request_Interceptor (void); + Server_Request_Interceptor (); /// Set the references to which requests will be forwarded. virtual void forward_references (CORBA::Object_ptr obj1, @@ -74,9 +74,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); @@ -96,7 +96,7 @@ public: protected: /// Destructor. - ~Server_Request_Interceptor (void); + ~Server_Request_Interceptor (); private: /// The number of requests intercepted by this interceptor. diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp index 74f41eb6ccf..e86eaeb1744 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/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/tests/Portable_Interceptors/ForwardRequest/test_i.h b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h index 036615df073..4d1bf88b83e 100644 --- a/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h +++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test_i.h @@ -31,13 +31,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/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp index cf8278aade8..1050f2e24dd 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp @@ -18,7 +18,7 @@ FOO_ClientRequestInterceptor::name () } void -FOO_ClientRequestInterceptor::destroy (void) +FOO_ClientRequestInterceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h index b1a2370b447..63c5da7f136 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.h @@ -57,9 +57,9 @@ public: */ //@{ /// Return the name of this ClientRequestInterceptor. - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void send_request ( PortableInterceptor::ClientRequestInfo_ptr ri); diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp index 3edbd032331..1c8ba647fe6 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.cpp @@ -9,13 +9,13 @@ FOO_IORInterceptor::FOO_IORInterceptor (IOP::Codec_ptr codec) } char * -FOO_IORInterceptor::name (void) +FOO_IORInterceptor::name () { return CORBA::string_dup ("FOO_IORInterceptor"); } void -FOO_IORInterceptor::destroy (void) +FOO_IORInterceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h index 2ec40862839..3c112084dbb 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_IORInterceptor.h @@ -56,10 +56,10 @@ public: */ //@{ /// Return the name of this IORInterceptor. - virtual char * name (void); + virtual char * name (); /// Cleanup resources acquired by this IORInterceptor. - virtual void destroy (void); + virtual void destroy (); /// Add the tagged components to the IOR. virtual void establish_components ( diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp index b5d29c3c716..9c39d8a1caf 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.cpp @@ -7,7 +7,7 @@ test_i::test_i (CORBA::ORB_ptr orb) } void -test_i::shutdown (void) +test_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "\"test_i\" is shutting down.\n")); diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h index 2f80d63adc2..d134932f461 100644 --- a/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h +++ b/TAO/tests/Portable_Interceptors/IORInterceptor/test_i.h @@ -31,7 +31,7 @@ public: test_i (CORBA::ORB_ptr orb); /// Shutdown the ORB. - virtual void shutdown (void); + virtual void shutdown (); private: /// Pseudo-reference to the ORB. diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp index d8b124a8f65..9d4b972d2db 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.cpp @@ -7,7 +7,7 @@ Server_Request_Interceptor::Server_Request_Interceptor (bool & destroy_called) this->destroy_called_ = false; // Sanity check. } -Server_Request_Interceptor::~Server_Request_Interceptor (void) +Server_Request_Interceptor::~Server_Request_Interceptor () { // ORB::destroy() should have been called, which in turn should have // called the Interceptor::destroy() method in all registered @@ -16,13 +16,13 @@ Server_Request_Interceptor::~Server_Request_Interceptor (void) } 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 () { this->destroy_called_ = true; } diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h index 3b9097ced24..0d5145d6f5e 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/Server_Request_Interceptor.h @@ -57,9 +57,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); @@ -79,7 +79,7 @@ public: protected: /// Destructor. - ~Server_Request_Interceptor (void); + ~Server_Request_Interceptor (); private: /// Flag that states whether this interceptor's @c destroy() method diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp index b49ee6ca120..2b3a90c9569 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.cpp @@ -5,18 +5,18 @@ test_i::test_i (CORBA::ORB_ptr orb) { } -test_i::~test_i (void) +test_i::~test_i () { } void -test_i::hello (void) +test_i::hello () { ACE_DEBUG ((LM_DEBUG, "Hello!\n")); } void -test_i::shutdown (void) +test_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "Shutting down ORB.\n")); diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h index cc9433132db..0a9f179428e 100644 --- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h +++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/test_i.h @@ -30,13 +30,13 @@ public: test_i (CORBA::ORB_ptr orb); /// Destructor. - ~test_i (void); + ~test_i (); /// Say hello. - virtual void hello (void); + virtual void hello (); /// Shutdown the ORB. - virtual void shutdown (void); + virtual void shutdown (); private: /// Pseudo-reference to the ORB. diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp index bdb22b875ce..5b9b0d95de9 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.cpp @@ -18,7 +18,7 @@ ClientRequestInterceptor::name () } void -ClientRequestInterceptor::destroy (void) +ClientRequestInterceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h index 0bca4b49de4..efac9183c17 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor.h @@ -57,9 +57,9 @@ public: */ //@{ /// Return the name of this ClientRequestInterceptor. - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void send_request ( PortableInterceptor::ClientRequestInfo_ptr ri); diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp index 04cb706bf19..2e4b67a75d0 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.cpp @@ -16,7 +16,7 @@ ClientRequestInterceptor2::name () } void -ClientRequestInterceptor2::destroy (void) +ClientRequestInterceptor2::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h index bb69b5c1e82..0ec007e0330 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ClientRequestInterceptor2.h @@ -53,9 +53,9 @@ public: */ //@{ /// Return the name of this ClientRequestInterceptor. - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void send_request ( PortableInterceptor::ClientRequestInfo_ptr ri); diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp index 17676f5844f..bc573411f0a 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp @@ -13,13 +13,13 @@ ServerRequestInterceptor::ServerRequestInterceptor ( } char * -ServerRequestInterceptor::name (void) +ServerRequestInterceptor::name () { return CORBA::string_dup ("ServerRequestInterceptor"); } void -ServerRequestInterceptor::destroy (void) +ServerRequestInterceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h index d9990d5b102..314cdc19524 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h @@ -56,9 +56,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/tests/Portable_Interceptors/PICurrent/test_i.cpp b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp index d8deb2c5e89..6562d415e01 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.cpp @@ -10,12 +10,12 @@ test_i::test_i (PortableInterceptor::Current_ptr current, { } -test_i::~test_i (void) +test_i::~test_i () { } void -test_i::invoke_me (void) +test_i::invoke_me () { ACE_DEBUG ((LM_DEBUG, "Test method invoked.\n")); @@ -121,14 +121,14 @@ test_i::invoke_me (void) } void -test_i::invoke_you (void) +test_i::invoke_you () { // Nothing to be tested here. This method is here just so that we // have a different method } void -test_i::invoke_we (void) +test_i::invoke_we () { // Insert some data into the TSC PICurrent object. const char str[] = "We drink milk!"; @@ -160,7 +160,7 @@ test_i::invoke_we (void) } void -test_i::shutdown (void) +test_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Server is shutting down.\n")); diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h index 9e370707c0e..19c056bcc77 100644 --- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h +++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h @@ -35,21 +35,21 @@ public: CORBA::ORB_ptr orb); /// Destructor. - ~test_i (void); + ~test_i (); /// Main servant test method. - virtual void invoke_me (void); + virtual void invoke_me (); /// No-op method used so that a client request interceptor will be /// invoked when invoking this method from the above invoke_me() /// method. Say that 10 times fast. :-) - virtual void invoke_you (void); + virtual void invoke_you (); /// Test just a set slot - virtual void invoke_we (void); + virtual void invoke_we (); /// Shutdown the ORB. - virtual void shutdown (void); + virtual void shutdown (); private: /// Reference to the PICurrent object. diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp index f33cdc51bb2..11d2a656315 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp @@ -1,24 +1,24 @@ #include "IORInterceptor.h" #include "testC.h" -IORInterceptor::IORInterceptor (void) +IORInterceptor::IORInterceptor () : success_ (false) { } -IORInterceptor::~IORInterceptor (void) +IORInterceptor::~IORInterceptor () { ACE_ASSERT (this->success_); } char * -IORInterceptor::name (void) +IORInterceptor::name () { return CORBA::string_dup (""); } void -IORInterceptor::destroy (void) +IORInterceptor::destroy () { ACE_ASSERT (this->success_); } diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h index 8e804293690..7fdcf1fe48b 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h @@ -44,7 +44,7 @@ class IORInterceptor { public: /// Constructor - IORInterceptor (void); + IORInterceptor (); /** * @name Methods Required by the IOR Interceptor Interface @@ -55,10 +55,10 @@ public: */ //@{ /// Return the name of this IORInterceptor. - virtual char * name (void); + virtual char * name (); /// Cleanup resources acquired by this IORInterceptor. - virtual void destroy (void); + virtual void destroy (); /// Add the tagged components to the IOR. virtual void establish_components ( @@ -71,7 +71,7 @@ protected: * Protected destructor to enforce proper memory management through * the reference counting mechanism. */ - ~IORInterceptor (void); + ~IORInterceptor (); private: /// IORInterceptor successfully called and executed. diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp index bd8f1ee2fd1..76dc3704ee8 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.cpp @@ -8,24 +8,24 @@ Policy::Policy (CORBA::ULong val) { } -Policy::~Policy (void) +Policy::~Policy () { } CORBA::ULong -Policy::value (void) +Policy::value () { return this->value_; } CORBA::PolicyType -Policy::policy_type (void) +Policy::policy_type () { return Test::POLICY_TYPE; } CORBA::Policy_ptr -Policy::copy (void) +Policy::copy () { CORBA::Policy_ptr p; ACE_NEW_THROW_EX (p, @@ -36,6 +36,6 @@ Policy::copy (void) } void -Policy::destroy (void) +Policy::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h index 94ac029b363..5fc98b06d6b 100644 --- a/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h +++ b/TAO/tests/Portable_Interceptors/PolicyFactory/Policy.h @@ -33,13 +33,13 @@ public: Policy (CORBA::ULong val); /// Test method defined in test IDL. - virtual CORBA::ULong value (void); + virtual CORBA::ULong value (); - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy (void); + virtual CORBA::Policy_ptr copy (); - virtual void destroy (void); + virtual void destroy (); protected: /// Destructor. @@ -47,7 +47,7 @@ protected: * Protected destructor to enforce proper memory management through * the reference counting mechanism. */ - ~Policy (void); + ~Policy (); private: /// Pseudo-reference to the ORB. diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp index 3136185327b..024ccda2a71 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp @@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { try { diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h index adfccc8b685..6cf5b7383db 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h @@ -21,7 +21,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); void run_test (Test_Interceptors::Visual_ptr server); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp index c1ed4d78e36..02379f9d593 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/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/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h index ce62b3f44da..e37c9eeb814 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h @@ -27,7 +27,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); /// The status of the svc loop int status () const; diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp index c5c6b00ecc7..e6908f39945 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp @@ -12,7 +12,7 @@ const char *reply_msg = "The Echo_Request_Interceptor reply message"; CORBA::ULong Echo_Client_Request_Interceptor::client_interceptor_check_ = 0; CORBA::ULong Echo_Server_Request_Interceptor::server_interceptor_check_ = 0; -Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (void) +Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor () : myname_ ("Echo_Client_Interceptor") { } @@ -22,13 +22,13 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () } char * -Echo_Client_Request_Interceptor::name (void) +Echo_Client_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (void) +Echo_Client_Request_Interceptor::destroy () { } @@ -169,7 +169,7 @@ Echo_Client_Request_Interceptor::receive_exception ( exception_id.in ())); } -Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) +Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor () : myname_ ("Echo_Server_Interceptor") { } @@ -179,13 +179,13 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () } char * -Echo_Server_Request_Interceptor::name (void) +Echo_Server_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (void) +Echo_Server_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h index db6e103987b..861dea81496 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h @@ -23,15 +23,15 @@ class Echo_Client_Request_Interceptor { // = Client-side echo interceptor. For checking interceptor visually only. public: - Echo_Client_Request_Interceptor (void); + Echo_Client_Request_Interceptor (); // ctor. virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void send_poll ( PortableInterceptor::ClientRequestInfo_ptr); @@ -58,15 +58,15 @@ class Echo_Server_Request_Interceptor { // = Server-side echo interceptor. For checking interceptor visually only. public: - Echo_Server_Request_Interceptor (void); + Echo_Server_Request_Interceptor (); // cotr. ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp index f46bcf08ccb..5d544f50620 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp @@ -22,21 +22,21 @@ Visual_i::calculate (CORBA::Long one, } void -Visual_i::user (void) +Visual_i::user () { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n")); throw Test_Interceptors::Silly (); } void -Visual_i::system (void) +Visual_i::system () { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); throw CORBA::INV_OBJREF (); } void -Visual_i::shutdown (void) +Visual_i::shutdown () { this->_remove_ref (); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h index 6029ec925fd..5a33574f133 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h @@ -30,11 +30,11 @@ public: CORBA::Long one, CORBA::Long two); - void user (void); + void user (); - void system (void); + void system (); - void shutdown (void); + void shutdown (); private: /// The ORB pointer (for shutdown.) diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp index ba642d0678b..da7362004ab 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp @@ -13,7 +13,7 @@ Client_Task::Client_Task (const ACE_TCHAR *ior, } int -Client_Task::svc (void) +Client_Task::svc () { try { diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h index ca32199d1a5..b22248e78a8 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h @@ -21,7 +21,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); void run_test (Test_Interceptors::Visual_ptr server); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp index 9b0426ef035..748a2d9369b 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/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/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h index 9915f4e1969..e3a9adfb055 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h @@ -27,7 +27,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); /// The status of the svc loop int status () const; diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp index 911540c26a0..6fe6f526325 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp @@ -9,7 +9,7 @@ const char *request_msg = "The Echo_Client_Request_Interceptor request message"; const char *reply_msg = "The Echo_Client_Request_Interceptor reply message"; CORBA::ULong Echo_Client_Request_Interceptor::client_interceptor_check_ = 0; -Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (void) +Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor () : myname_ ("Echo_Client_Interceptor") { } @@ -19,13 +19,13 @@ Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () } char * -Echo_Client_Request_Interceptor::name (void) +Echo_Client_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (void) +Echo_Client_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h index 25f0157d033..d47ed43f261 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h @@ -22,15 +22,15 @@ class Echo_Client_Request_Interceptor { // = Client-side echo interceptor. For checking interceptor visually only. public: - Echo_Client_Request_Interceptor (void); + Echo_Client_Request_Interceptor (); // ctor. virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void send_poll ( PortableInterceptor::ClientRequestInfo_ptr); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp index 4abd69de234..e0fe9d6e6dc 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp @@ -9,7 +9,7 @@ const char *request_msg = "The Echo_Server_Request_Interceptor request message"; const char *reply_msg = "The Echo_Server_Request_Interceptor reply message"; CORBA::ULong Echo_Server_Request_Interceptor::server_interceptor_check_ = 0; -Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) +Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor () : myname_ ("Echo_Server_Interceptor") { } @@ -19,13 +19,13 @@ Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () } char * -Echo_Server_Request_Interceptor::name (void) +Echo_Server_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (void) +Echo_Server_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h index 88c30fa2ce7..60c57d76787 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h @@ -23,15 +23,15 @@ class Echo_Server_Request_Interceptor { // = Server-side echo interceptor. For checking interceptor visually only. public: - Echo_Server_Request_Interceptor (void); + Echo_Server_Request_Interceptor (); // cotr. ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp index c16b0f9373c..a5d7cfe5503 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp @@ -21,21 +21,21 @@ Visual_i::calculate (CORBA::Long one, } void -Visual_i::user (void) +Visual_i::user () { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n")); throw Test_Interceptors::Silly (); } void -Visual_i::system (void) +Visual_i::system () { // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); throw CORBA::INV_OBJREF (); } void -Visual_i::shutdown (void) +Visual_i::shutdown () { this->_remove_ref (); diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h index 6029ec925fd..5a33574f133 100644 --- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h +++ b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h @@ -30,11 +30,11 @@ public: CORBA::Long one, CORBA::Long two); - void user (void); + void user (); - void system (void); + void system (); - void shutdown (void); + void shutdown (); private: /// The ORB pointer (for shutdown.) diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp index 8d7ff33ea6b..7f06dcd7863 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.cpp @@ -14,13 +14,13 @@ Client_Request_Interceptor::Client_Request_Interceptor ( } char * -Client_Request_Interceptor::name (void) +Client_Request_Interceptor::name () { return CORBA::string_dup ("Client_Request_Interceptor"); } void -Client_Request_Interceptor::destroy (void) +Client_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h index c9090eae741..c2e3149538d 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Redirection/Client_Request_Interceptor.h @@ -41,9 +41,9 @@ public: */ //@{ /// Return the name of this ClientRequestinterceptor. - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void send_request ( PortableInterceptor::ClientRequestInfo_ptr ri); diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp index a59e89f3924..8102a86f94b 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.cpp @@ -6,7 +6,7 @@ #include "Server_Request_Interceptor.h" #include "tao/ORB_Constants.h" -Server_ORBInitializer::Server_ORBInitializer (void) +Server_ORBInitializer::Server_ORBInitializer () { } diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h index 116752a998e..d00d8969405 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_ORBInitializer.h @@ -31,7 +31,7 @@ class Server_ORBInitializer : { public: /// Constructor. - Server_ORBInitializer (void); + Server_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp index a30c6d173d6..cfd431d23c5 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.cpp @@ -4,23 +4,23 @@ #include "ace/Log_Msg.h" #include "CrashPoint.h" -Server_Request_Interceptor::Server_Request_Interceptor (void) +Server_Request_Interceptor::Server_Request_Interceptor () : request_count_ (0) { } -Server_Request_Interceptor::~Server_Request_Interceptor (void) +Server_Request_Interceptor::~Server_Request_Interceptor () { } 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/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h index 5907543ac8b..dfe78ead1d4 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Redirection/Server_Request_Interceptor.h @@ -27,7 +27,7 @@ class Server_Request_Interceptor { public: /// Constructor. - Server_Request_Interceptor (void); + Server_Request_Interceptor (); /** * @name Methods Required by the Server Request Interceptor @@ -39,9 +39,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); @@ -61,7 +61,7 @@ public: protected: /// Destructor. - ~Server_Request_Interceptor (void); + ~Server_Request_Interceptor (); private: /// The number of requests intercepted by this interceptor. diff --git a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp b/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp index 74f41eb6ccf..e86eaeb1744 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Redirection/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/tests/Portable_Interceptors/Redirection/test_i.h b/TAO/tests/Portable_Interceptors/Redirection/test_i.h index 64c03e24b9f..230593e47fb 100644 --- a/TAO/tests/Portable_Interceptors/Redirection/test_i.h +++ b/TAO/tests/Portable_Interceptors/Redirection/test_i.h @@ -20,13 +20,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/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp index f2c9fe409a2..340afbd7ba1 100644 --- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.cpp @@ -4,7 +4,7 @@ #include "tao/ORBInitializer_Registry.h" #include "tao/ORB_Constants.h" -Server_ORBInitializer::Server_ORBInitializer (void) +Server_ORBInitializer::Server_ORBInitializer () { } diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h index cb446a73d5f..186a826090b 100644 --- a/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/Server_ORBInitializer.h @@ -27,7 +27,7 @@ class Server_ORBInitializer : { public: /// Constructor - Server_ORBInitializer (void); + Server_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp index 6a8d2fbfb2e..a0f82547975 100644 --- a/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.cpp @@ -1,11 +1,11 @@ // -*- C++ -*- #include "test_i.h" -test_i::test_i (void) +test_i::test_i () { } -test_i::~test_i (void) +test_i::~test_i () { } diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.h b/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.h index c0f1bb4811f..54f35968e3f 100644 --- a/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.h +++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/test_i.h @@ -24,10 +24,10 @@ class test_i : public virtual POA_TestModule::test { public: /// Constructor. - test_i (void); + test_i (); /// Destructor. - ~test_i (void); + ~test_i (); private: }; diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp index aeb29430a4a..d26df8265d4 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.cpp @@ -15,7 +15,7 @@ Request_Interceptor::name () } void -Request_Interceptor::destroy (void) +Request_Interceptor::destroy () { CORBA::ULong s_count = this->starting_interception_point_count_.value (); diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h index 662b8e79d85..18448765d73 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Request_Interceptor.h @@ -55,9 +55,9 @@ public: */ //@{ /// Return the name of this Requestinterceptor. - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); //@} protected: diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp index 9f87a70c3f5..35a71eaa5ff 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.cpp @@ -46,7 +46,7 @@ test_i::server_test (Test::TestScenario scenario, } void -test_i::shutdown (void) +test_i::shutdown () { ACE_DEBUG ((LM_INFO, "Server is shutting down.\n")); diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h index 91260b771db..98f877dd83b 100644 --- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h +++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test_i.h @@ -37,7 +37,7 @@ public: CORBA::ULongSeq_out myseq); /// Shutdown the ORB. - virtual void shutdown (void); + virtual void shutdown (); private: /// Pseudo-reference to the ORB. diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp index d65ed78aa37..cc83c5b7e3b 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.cpp @@ -3,7 +3,7 @@ #include "Client_ORBInitializer.h" #include "client_interceptor.h" -Client_ORBInitializer::Client_ORBInitializer (void) +Client_ORBInitializer::Client_ORBInitializer () { } diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h index e8e845f1793..a9108fadae8 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Client_ORBInitializer.h @@ -26,7 +26,7 @@ class Client_ORBInitializer : { public: /// Constructor - Client_ORBInitializer (void); + Client_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp index dd22dcc19d3..2d12efbd1f0 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.cpp @@ -3,7 +3,7 @@ #include "Server_ORBInitializer.h" #include "server_interceptor.h" -Server_ORBInitializer::Server_ORBInitializer (void) +Server_ORBInitializer::Server_ORBInitializer () { } diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h index 9554057647d..e3d1af0b6df 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/Server_ORBInitializer.h @@ -26,7 +26,7 @@ class Server_ORBInitializer : { public: /// Constructor - Server_ORBInitializer (void); + Server_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp index c9817031d44..5aab1315fc5 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.cpp @@ -15,18 +15,18 @@ Echo_Client_Request_Interceptor (const char *id) { } -Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor (void) +Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () { } char * -Echo_Client_Request_Interceptor::name (void) +Echo_Client_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Echo_Client_Request_Interceptor::destroy (void) +Echo_Client_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h index e7b490fa096..d3fb25ea8be 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client_interceptor.h @@ -28,10 +28,10 @@ public: virtual ~Echo_Client_Request_Interceptor (); // dtor. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp index ae196bc661c..f8f4f5bd5d9 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.cpp @@ -8,23 +8,23 @@ const IOP::ServiceId service_id = 0xdeadbeef; const char *request_msg = "The Echo_Request_Interceptor request message"; const char *reply_msg = "The Echo_Request_Interceptor reply message"; -Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) +Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor () : myname_ ("Echo_Server_Interceptor") { } -Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor (void) +Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () { } char * -Echo_Server_Request_Interceptor::name (void) +Echo_Server_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Echo_Server_Request_Interceptor::destroy (void) +Echo_Server_Request_Interceptor::destroy () { } diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h index 2755fd363b3..1659c5f6071 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server_interceptor.h @@ -22,16 +22,16 @@ class Echo_Server_Request_Interceptor { // = Server-side echo interceptor. For checking interceptor visually only. public: - Echo_Server_Request_Interceptor (void); + Echo_Server_Request_Interceptor (); // cotr. ~Echo_Server_Request_Interceptor (); // dotr. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp index 268a43a0843..782c68db4b9 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.cpp @@ -12,27 +12,27 @@ Visual_i::normal (CORBA::Long arg) } void -Visual_i::nothing (void) +Visual_i::nothing () { ACE_DEBUG ((LM_DEBUG, "Visual::nothing\n")); } void -Visual_i::user (void) +Visual_i::user () { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n")); throw Test_Interceptors::Silly (); } void -Visual_i::system (void) +Visual_i::system () { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); throw CORBA::INV_OBJREF (); } void -Visual_i::shutdown (void) +Visual_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h index 3937af13fdd..3f139b0fa66 100644 --- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h +++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/test_i.h @@ -25,13 +25,13 @@ public: void normal (CORBA::Long arg); - void nothing (void); + void nothing (); - void user (void); + void user (); - void system (void); + void system (); - void shutdown (void); + void shutdown (); private: /// The ORB pseudo-reference (for shutdown). diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp index ae3c8de8034..09d3f4f91ef 100644 --- a/TAO/tests/QtTests/client.cpp +++ b/TAO/tests/QtTests/client.cpp @@ -48,7 +48,7 @@ Client::Client (CORBA::ORB_ptr orb, { } -Client::~Client (void) +Client::~Client () { delete this->slider_; delete this->push_button_; @@ -133,7 +133,7 @@ Client::create_widgets (/**/) } void -Client::show (void) +Client::show () { this->mainwindow_.show (); } @@ -145,7 +145,7 @@ Client::remote_call (int val) } void -Client::shutdown_call (void) +Client::shutdown_call () { this->server_->shutdown (); } diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h index c610cb064c2..06237659dc6 100644 --- a/TAO/tests/QtTests/client.h +++ b/TAO/tests/QtTests/client.h @@ -27,12 +27,12 @@ public: QApplication &app); ///Dtor.. - ~Client (void); + ~Client (); /// Adds the callbacks to the GUI underneath..... - void create_widgets (void); + void create_widgets (); - void show (void); + void show (); void parse_args (int argc, ACE_TCHAR *argv[]); @@ -43,7 +43,7 @@ public: public slots: /// Two slot handlers for the two widgets that we have void remote_call (int val); - void shutdown_call (void); + void shutdown_call (); private: /// A push button diff --git a/TAO/tests/QtTests/test_i.cpp b/TAO/tests/QtTests/test_i.cpp index c0074bd073f..f321fe0e5fa 100644 --- a/TAO/tests/QtTests/test_i.cpp +++ b/TAO/tests/QtTests/test_i.cpp @@ -7,7 +7,7 @@ LCD_Display_imp::LCD_Display_imp (CORBA::ORB_ptr orb) } void -LCD_Display_imp::shutdown (void) +LCD_Display_imp::shutdown () { ACE_DEBUG ((LM_DEBUG, "The ORB has been shutdown, Close the windows to exit\n")); diff --git a/TAO/tests/QtTests/test_i.h b/TAO/tests/QtTests/test_i.h index 055d2438111..562ba8595c5 100644 --- a/TAO/tests/QtTests/test_i.h +++ b/TAO/tests/QtTests/test_i.h @@ -33,7 +33,7 @@ public: // ctor - void shutdown (void); + void shutdown (); void send_val (CORBA::Long val); diff --git a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp index cbddcd432f3..9580e893db9 100644 --- a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp +++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp @@ -19,7 +19,7 @@ const size_t max_block_length = 256; static TAO_Queued_Message * -create_new_message (void) +create_new_message () { // First create a message block size_t block_size = diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp index f5bd2732d29..c821f25d5a0 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp @@ -97,7 +97,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -110,7 +110,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp index 9681db29429..681bbad7e11 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp @@ -15,7 +15,7 @@ public: CORBA::Short priority); //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); //FUZZ: enable check_for_lack_ACE_OS private: @@ -104,7 +104,7 @@ Test_i::test_method (CORBA::Boolean client_propagated, } void -Test_i::shutdown (void) +Test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp index a0745a4e2d8..8b3e04d3774 100644 --- a/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp +++ b/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.cpp @@ -3,7 +3,7 @@ #include "Client_ORBInitializer.h" #include "interceptors.h" -Client_ORBInitializer::Client_ORBInitializer (void) +Client_ORBInitializer::Client_ORBInitializer () { } diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.h b/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.h index e8e845f1793..a9108fadae8 100644 --- a/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.h +++ b/TAO/tests/RTCORBA/Bug_3382_Regression/Client_ORBInitializer.h @@ -26,7 +26,7 @@ class Client_ORBInitializer : { public: /// Constructor - Client_ORBInitializer (void); + Client_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp index 679816520a7..5c3004eea7f 100644 --- a/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp +++ b/TAO/tests/RTCORBA/Bug_3382_Regression/client.cpp @@ -41,7 +41,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -54,7 +54,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { int result = 0; try diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp index dac74fd104e..b714dfa3e49 100644 --- a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp +++ b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.cpp @@ -9,18 +9,18 @@ Client_Request_Interceptor (const char *id) { } -Client_Request_Interceptor::~Client_Request_Interceptor (void) +Client_Request_Interceptor::~Client_Request_Interceptor () { } char * -Client_Request_Interceptor::name (void) +Client_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Client_Request_Interceptor::destroy (void) +Client_Request_Interceptor::destroy () { } diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h index 34cebae1f23..ddede0c5438 100644 --- a/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h +++ b/TAO/tests/RTCORBA/Bug_3382_Regression/interceptors.h @@ -29,10 +29,10 @@ public: virtual ~Client_Request_Interceptor (); // dtor. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); diff --git a/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp index a98367c6f83..ad4588a3b80 100644 --- a/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp +++ b/TAO/tests/RTCORBA/Bug_3382_Regression/server.cpp @@ -103,7 +103,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -116,7 +116,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp index 10bad3ad070..f7cea023958 100644 --- a/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp +++ b/TAO/tests/RTCORBA/Bug_3643_Regression/client.cpp @@ -75,7 +75,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -88,7 +88,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp index ca3a5bb3ae0..3d347af46b3 100644 --- a/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp +++ b/TAO/tests/RTCORBA/Bug_3643_Regression/server.cpp @@ -153,7 +153,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -166,7 +166,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp b/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp index 4f22163fed7..59002204b8a 100644 --- a/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp +++ b/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.cpp @@ -50,13 +50,13 @@ test_i::method (CORBA::Long client_id, } PortableServer::POA_ptr -test_i::_default_POA (void) +test_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } void -test_i::shutdown (void) +test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.h b/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.h index 3dafef71563..49d55231c1b 100644 --- a/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.h +++ b/TAO/tests/RTCORBA/Bug_3643_Regression/test_i.h @@ -23,10 +23,10 @@ public: CORBA::Long_out thread_count); /// Shutdown the server. - void shutdown (void); + void shutdown (); /// Our POA. - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); private: /// ORB. diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp index a0745a4e2d8..8b3e04d3774 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.cpp @@ -3,7 +3,7 @@ #include "Client_ORBInitializer.h" #include "interceptors.h" -Client_ORBInitializer::Client_ORBInitializer (void) +Client_ORBInitializer::Client_ORBInitializer () { } diff --git a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h index e8e845f1793..a9108fadae8 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h +++ b/TAO/tests/RTCORBA/Client_Propagated/Client_ORBInitializer.h @@ -26,7 +26,7 @@ class Client_ORBInitializer : { public: /// Constructor - Client_ORBInitializer (void); + Client_ORBInitializer (); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp index 4241267540d..b91f6002b60 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp @@ -41,7 +41,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -54,7 +54,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp index dac74fd104e..b714dfa3e49 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.cpp @@ -9,18 +9,18 @@ Client_Request_Interceptor (const char *id) { } -Client_Request_Interceptor::~Client_Request_Interceptor (void) +Client_Request_Interceptor::~Client_Request_Interceptor () { } char * -Client_Request_Interceptor::name (void) +Client_Request_Interceptor::name () { return CORBA::string_dup (this->myname_); } void -Client_Request_Interceptor::destroy (void) +Client_Request_Interceptor::destroy () { } diff --git a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h index 34cebae1f23..ddede0c5438 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/interceptors.h +++ b/TAO/tests/RTCORBA/Client_Propagated/interceptors.h @@ -29,10 +29,10 @@ public: virtual ~Client_Request_Interceptor (); // dtor. - virtual char * name (void); + virtual char * name (); // Canonical name of the interceptor. - virtual void destroy (void); + virtual void destroy (); virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp index dade2a7d8d1..d257aa53b1b 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp @@ -19,7 +19,7 @@ public: void test_method (CORBA::Short priority); //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); //FUZZ: enable check_for_lack_ACE_OS private: @@ -63,7 +63,7 @@ Test_i::test_method (CORBA::Short priority) } void -Test_i::shutdown (void) +Test_i::shutdown () { this->orb_->shutdown (false); } @@ -105,7 +105,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -118,7 +118,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp index 3e12434cb55..81f873b5ded 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp @@ -14,10 +14,10 @@ public: Test_i (CORBA::ORB_ptr orb); // ctor - void test_method (void); + void test_method (); //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); //FUZZ: enable check_for_lack_ACE_OS private: @@ -38,7 +38,7 @@ Test_i::test_method ( /**/) } void -Test_i::shutdown (void) +Test_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Shutting down\n")); diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp index 5c82afa47e1..98494b81b1d 100644 --- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp +++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp @@ -31,29 +31,29 @@ public: PortableServer::POA_ptr poa, Tests &tests); - void start (void); + void start (); - void method (void); + void method (); - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); - int client_propagated (void); + int client_propagated (); void client_propagated (int); - int server_declared (void); + int server_declared (); void server_declared (int); - RTCORBA::Priority server_priority (void); + RTCORBA::Priority server_priority (); void server_priority (RTCORBA::Priority); - int in_lane (void); + int in_lane (); void in_lane (int); - int serviced_by_rt_tp (void); + int serviced_by_rt_tp (); void serviced_by_rt_tp (int); @@ -66,7 +66,7 @@ public: void invocation_lane (CORBA::ULong lane); - RTCORBA::Priority invocation_priority (void); + RTCORBA::Priority invocation_priority (); void invocation_priority (RTCORBA::Priority); @@ -108,7 +108,7 @@ test_i::test_i (CORBA::ORB_ptr orb, } int -test_i::client_propagated (void) +test_i::client_propagated () { return this->client_propagated_; } @@ -120,7 +120,7 @@ test_i::client_propagated (int client_propagated) } int -test_i::server_declared (void) +test_i::server_declared () { return this->server_declared_; } @@ -132,7 +132,7 @@ test_i::server_declared (int server_declared) } RTCORBA::Priority -test_i::server_priority (void) +test_i::server_priority () { return this->server_priority_; } @@ -144,7 +144,7 @@ test_i::server_priority (RTCORBA::Priority server_priority) } int -test_i::in_lane (void) +test_i::in_lane () { return this->in_lane_; } @@ -156,7 +156,7 @@ test_i::in_lane (int in_lane) } int -test_i::serviced_by_rt_tp (void) +test_i::serviced_by_rt_tp () { return this->serviced_by_rt_tp_; } @@ -188,7 +188,7 @@ test_i::invocation_lane (CORBA::ULong lane) } RTCORBA::Priority -test_i::invocation_priority (void) +test_i::invocation_priority () { return this->invocation_priority_; } @@ -200,7 +200,7 @@ test_i::invocation_priority (RTCORBA::Priority invocation_priority) } void -test_i::start (void) +test_i::start () { ACE_DEBUG ((LM_DEBUG, "\n")); @@ -279,13 +279,13 @@ test_i::thread_info (const char *method_name) } void -test_i::method (void) +test_i::method () { this->thread_info ("test_i::method"); } PortableServer::POA_ptr -test_i::_default_POA (void) +test_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -372,17 +372,17 @@ class Server public: Server (CORBA::ORB_ptr orb); - void create_servant_in_root_poa (void); + void create_servant_in_root_poa (); void create_poa_and_servant_with_tp_policy (const char *poa_name, int set_priority_model, RTCORBA::PriorityModel priority_model); void create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, RTCORBA::PriorityModel priority_model); - void test (void); - void start_testing (void); + void test (); + void start_testing (); //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); //FUZZ: enable check_for_lack_ACE_OS CORBA::ORB_var orb_; @@ -440,7 +440,7 @@ Server::Server (CORBA::ORB_ptr orb) } void -Server::create_servant_in_root_poa (void) +Server::create_servant_in_root_poa () { test_i *servant = 0; ACE_NEW_THROW_EX (servant, @@ -707,7 +707,7 @@ Server::create_poa_and_servant_with_tp_with_lanes_policy (const char *poa_name, } void -Server::start_testing (void) +Server::start_testing () { Tests::ITERATOR iterator (this->tests_); while (!iterator.done ()) @@ -726,7 +726,7 @@ Server::start_testing (void) } void -Server::test (void) +Server::test () { this->start_testing (); @@ -739,7 +739,7 @@ Server::test (void) } void -Server::shutdown (void) +Server::shutdown () { this->orb_->shutdown (true); @@ -752,7 +752,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -765,7 +765,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp index ff80804b53d..356061f3cba 100644 --- a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp +++ b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.cpp @@ -78,7 +78,7 @@ static const char *dscp_char[]= }; */ -Custom_Network_Priority_Mapping::Custom_Network_Priority_Mapping (void) +Custom_Network_Priority_Mapping::Custom_Network_Priority_Mapping () : corba_priority_ (RTCORBA::minPriority) { } diff --git a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h index 93d67b423c1..2bb2e9071f6 100644 --- a/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h +++ b/TAO/tests/RTCORBA/Diffserv/Custom_Network_Priority_Mapping.h @@ -33,7 +33,7 @@ class Custom_Network_Priority_Mapping : public TAO_Network_Priority_Mapping { public: - Custom_Network_Priority_Mapping (void); + Custom_Network_Priority_Mapping (); CORBA::Boolean to_network (RTCORBA::Priority corba_priority, RTCORBA::NetworkPriority &network_priority); diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp index 1658d903351..3e7aaf5ec1d 100644 --- a/TAO/tests/RTCORBA/Diffserv/server.cpp +++ b/TAO/tests/RTCORBA/Diffserv/server.cpp @@ -13,10 +13,10 @@ class Test_i : public POA_Test public: Test_i (CORBA::ORB_ptr orb); - void test_method (void); + void test_method (); //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); //FUZZ: enable check_for_lack_ACE_OS private: @@ -29,14 +29,14 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } void -Test_i::test_method (void) +Test_i::test_method () { ACE_DEBUG ((LM_DEBUG, "Test_i::test_method\n")); } void -Test_i::shutdown (void) +Test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp index 8139491449d..f57bdda98c6 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp @@ -54,7 +54,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -67,7 +67,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp index 47fb7f623b8..eec7da5d71f 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp @@ -153,7 +153,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -166,7 +166,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp index 4f22163fed7..59002204b8a 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp @@ -50,13 +50,13 @@ test_i::method (CORBA::Long client_id, } PortableServer::POA_ptr -test_i::_default_POA (void) +test_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } void -test_i::shutdown (void) +test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h index 17dc7cbdea7..ab2fa2e9de7 100644 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h +++ b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h @@ -22,10 +22,10 @@ public: CORBA::Long_out thread_count); /// Shutdown the server. - void shutdown (void); + void shutdown (); /// Our POA. - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); private: /// ORB. diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp index 9dfa5127741..86ba3654e6e 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp +++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp @@ -15,10 +15,10 @@ public: // ctor // = The Test methods. - void test_method (void); + void test_method (); //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); //FUZZ: enable check_for_lack_ACE_OS private: @@ -39,7 +39,7 @@ Test_i::test_method (/* */) } void -Test_i::shutdown (void) +Test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp index 163e344ee67..9d82bd361fc 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp @@ -75,9 +75,9 @@ public: RTCORBA::Current_ptr current, CORBA::Short priority); - int svc (void); + int svc (); - void validate_connection (void); + void validate_connection (); private: test_var test_; @@ -97,7 +97,7 @@ Worker_Thread::Worker_Thread (ACE_Thread_Manager &thread_manager, } void -Worker_Thread::validate_connection (void) +Worker_Thread::validate_connection () { // Try to validate the connection several times, ignoring transient // exceptions. If the connection can still not be setup, return @@ -131,7 +131,7 @@ Worker_Thread::validate_connection (void) } int -Worker_Thread::svc (void) +Worker_Thread::svc () { try { @@ -157,7 +157,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -170,7 +170,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp index 5bb397b130c..65afe698d1f 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp @@ -13,13 +13,13 @@ public: test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - void method (void); + void method (); //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); //FUZZ: enable check_for_lack_ACE_OS - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); private: CORBA::ORB_var orb_; @@ -34,14 +34,14 @@ test_i::test_i (CORBA::ORB_ptr orb, } void -test_i::method (void) +test_i::method () { ACE_DEBUG ((LM_DEBUG, "test_i::method\n")); } void -test_i::shutdown (void) +test_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "test_i::shutdown\n")); @@ -50,7 +50,7 @@ test_i::shutdown (void) } PortableServer::POA_ptr -test_i::_default_POA (void) +test_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -140,7 +140,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -153,7 +153,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp index 778f3d3fda0..f152599b8ad 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp @@ -146,7 +146,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -159,7 +159,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { @@ -354,7 +354,7 @@ Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb, } int -Worker_Thread::svc (void) +Worker_Thread::svc () { try { diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp index 05a61616ea5..821180b0877 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp @@ -16,10 +16,10 @@ public: Test_i (CORBA::ORB_ptr orb); // ctor - void test_method (void); + void test_method (); //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); //FUZZ: enable check_for_lack_ACE_OS private: @@ -39,7 +39,7 @@ Test_i::test_method ( /* */) } void -Test_i::shutdown (void) +Test_i::shutdown () { this->orb_->shutdown (false); } @@ -93,7 +93,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -106,7 +106,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp index c9d95704910..96e72cfbca7 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp +++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp @@ -13,13 +13,13 @@ public: test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - void method (void); + void method (); //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); //FUZZ: enable check_for_lack_ACE_OS - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); private: CORBA::ORB_var orb_; @@ -34,14 +34,14 @@ test_i::test_i (CORBA::ORB_ptr orb, } void -test_i::method (void) +test_i::method () { ACE_DEBUG ((LM_DEBUG, "test_i::method\n")); } void -test_i::shutdown (void) +test_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "test_i::shutdown\n")); @@ -50,7 +50,7 @@ test_i::shutdown (void) } PortableServer::POA_ptr -test_i::_default_POA (void) +test_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp index 345973de395..5819b2d4553 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp @@ -57,7 +57,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -70,7 +70,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp index 16e648b1800..a4c66f8dcd4 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp @@ -14,15 +14,15 @@ public: CORBA::Short server_priority, CORBA::Short client_priority); - CORBA::Short method (void); + CORBA::Short method (); - void prioritized_method (void); + void prioritized_method (); //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); //FUZZ: enable check_for_lack_ACE_OS - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); private: CORBA::ORB_var orb_; @@ -43,7 +43,7 @@ test_i::test_i (CORBA::ORB_ptr orb, } CORBA::Short -test_i::method (void) +test_i::method () { ACE_DEBUG ((LM_DEBUG, "test_i::method\n")); @@ -52,7 +52,7 @@ test_i::method (void) } void -test_i::prioritized_method (void) +test_i::prioritized_method () { CORBA::Object_var object = this->orb_->resolve_initial_references ("RTCurrent"); @@ -73,7 +73,7 @@ test_i::prioritized_method (void) } void -test_i::shutdown (void) +test_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "test_i::shutdown\n")); @@ -82,7 +82,7 @@ test_i::shutdown (void) } PortableServer::POA_ptr -test_i::_default_POA (void) +test_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -161,8 +161,8 @@ public: PortableServer::POA_ptr root_poa, PortableServer::POAManager_ptr poa_manager); - void test_root_poa (void); - void test_child_poa (void); + void test_root_poa (); + void test_child_poa (); typedef void (server::*test_function) (CORBA::PolicyList &policies, CORBA::Short server_priority, @@ -210,29 +210,29 @@ public: CORBA::Short client_priority, const char *test_name); - void test_default_pool_no_bands_client_propagated_poa (void); + void test_default_pool_no_bands_client_propagated_poa (); - void test_no_lanes_no_bands_client_propagated_poa (void); + void test_no_lanes_no_bands_client_propagated_poa (); - void test_lanes_no_bands_client_propagated_poa (void); + void test_lanes_no_bands_client_propagated_poa (); - void test_default_pool_bands_client_propagated_poa (void); + void test_default_pool_bands_client_propagated_poa (); - void test_no_lanes_bands_client_propagated_poa (void); + void test_no_lanes_bands_client_propagated_poa (); - void test_lanes_bands_client_propagated_poa (void); + void test_lanes_bands_client_propagated_poa (); - void test_default_pool_no_bands_server_declared_poa (void); + void test_default_pool_no_bands_server_declared_poa (); - void test_no_lanes_no_bands_server_declared_poa (void); + void test_no_lanes_no_bands_server_declared_poa (); - void test_lanes_no_bands_server_declared_poa (void); + void test_lanes_no_bands_server_declared_poa (); - void test_default_pool_bands_server_declared_poa (void); + void test_default_pool_bands_server_declared_poa (); - void test_no_lanes_bands_server_declared_poa (void); + void test_no_lanes_bands_server_declared_poa (); - void test_lanes_bands_server_declared_poa (void); + void test_lanes_bands_server_declared_poa (); private: CORBA::ORB_var orb_; @@ -253,7 +253,7 @@ server::server (CORBA::ORB_ptr orb, } void -server::test_root_poa (void) +server::test_root_poa () { test_i *servant = 0; ACE_NEW_THROW_EX (servant, @@ -279,7 +279,7 @@ server::test_root_poa (void) } void -server::test_child_poa (void) +server::test_child_poa () { CORBA::PolicyList policies; policies.length (1); @@ -480,7 +480,7 @@ server::test_bands_client_propagated_poa (CORBA::PolicyList &policies, } void -server::test_default_pool_no_bands_client_propagated_poa (void) +server::test_default_pool_no_bands_client_propagated_poa () { this->test_default_pool_poa (::client_priority + 1, ::client_priority + 1, @@ -489,7 +489,7 @@ server::test_default_pool_no_bands_client_propagated_poa (void) } void -server::test_no_lanes_no_bands_client_propagated_poa (void) +server::test_no_lanes_no_bands_client_propagated_poa () { this->test_no_lanes_poa (::client_priority - 1, ::client_priority - 1, @@ -498,7 +498,7 @@ server::test_no_lanes_no_bands_client_propagated_poa (void) } void -server::test_lanes_no_bands_client_propagated_poa (void) +server::test_lanes_no_bands_client_propagated_poa () { this->test_lanes_poa (::client_priority, ::client_priority, @@ -507,7 +507,7 @@ server::test_lanes_no_bands_client_propagated_poa (void) } void -server::test_default_pool_bands_client_propagated_poa (void) +server::test_default_pool_bands_client_propagated_poa () { this->test_default_pool_poa (::client_priority + 1, ::client_priority + 1, @@ -516,7 +516,7 @@ server::test_default_pool_bands_client_propagated_poa (void) } void -server::test_no_lanes_bands_client_propagated_poa (void) +server::test_no_lanes_bands_client_propagated_poa () { this->test_no_lanes_poa (::client_priority - 1, ::client_priority - 1, @@ -525,7 +525,7 @@ server::test_no_lanes_bands_client_propagated_poa (void) } void -server::test_lanes_bands_client_propagated_poa (void) +server::test_lanes_bands_client_propagated_poa () { this->test_lanes_poa (::client_priority, ::client_priority + 1, @@ -588,7 +588,7 @@ server::test_bands_server_declared_poa (CORBA::PolicyList &policies, } void -server::test_default_pool_no_bands_server_declared_poa (void) +server::test_default_pool_no_bands_server_declared_poa () { this->test_default_pool_poa (::server_priority, ::client_priority + 1, @@ -597,7 +597,7 @@ server::test_default_pool_no_bands_server_declared_poa (void) } void -server::test_no_lanes_no_bands_server_declared_poa (void) +server::test_no_lanes_no_bands_server_declared_poa () { this->test_no_lanes_poa (::server_priority, ::client_priority - 1, @@ -606,7 +606,7 @@ server::test_no_lanes_no_bands_server_declared_poa (void) } void -server::test_lanes_no_bands_server_declared_poa (void) +server::test_lanes_no_bands_server_declared_poa () { this->test_lanes_poa (::server_priority, ::client_priority + 1, @@ -615,7 +615,7 @@ server::test_lanes_no_bands_server_declared_poa (void) } void -server::test_default_pool_bands_server_declared_poa (void) +server::test_default_pool_bands_server_declared_poa () { this->test_default_pool_poa (::server_priority, ::client_priority - 1, @@ -624,7 +624,7 @@ server::test_default_pool_bands_server_declared_poa (void) } void -server::test_no_lanes_bands_server_declared_poa (void) +server::test_no_lanes_bands_server_declared_poa () { this->test_no_lanes_poa (::server_priority, ::client_priority + 1, @@ -633,7 +633,7 @@ server::test_no_lanes_bands_server_declared_poa (void) } void -server::test_lanes_bands_server_declared_poa (void) +server::test_lanes_bands_server_declared_poa () { this->test_lanes_poa (::server_priority, ::client_priority - 1, @@ -647,7 +647,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -660,7 +660,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp index 88bff55664a..621a8106df6 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp @@ -62,7 +62,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -75,7 +75,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp index 1f0ed9048e6..437bc8c8094 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp @@ -154,7 +154,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -167,7 +167,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp index f33d08539bb..5635e9d438d 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.cpp @@ -88,7 +88,7 @@ test_i::method (CORBA::ULong work, } PortableServer::POA_ptr -test_i::_default_POA (void) +test_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -100,7 +100,7 @@ test_i::initialize (CORBA::ULong total_iterations) } int -test_i::estimate_iterations (void) +test_i::estimate_iterations () { // Estimate for 2 seconds. ACE_Time_Value work_time (2); diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h index 5c8ad620c53..3ab143950c2 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/test_i.h @@ -27,13 +27,13 @@ public: const char *iteration); /// Our POA. - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); /// Work (burn CPU). void work (CORBA::ULong work); /// Estimates work iterations performed per second. - int estimate_iterations (void); + int estimate_iterations (); private: /// ORB. diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp index 7d33d8e2a48..63d5ec79ab1 100644 --- a/TAO/tests/RTCORBA/Private_Connection/server.cpp +++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp @@ -14,10 +14,10 @@ public: // ctor // = The Test methods. - void test_method (void); + void test_method (); //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); //FUZZ: enable check_for_lack_ACE_OS private: @@ -38,7 +38,7 @@ Test_i::test_method (/* */) } void -Test_i::shutdown (void) +Test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp index 3d0a3128e24..00f1bab03a1 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp @@ -98,7 +98,7 @@ public: RTCORBA::RTORB_ptr rt_orb, CORBA::PolicyManager_ptr policy_manager); - void vanilla_invocations (void); + void vanilla_invocations (); void priority_invocations (int debug); @@ -106,9 +106,9 @@ public: void set_priority_bands (int debug); - void set_private_connection_policies (void); + void set_private_connection_policies (); - void reset_policies (void); + void reset_policies (); private: @@ -128,9 +128,9 @@ public: RTCORBA::Current_ptr current, CORBA::Short priority); - int svc (void); + int svc (); - void validate_connection (void); + void validate_connection (); private: Client client_; @@ -153,7 +153,7 @@ Worker_Thread::Worker_Thread (ACE_Thread_Manager &thread_manager, } void -Worker_Thread::validate_connection (void) +Worker_Thread::validate_connection () { // Try to validate the connection several times, ignoring transient // exceptions. If the connection can still not be setup, return @@ -187,7 +187,7 @@ Worker_Thread::validate_connection (void) } int -Worker_Thread::svc (void) +Worker_Thread::svc () { try { @@ -218,7 +218,7 @@ Client::Client (test_ptr test, } void -Client::vanilla_invocations (void) +Client::vanilla_invocations () { for (int i = 0; i < iterations; i++) { @@ -339,7 +339,7 @@ Client::set_priority_bands (int debug) } void -Client::set_private_connection_policies (void) +Client::set_private_connection_policies () { CORBA::PolicyList policies; policies.length (1); @@ -352,7 +352,7 @@ Client::set_private_connection_policies (void) } void -Client::reset_policies (void) +Client::reset_policies () { CORBA::PolicyList empty_policies; @@ -366,7 +366,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -379,7 +379,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp index 33c297afc84..a54df58297e 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp @@ -28,13 +28,13 @@ public: test_i (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa); - void method (void); + void method (); //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); //FUZZ: enable check_for_lack_ACE_OS - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); private: CORBA::ORB_var orb_; @@ -49,7 +49,7 @@ test_i::test_i (CORBA::ORB_ptr orb, } void -test_i::method (void) +test_i::method () { // Get the ORB_Core's TSS resources. TAO_ORB_Core_TSS_Resources *tss = @@ -73,7 +73,7 @@ test_i::method (void) } void -test_i::shutdown (void) +test_i::shutdown () { if (debug) ACE_DEBUG ((LM_DEBUG, @@ -83,7 +83,7 @@ test_i::shutdown (void) } PortableServer::POA_ptr -test_i::_default_POA (void) +test_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -290,7 +290,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -303,7 +303,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp index 4419abc930c..e84e8a3b901 100644 --- a/TAO/tests/RTCORBA/Server_Declared/server.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp @@ -18,7 +18,7 @@ public: void test_method (CORBA::Short priority); //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); //FUZZ: enable check_for_lack_ACE_OS private: @@ -62,7 +62,7 @@ Test_i::test_method (CORBA::Short priority) } void -Test_i::shutdown (void) +Test_i::shutdown () { this->orb_->shutdown (false); } @@ -195,7 +195,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -208,7 +208,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp index dbfe11fae93..d3be7dda05a 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp @@ -17,7 +17,7 @@ public: // ctor //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); //FUZZ: enable check_for_lack_ACE_OS private: @@ -31,7 +31,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } void -Test_i::shutdown (void) +Test_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "Received request to shut down the ORB\n")); diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp index fe8a0c032dd..26ebd2508b1 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp @@ -53,7 +53,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -66,7 +66,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp index 2c3b05e739e..702ea91a7f7 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp @@ -150,7 +150,7 @@ public: Task (ACE_Thread_Manager &thread_manager, CORBA::ORB_ptr orb); - int svc (void); + int svc (); CORBA::ORB_var orb_; }; @@ -163,7 +163,7 @@ Task::Task (ACE_Thread_Manager &thread_manager, } int -Task::svc (void) +Task::svc () { try { diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp index f05b9b314f5..d448c539159 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.cpp @@ -44,13 +44,13 @@ test_i::method (CORBA::Long client_id, } PortableServer::POA_ptr -test_i::_default_POA (void) +test_i::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } void -test_i::shutdown (void) +test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/RTCORBA/Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Thread_Pool/test_i.h index fa025e013dc..e57f4a6cfb9 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/test_i.h +++ b/TAO/tests/RTCORBA/Thread_Pool/test_i.h @@ -22,10 +22,10 @@ public: CORBA::Long iteration); /// Shutdown the server. - void shutdown (void); + void shutdown (); /// Our POA. - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); private: /// ORB. diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.cpp b/TAO/tests/RTScheduling/Current/Thread_Task.cpp index 154474fea0b..979c3376d25 100644 --- a/TAO/tests/RTScheduling/Current/Thread_Task.cpp +++ b/TAO/tests/RTScheduling/Current/Thread_Task.cpp @@ -84,7 +84,7 @@ Thread_Task::activate_task (int thr_count) } int -Thread_Task::svc (void) +Thread_Task::svc () { try { @@ -168,7 +168,7 @@ Thread_Task::svc (void) return 0; } -Thread_Task::~Thread_Task (void) +Thread_Task::~Thread_Task () { delete shutdown_lock_; delete lock_; diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.h b/TAO/tests/RTScheduling/Current/Thread_Task.h index eca0f6da253..2051a7bafdf 100644 --- a/TAO/tests/RTScheduling/Current/Thread_Task.h +++ b/TAO/tests/RTScheduling/Current/Thread_Task.h @@ -13,7 +13,7 @@ class Thread_Task : public ACE_Task <ACE_SYNCH> int activate_task (int thr_count); - ~Thread_Task (void); + ~Thread_Task (); protected: /// task svc diff --git a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h index 8280f3f4862..97ef880d374 100644 --- a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h +++ b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h @@ -17,7 +17,7 @@ class Test_Thread_Action: public RTScheduling::ThreadAction { public: - Test_Thread_Action (void); + Test_Thread_Action (); virtual void _cxx_do (CORBA::VoidData data); }; @@ -25,7 +25,7 @@ public RTScheduling::ThreadAction #endif /*Thread_Action_H*/ -Test_Thread_Action::Test_Thread_Action (void) +Test_Thread_Action::Test_Thread_Action () { } diff --git a/TAO/tests/RTScheduling/Scheduler.cpp b/TAO/tests/RTScheduling/Scheduler.cpp index fe6cfa85767..c25fcaec69d 100644 --- a/TAO/tests/RTScheduling/Scheduler.cpp +++ b/TAO/tests/RTScheduling/Scheduler.cpp @@ -11,12 +11,12 @@ TAO_Scheduler::TAO_Scheduler (CORBA::ORB_ptr orb) current_ = RTScheduling::Current::_narrow (current_obj.in ()); } -TAO_Scheduler::~TAO_Scheduler (void) +TAO_Scheduler::~TAO_Scheduler () { } CORBA::PolicyList* -TAO_Scheduler::scheduling_policies (void) +TAO_Scheduler::scheduling_policies () { return 0; } @@ -27,13 +27,13 @@ TAO_Scheduler::scheduling_policies (const CORBA::PolicyList &) } CORBA::PolicyList* -TAO_Scheduler::poa_policies (void) +TAO_Scheduler::poa_policies () { return 0; } char * -TAO_Scheduler::scheduling_discipline_name (void) +TAO_Scheduler::scheduling_discipline_name () { return 0; } diff --git a/TAO/tests/RTScheduling/Scheduler.h b/TAO/tests/RTScheduling/Scheduler.h index 5ab7fd1358a..ab11173f9a0 100644 --- a/TAO/tests/RTScheduling/Scheduler.h +++ b/TAO/tests/RTScheduling/Scheduler.h @@ -11,15 +11,15 @@ public RTScheduling::Scheduler, public: TAO_Scheduler (CORBA::ORB_ptr orb); - ~TAO_Scheduler (void); + ~TAO_Scheduler (); - virtual CORBA::PolicyList * scheduling_policies (void); + virtual CORBA::PolicyList * scheduling_policies (); virtual void scheduling_policies (const CORBA::PolicyList & scheduling_policies); - virtual CORBA::PolicyList * poa_policies (void); + virtual CORBA::PolicyList * poa_policies (); - virtual char * scheduling_discipline_name (void); + virtual char * scheduling_discipline_name (); virtual RTScheduling::ResourceManager_ptr create_resource_manager (const char * name, CORBA::Policy_ptr scheduling_parameter); diff --git a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp index a5017e013b7..0f42bfcc6f7 100644 --- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp +++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp @@ -39,7 +39,7 @@ public: } //FUZZ: disable check_for_lack_ACE_OS - virtual void shutdown (void) + virtual void shutdown () { orb_->shutdown (); } diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp index 52ed109973a..66cdc33242b 100644 --- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp +++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp @@ -6,7 +6,7 @@ ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> guid_index; RTScheduling::Current::IdType* -Thread_Task::guids (void) +Thread_Task::guids () { return this->guid_; } @@ -46,7 +46,7 @@ Thread_Task::activate_task (CORBA::ORB_ptr orb) #endif /* THREAD_CANCELLED */ int -Thread_Task::svc (void) +Thread_Task::svc () { try { diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h index 55c479befcb..642c23d55eb 100644 --- a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h +++ b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.h @@ -11,7 +11,7 @@ class Thread_Task : public ACE_Task <ACE_SYNCH> public: int activate_task (CORBA::ORB_ptr orb); - RTScheduling::Current::IdType* guids (void); + RTScheduling::Current::IdType* guids (); protected: /// task svc diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp index 22e9d2969df..0427cbd91c5 100644 --- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp +++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.cpp @@ -7,13 +7,13 @@ Oneway_Receiver::Oneway_Receiver (CORBA::ORB_ptr orb) } void -Oneway_Receiver::raise_no_permission (void) +Oneway_Receiver::raise_no_permission () { throw CORBA::NO_PERMISSION (); } void -Oneway_Receiver::destroy (void) +Oneway_Receiver::destroy () { PortableServer::POA_var poa = this->_default_POA (); @@ -24,7 +24,7 @@ Oneway_Receiver::destroy (void) } Test::Shutdown_Helper_ptr -Oneway_Receiver::get_shutdown_helper (void) +Oneway_Receiver::get_shutdown_helper () { Shutdown_Helper *shutdown_helper; ACE_NEW_THROW_EX (shutdown_helper, diff --git a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h index f7653e237c2..84671b4eea9 100644 --- a/TAO/tests/Reliable_Oneways/Oneway_Receiver.h +++ b/TAO/tests/Reliable_Oneways/Oneway_Receiver.h @@ -14,11 +14,11 @@ public: Oneway_Receiver (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void raise_no_permission (void); + virtual void raise_no_permission (); - virtual void destroy (void); + virtual void destroy (); - virtual Test::Shutdown_Helper_ptr get_shutdown_helper (void); + virtual Test::Shutdown_Helper_ptr get_shutdown_helper (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp index ca529160340..ae0b79e779b 100644 --- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp +++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.cpp @@ -6,7 +6,7 @@ Shutdown_Helper::Shutdown_Helper (CORBA::ORB_ptr orb) } void -Shutdown_Helper::shutdown (void) +Shutdown_Helper::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h index 994bf94396b..607cf8b0e24 100644 --- a/TAO/tests/Reliable_Oneways/Shutdown_Helper.h +++ b/TAO/tests/Reliable_Oneways/Shutdown_Helper.h @@ -14,7 +14,7 @@ public: Shutdown_Helper (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.cpp b/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.cpp index 70ac48de6eb..4d4c3276cdb 100644 --- a/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.cpp +++ b/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.cpp @@ -23,7 +23,7 @@ TAO::Objref_Traits<fwd_mock_reference>::release ( } fwd_mock_reference_ptr -TAO::Objref_Traits<fwd_mock_reference>::nil (void) +TAO::Objref_Traits<fwd_mock_reference>::nil () { return 0; } diff --git a/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp b/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp index 008f15cda78..95e4c273736 100644 --- a/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp +++ b/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp @@ -70,7 +70,7 @@ TAO::Objref_Traits<mock_reference>::release ( } mock_reference_ptr -TAO::Objref_Traits<mock_reference>::nil (void) +TAO::Objref_Traits<mock_reference>::nil () { return mock_reference::_nil (); } diff --git a/TAO/tests/Servant_To_Reference_Test/Test_i.cpp b/TAO/tests/Servant_To_Reference_Test/Test_i.cpp index 6f98d20f46f..b04e16125cf 100644 --- a/TAO/tests/Servant_To_Reference_Test/Test_i.cpp +++ b/TAO/tests/Servant_To_Reference_Test/Test_i.cpp @@ -6,7 +6,7 @@ One_Impl::One_Impl (CORBA::ORB_ptr orb) } char * -One_Impl::get_string (void) +One_Impl::get_string () { return CORBA::string_dup ("One_Impl there!"); } @@ -17,7 +17,7 @@ Two_Impl::Two_Impl (CORBA::ORB_ptr orb) } char * -Two_Impl::get_string (void) +Two_Impl::get_string () { return CORBA::string_dup ("One_Impl there!"); } @@ -29,7 +29,7 @@ Three_Impl::Three_Impl (CORBA::ORB_ptr orb) } char * -Three_Impl::get_string (void) +Three_Impl::get_string () { return CORBA::string_dup ("Three_Impl there!"); } diff --git a/TAO/tests/Servant_To_Reference_Test/Test_i.h b/TAO/tests/Servant_To_Reference_Test/Test_i.h index a33ac60baf4..11e14547108 100644 --- a/TAO/tests/Servant_To_Reference_Test/Test_i.h +++ b/TAO/tests/Servant_To_Reference_Test/Test_i.h @@ -13,7 +13,7 @@ public: One_Impl (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void); + virtual char * get_string (); private: /// Use an ORB reference to convert strings to objects and shutdown @@ -29,7 +29,7 @@ public: Two_Impl (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void); + virtual char * get_string (); private: /// Use an ORB reference to convert strings to objects and shutdown @@ -45,7 +45,7 @@ public: Three_Impl (CORBA::ORB_ptr orb); // = The skeleton methods - virtual char * get_string (void); + virtual char * get_string (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Servant_To_Reference_Test/server.cpp b/TAO/tests/Servant_To_Reference_Test/server.cpp index 65a3bf86b53..2fcf8fd65e5 100644 --- a/TAO/tests/Servant_To_Reference_Test/server.cpp +++ b/TAO/tests/Servant_To_Reference_Test/server.cpp @@ -19,7 +19,7 @@ public: { } - int svc (void); + int svc (); private: PortableServer::POA_var p_; @@ -29,7 +29,7 @@ private: }; int -MT_Task::svc (void) +MT_Task::svc () { try { diff --git a/TAO/tests/Server_Connection_Purging/Test_i.cpp b/TAO/tests/Server_Connection_Purging/Test_i.cpp index 32bcd87338f..6343eee9ac3 100644 --- a/TAO/tests/Server_Connection_Purging/Test_i.cpp +++ b/TAO/tests/Server_Connection_Purging/Test_i.cpp @@ -12,7 +12,7 @@ test_i::send_stuff (const char* string) } void -test_i::shutdown (void) +test_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) About to invoke shudown...\n")); diff --git a/TAO/tests/Server_Connection_Purging/Test_i.h b/TAO/tests/Server_Connection_Purging/Test_i.h index ab8730f8b3f..0d88882e59e 100644 --- a/TAO/tests/Server_Connection_Purging/Test_i.h +++ b/TAO/tests/Server_Connection_Purging/Test_i.h @@ -14,7 +14,7 @@ public: // = The skeleton methods virtual void send_stuff (const char* string); - virtual void shutdown (void); + virtual void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Server_Leaks/Ping_Service.cpp b/TAO/tests/Server_Leaks/Ping_Service.cpp index 3ad4f33e1f8..4b2c6a46b3d 100644 --- a/TAO/tests/Server_Leaks/Ping_Service.cpp +++ b/TAO/tests/Server_Leaks/Ping_Service.cpp @@ -6,12 +6,12 @@ Ping_Service::Ping_Service (CORBA::ORB_ptr orb) } void -Ping_Service::ping (void) +Ping_Service::ping () { } void -Ping_Service::shutdown (void) +Ping_Service::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Server_Leaks/Ping_Service.h b/TAO/tests/Server_Leaks/Ping_Service.h index 1488a615128..ae6b6806e2c 100644 --- a/TAO/tests/Server_Leaks/Ping_Service.h +++ b/TAO/tests/Server_Leaks/Ping_Service.h @@ -14,9 +14,9 @@ public: Ping_Service (CORBA::ORB_ptr orb); // = The skeleton methods - virtual void ping (void); + virtual void ping (); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Server_Port_Zero/Hello.cpp b/TAO/tests/Server_Port_Zero/Hello.cpp index 0d000b9f195..bdfcac050fb 100644 --- a/TAO/tests/Server_Port_Zero/Hello.cpp +++ b/TAO/tests/Server_Port_Zero/Hello.cpp @@ -6,13 +6,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/tests/Server_Port_Zero/Hello.h b/TAO/tests/Server_Port_Zero/Hello.h index 8b2124d9fe5..88fd5ffb5b8 100644 --- a/TAO/tests/Server_Port_Zero/Hello.h +++ b/TAO/tests/Server_Port_Zero/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/tests/Single_Read/test_i.cpp b/TAO/tests/Single_Read/test_i.cpp index 44acb005512..c066d4b7c03 100644 --- a/TAO/tests/Single_Read/test_i.cpp +++ b/TAO/tests/Single_Read/test_i.cpp @@ -39,7 +39,7 @@ test_i::method (CORBA::ULong request_number, } void -test_i::shutdown (void) +test_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) About to invoke shudown... ")); diff --git a/TAO/tests/Single_Read/test_i.h b/TAO/tests/Single_Read/test_i.h index e6869668f37..100978728df 100644 --- a/TAO/tests/Single_Read/test_i.h +++ b/TAO/tests/Single_Read/test_i.h @@ -28,7 +28,7 @@ public: void method (CORBA::ULong request_number, const test::data &); - void shutdown (void); + void shutdown (); private: /// The ORB. diff --git a/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp b/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp index dff1368f8de..fbde599f444 100644 --- a/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp +++ b/TAO/tests/Skeleton_Inheritance/interface_3_i.cpp @@ -7,13 +7,13 @@ interface_3_i::interface_3_i (CORBA::ORB_ptr orb) // INTERFACE 1 char * -interface_3_i::operation_1 (void) +interface_3_i::operation_1 () { return CORBA::string_dup ("Invoked operation one"); } ::CORBA::Long -interface_3_i::attribute_1 (void) +interface_3_i::attribute_1 () { return 10; } @@ -27,13 +27,13 @@ interface_3_i::attribute_1 (::CORBA::Long attribute_1) // INTERFACE 2 char * -interface_3_i::operation_2 (void) +interface_3_i::operation_2 () { return CORBA::string_dup ("Invoked operation two"); } char * -interface_3_i::attribute_2 (void) +interface_3_i::attribute_2 () { return CORBA::string_dup ("Returning attribute_2"); } @@ -41,19 +41,19 @@ interface_3_i::attribute_2 (void) //INTERFACE 3 char * -interface_3_i::operation_3 (void) +interface_3_i::operation_3 () { return CORBA::string_dup ("Invoked operation three"); } void -interface_3_i::shutdown (void) +interface_3_i::shutdown () { this->orb_->shutdown (); } ::CORBA::Short -interface_3_i::attribute_3 (void) +interface_3_i::attribute_3 () { return 10; } diff --git a/TAO/tests/Skeleton_Inheritance/interface_3_i.h b/TAO/tests/Skeleton_Inheritance/interface_3_i.h index c532071b5c6..b536d54146f 100644 --- a/TAO/tests/Skeleton_Inheritance/interface_3_i.h +++ b/TAO/tests/Skeleton_Inheritance/interface_3_i.h @@ -12,18 +12,18 @@ public: /// Constructor interface_3_i (CORBA::ORB_ptr orb); - virtual char * operation_1 (void); - virtual char * operation_2 (void); - virtual char * operation_3 (void); + virtual char * operation_1 (); + virtual char * operation_2 (); + virtual char * operation_3 (); - virtual void shutdown (void); + virtual void shutdown (); - virtual ::CORBA::Long attribute_1 (void); + virtual ::CORBA::Long attribute_1 (); virtual void attribute_1 (::CORBA::Long attribute_1); - virtual char * attribute_2 (void); + virtual char * attribute_2 (); - virtual ::CORBA::Short attribute_3 (void); + virtual ::CORBA::Short attribute_3 (); virtual void attribute_3 (::CORBA::Short attribute_3); private: diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp index b8974757c1e..8a1ccf20498 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.cpp @@ -1,5 +1,5 @@ #include "Smart_Proxy_Impl.h" -Smart_Test_Factory::Smart_Test_Factory (void) +Smart_Test_Factory::Smart_Test_Factory () { ACE_DEBUG ((LM_DEBUG, "Smart_Test_Factory\n")); @@ -24,7 +24,7 @@ Smart_Test_Proxy::Smart_Test_Proxy (Test_ptr proxy) } CORBA::Short -Smart_Test_Proxy::box_prices (void) +Smart_Test_Proxy::box_prices () { if (this->price_ == 0) { diff --git a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h index 3bd7df13a74..cffbbb30f72 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Benchmark/Smart_Proxy_Impl.h @@ -2,7 +2,7 @@ class Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory { public: - Smart_Test_Factory (void); + Smart_Test_Factory (); virtual Test_ptr create_proxy (Test_ptr proxy); // This method will create the smart_proxy. @@ -13,7 +13,7 @@ class Smart_Test_Proxy : public virtual TAO_Test_Smart_Proxy_Base public: Smart_Test_Proxy (Test_ptr proxy); - virtual CORBA::Short box_prices(void); + virtual CORBA::Short box_prices(); // "Smartify" the method call! private: diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp index 4b9bab49faf..04f63a733b8 100644 --- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp +++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp @@ -21,13 +21,13 @@ class Test_i : public POA_Test public: Test_i (CORBA::ORB_ptr orb); - CORBA::Short box_prices (void); + CORBA::Short box_prices (); CORBA::Long tickets (CORBA::Short number); //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; @@ -39,7 +39,7 @@ Test_i::Test_i (CORBA::ORB_ptr orb) } CORBA::Short -Test_i::box_prices (void) +Test_i::box_prices () { return 125; } @@ -51,7 +51,7 @@ Test_i::tickets (CORBA::Short number) } void -Test_i::shutdown (void) +Test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp index 9b5a1e94d74..93e35c36308 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.cpp @@ -14,7 +14,7 @@ #include "Coll_Tester.h" #include "Smart_Proxy_Impl.h" -Collocation_Test::Collocation_Test (void) +Collocation_Test::Collocation_Test () { } @@ -76,7 +76,7 @@ Collocation_Test::parse_args (int, ACE_TCHAR *[]) } int -Collocation_Test::test_narrow (void) +Collocation_Test::test_narrow () { // Ensure that the smart proxy is the one which is used by registering // the user-defined factory. Its necessary to create one on the heap so @@ -114,7 +114,7 @@ Collocation_Test::test_narrow (void) } int -Collocation_Test::run (void) +Collocation_Test::run () { this->poa_manager_->activate (); diff --git a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h index f7b8a7f346e..b1309a4f502 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h +++ b/TAO/tests/Smart_Proxies/Collocation/Coll_Tester.h @@ -24,7 +24,7 @@ class Collocation_Test { public: - Collocation_Test (void); + Collocation_Test (); int init (int argc, ACE_TCHAR *argv[]); // Initializing the Collocation_Test object. @@ -32,11 +32,11 @@ public: int parse_args (int argc, ACE_TCHAR *argv[]); // Parse the test specific arguments. - int test_narrow (void); + int test_narrow (); // This test narrow an object reference to its base class and see // if it works correctly. - int run (void); + int run (); // Run the test. private: diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp index 6dcf936df1f..349d03c1061 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.cpp @@ -9,7 +9,7 @@ Top_i::~Top_i () } char * -Top_i::shape (void) +Top_i::shape () { return CORBA::string_dup ("a point."); } @@ -25,13 +25,13 @@ Left_i::~Left_i () } char * -Left_i::shape (void) +Left_i::shape () { return CORBA::string_dup ("the left line"); } char * -Left_i::color (void) +Left_i::color () { return CORBA::string_dup ("black"); } @@ -45,20 +45,20 @@ Right_i::~Right_i () } char * -Right_i::shape (void) +Right_i::shape () { return CORBA::string_dup ("the right line"); } char * -Right_i::color (void) +Right_i::color () { return CORBA::string_dup ("red"); // } CORBA::Long -Right_i::width (void) +Right_i::width () { return 0; } @@ -72,25 +72,25 @@ Buttom_i::~Buttom_i () } char * -Buttom_i::shape (void) +Buttom_i::shape () { return CORBA::string_dup ("a diamond"); } char * -Buttom_i::color (void) +Buttom_i::color () { return CORBA::string_dup ("translucent"); } CORBA::Long -Buttom_i::width (void) +Buttom_i::width () { return 100; } char * -Buttom_i::name (void) +Buttom_i::name () { return CORBA::string_dup ("Jubilee"); } diff --git a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h index 354ae97d32b..147b9e862b6 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h +++ b/TAO/tests/Smart_Proxies/Collocation/Diamond_i.h @@ -11,62 +11,62 @@ class Diamond_Export Top_i : public POA_Diamond::Top { public: - Top_i (void); - ~Top_i (void); + Top_i (); + ~Top_i (); // Ctor and dtor. - virtual char* shape (void); + virtual char* shape (); // Return the shape of this object (interface.) }; class Diamond_Export Left_i : public POA_Diamond::Left { public: - Left_i (void); - ~Left_i (void); + Left_i (); + ~Left_i (); // Ctor, dtor. - virtual char * shape (void); + virtual char * shape (); // Return the shape of this object (interface.) - virtual char * color (void); + virtual char * color (); // Return the color of this object (interface.) }; class Diamond_Export Right_i : public POA_Diamond::Right { public: - Right_i (void); - ~Right_i (void); + Right_i (); + ~Right_i (); // Ctor, dtor. - virtual char * shape (void); + virtual char * shape (); // Return the shape of this object (interface.) - virtual char * color (void); + virtual char * color (); // Return the color of this object (interface.) - virtual CORBA::Long width (void); + virtual CORBA::Long width (); // Return the width of the stuff. }; class Diamond_Export Buttom_i : public POA_Diamond::Buttom { public: - Buttom_i (void); - ~Buttom_i (void); + Buttom_i (); + ~Buttom_i (); // Ctor, dtor. - virtual char * shape (void); + virtual char * shape (); // Return the shape of this object (interface.) - virtual char * color (void); + virtual char * color (); // Return the color of this object (interface.) - virtual CORBA::Long width (void); + virtual CORBA::Long width (); // Return the width of the stuff. - virtual char * name (void); + virtual char * name (); // Return the name of the object. }; diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp index 47ae1744758..bb628f8abab 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.cpp @@ -3,7 +3,7 @@ #include "ace/OS_NS_string.h" #include "ace/Log_Msg.h" -Smart_Diamond_Top_Factory::Smart_Diamond_Top_Factory (void) +Smart_Diamond_Top_Factory::Smart_Diamond_Top_Factory () { ACE_DEBUG ((LM_DEBUG, "Smart_Diamond_Top_Factory\n")); } diff --git a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h index 1dd3fc82864..043a501e6a4 100644 --- a/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Collocation/Smart_Proxy_Impl.h @@ -8,7 +8,7 @@ class MY_Stub_Export Smart_Diamond_Top_Factory : public virtual Diamond::TAO_Diamond_Top_Default_Proxy_Factory { public: - Smart_Diamond_Top_Factory (void); + Smart_Diamond_Top_Factory (); virtual Diamond::Top_ptr create_proxy (Diamond::Top_ptr proxy); diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp index fc0bbd9672a..8379e0391a6 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.cpp @@ -1,7 +1,7 @@ #define ACE_BUILD_SVC_DLL #include "Smart_Test_Factory.h" -Smart_Test_Factory::Smart_Test_Factory (void) +Smart_Test_Factory::Smart_Test_Factory () { ACE_DEBUG ((LM_DEBUG, "Smart_Test_Factory\n")); diff --git a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h index 04df6b50990..974505ca8e0 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h +++ b/TAO/tests/Smart_Proxies/On_Demand/Smart_Test_Factory.h @@ -8,7 +8,7 @@ class ACE_Svc_Export Smart_Test_Factory { public: - Smart_Test_Factory (void); + Smart_Test_Factory (); // This method will create the smart_proxy. virtual Test_ptr create_proxy (Test_ptr proxy); diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp index 82be6239c97..bdf03d05fa3 100644 --- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp +++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp @@ -25,7 +25,7 @@ public: //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; @@ -48,7 +48,7 @@ Test_i :: method (CORBA::Short boo) } void -Test_i::shutdown (void) +Test_i::shutdown () { this->orb_->shutdown (); } diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp index 2ea587ee534..567999aac8e 100644 --- a/TAO/tests/Smart_Proxies/Policy/server.cpp +++ b/TAO/tests/Smart_Proxies/Policy/server.cpp @@ -25,7 +25,7 @@ public: //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; @@ -48,7 +48,7 @@ Test_i :: method (CORBA::Short boo) } void -Test_i::shutdown (void) +Test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp index b8a035f4eab..e21bc567688 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp +++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.cpp @@ -2,7 +2,7 @@ ACE_CString Smart_Test_Proxy::fake_ior_ ("This_is_my_fake_ior"); -Smart_Test_Factory::Smart_Test_Factory (void) +Smart_Test_Factory::Smart_Test_Factory () { ACE_DEBUG ((LM_DEBUG, "Smart_Test_Factory\n")); @@ -62,7 +62,7 @@ Smart_Test_Proxy::method (CORBA::Short boo) } const ACE_CString& -Smart_Test_Proxy::fake_ior (void) +Smart_Test_Proxy::fake_ior () { return fake_ior_; } diff --git a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h index f749b8d668c..9f44e9d5dc3 100644 --- a/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h +++ b/TAO/tests/Smart_Proxies/Smart_Proxy_Impl.h @@ -4,7 +4,7 @@ class Smart_Test_Factory : public virtual TAO_Test_Default_Proxy_Factory { public: - Smart_Test_Factory (void); + Smart_Test_Factory (); virtual Test_ptr create_proxy (Test_ptr proxy); // This method will create the smart_proxy. @@ -23,7 +23,7 @@ public: virtual CORBA::Short method (CORBA::Short boo); // "Smartify" the method call! - static const ACE_CString& fake_ior (void); + static const ACE_CString& fake_ior (); // Don't need to add any extra functionality into <shutdown>, hence // we don't define it. diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp index 084d7474ab5..2969f2471b8 100644 --- a/TAO/tests/Smart_Proxies/dtor/server.cpp +++ b/TAO/tests/Smart_Proxies/dtor/server.cpp @@ -10,7 +10,7 @@ public: void hello (CORBA::Long howmany); //FUZZ: disable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); //FUZZ: enable check_for_lack_ACE_OS private: @@ -29,7 +29,7 @@ Test_i::hello (CORBA::Long howmany) } void -Test_i::shutdown (void) +Test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp index 1f358d45de9..61dff5a477d 100644 --- a/TAO/tests/Smart_Proxies/server.cpp +++ b/TAO/tests/Smart_Proxies/server.cpp @@ -25,7 +25,7 @@ public: //FUZZ: disable check_for_lack_ACE_OS ///FUZZ: enable check_for_lack_ACE_OS - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; @@ -48,7 +48,7 @@ Test_i :: method (CORBA::Short boo) } void -Test_i::shutdown (void) +Test_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Stack_Recursion/Client_Task.cpp b/TAO/tests/Stack_Recursion/Client_Task.cpp index 21f5d613490..4954166719c 100644 --- a/TAO/tests/Stack_Recursion/Client_Task.cpp +++ b/TAO/tests/Stack_Recursion/Client_Task.cpp @@ -13,7 +13,7 @@ Client_Task::Client_Task (Test::Sender_ptr sender, } int -Client_Task::svc (void) +Client_Task::svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting client task\n")); @@ -43,7 +43,7 @@ Client_Task::svc (void) void -Client_Task::validate_connections (void) +Client_Task::validate_connections () { for (int i = 0 ; i != 100; i++) { diff --git a/TAO/tests/Stack_Recursion/Client_Task.h b/TAO/tests/Stack_Recursion/Client_Task.h index 4e3cc6b3dfe..bd87305f41e 100644 --- a/TAO/tests/Stack_Recursion/Client_Task.h +++ b/TAO/tests/Stack_Recursion/Client_Task.h @@ -22,11 +22,11 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Simple pings to prune up the connections - void validate_connections (void); + void validate_connections (); private: /// Reference to the test interface diff --git a/TAO/tests/Stack_Recursion/Sender.cpp b/TAO/tests/Stack_Recursion/Sender.cpp index bcc4987e608..7616b16a34e 100644 --- a/TAO/tests/Stack_Recursion/Sender.cpp +++ b/TAO/tests/Stack_Recursion/Sender.cpp @@ -9,7 +9,7 @@ Sender::Sender (CORBA::ORB_ptr orb) } void -Sender::dump_results (void) +Sender::dump_results () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); ACE_DEBUG ((LM_DEBUG, @@ -44,7 +44,7 @@ Sender::get_data (CORBA::ULong size, } CORBA::Long -Sender::get_event_count (void) +Sender::get_event_count () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, @@ -55,13 +55,13 @@ Sender::get_event_count (void) void -Sender::ping (void) +Sender::ping () { return; } void -Sender::shutdown (void) +Sender::shutdown () { if (this->is_done_ == false) { diff --git a/TAO/tests/Stack_Recursion/Sender.h b/TAO/tests/Stack_Recursion/Sender.h index c403ab93083..3cbadc6ec63 100644 --- a/TAO/tests/Stack_Recursion/Sender.h +++ b/TAO/tests/Stack_Recursion/Sender.h @@ -17,7 +17,7 @@ public: Sender (CORBA::ORB_ptr orb); /// Print out the results - void dump_results (void); + void dump_results (); /// Get the status of the flag.. bool is_done () const; @@ -26,11 +26,11 @@ public: virtual CORBA::Boolean get_data (CORBA::ULong size, Test::Payload_out payload); - virtual CORBA::Long get_event_count (void); + virtual CORBA::Long get_event_count (); - virtual void ping (void); + virtual void ping (); - virtual void shutdown (void); + virtual void shutdown (); private: TAO_SYNCH_MUTEX mutex_; diff --git a/TAO/tests/Stack_Recursion/Server_Task.cpp b/TAO/tests/Stack_Recursion/Server_Task.cpp index 5a3cf60f539..939beccbc61 100644 --- a/TAO/tests/Stack_Recursion/Server_Task.cpp +++ b/TAO/tests/Stack_Recursion/Server_Task.cpp @@ -12,7 +12,7 @@ Server_Task::Server_Task (CORBA::ORB_ptr orb, } int -Server_Task::svc (void) +Server_Task::svc () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Starting server task\n")); try diff --git a/TAO/tests/Stack_Recursion/Server_Task.h b/TAO/tests/Stack_Recursion/Server_Task.h index 0bada3e7344..a4612707d64 100644 --- a/TAO/tests/Stack_Recursion/Server_Task.h +++ b/TAO/tests/Stack_Recursion/Server_Task.h @@ -22,7 +22,7 @@ public: ACE_Thread_Manager *thr_mgr); /// Thread entry point - int svc (void); + int svc (); private: /// Reference to the ORB diff --git a/TAO/tests/Strategies/simple_test_i.cpp b/TAO/tests/Strategies/simple_test_i.cpp index 6e6012b4613..46a3a25a599 100644 --- a/TAO/tests/Strategies/simple_test_i.cpp +++ b/TAO/tests/Strategies/simple_test_i.cpp @@ -6,7 +6,7 @@ #endif /* __ACE_INLINE__ */ CORBA::Boolean -Simple_Server_i::print_status (void) +Simple_Server_i::print_status () { if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, @@ -15,7 +15,7 @@ Simple_Server_i::print_status (void) } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Strategies/simple_test_i.h b/TAO/tests/Strategies/simple_test_i.h index fa074ddbe2b..86c1acf10e2 100644 --- a/TAO/tests/Strategies/simple_test_i.h +++ b/TAO/tests/Strategies/simple_test_i.h @@ -27,9 +27,9 @@ public: Simple_Server_i (CORBA::ORB_ptr orb); // = The Simple_Server methods. - CORBA::Boolean print_status (void); + CORBA::Boolean print_status (); - void shutdown (void); + void shutdown (); private: CORBA::ORB_var orb_; diff --git a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp index 803f6e98555..2241cdf9a62 100644 --- a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp +++ b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.cpp @@ -25,7 +25,7 @@ Custom_Time_Policy_Strategy::~Custom_Time_Policy_Strategy () { } -ACE_Timer_Queue * Custom_Time_Policy_Strategy::create_timer_queue (void) +ACE_Timer_Queue * Custom_Time_Policy_Strategy::create_timer_queue () { ACE_Timer_Queue * tmq = 0; @@ -44,7 +44,7 @@ Custom_Time_Policy_Strategy::destroy_timer_queue (ACE_Timer_Queue *tmq) delete tmq; } -ACE_Dynamic_Time_Policy_Base * Custom_Time_Policy_Strategy::get_time_policy (void) +ACE_Dynamic_Time_Policy_Base * Custom_Time_Policy_Strategy::get_time_policy () { return &custom_time_policy_; } diff --git a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.h b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.h index 470147e86e7..5230f79d341 100644 --- a/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.h +++ b/TAO/tests/Time_Policy_Custom/Custom_Time_Policy_Strategy.h @@ -33,11 +33,11 @@ class TPTEST_Export Custom_Time_Policy_Strategy public: virtual ~Custom_Time_Policy_Strategy (); - virtual ACE_Timer_Queue * create_timer_queue (void); + virtual ACE_Timer_Queue * create_timer_queue (); virtual void destroy_timer_queue (ACE_Timer_Queue *tmq); - virtual ACE_Dynamic_Time_Policy_Base * get_time_policy (void); + virtual ACE_Dynamic_Time_Policy_Base * get_time_policy (); }; ACE_STATIC_SVC_DECLARE_EXPORT (TPTEST, Custom_Time_Policy_Strategy) diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp index 969d9534bc5..fbc9e7f8c4a 100644 --- a/TAO/tests/Timed_Buffered_Oneways/test_i.cpp +++ b/TAO/tests/Timed_Buffered_Oneways/test_i.cpp @@ -30,7 +30,7 @@ test_i::method (CORBA::ULong request_number, } void -test_i::flush (void) +test_i::flush () { ACE_DEBUG ((LM_DEBUG, "server: got flush request\n")); } diff --git a/TAO/tests/Timed_Buffered_Oneways/test_i.h b/TAO/tests/Timed_Buffered_Oneways/test_i.h index 0d30b7009e1..581f2244a49 100644 --- a/TAO/tests/Timed_Buffered_Oneways/test_i.h +++ b/TAO/tests/Timed_Buffered_Oneways/test_i.h @@ -31,7 +31,7 @@ public: const test::data &, CORBA::ULong work); - void flush (void); + void flush (); void shutdown (CORBA::Long start_time); diff --git a/TAO/tests/Timeout/test_i.cpp b/TAO/tests/Timeout/test_i.cpp index d615af9689d..a240a7d9e6c 100644 --- a/TAO/tests/Timeout/test_i.cpp +++ b/TAO/tests/Timeout/test_i.cpp @@ -33,7 +33,7 @@ Simple_Server_i::echo (CORBA::Long x, } void -Simple_Server_i::shutdown (void) +Simple_Server_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "server (%P) Received shutdown request from client\n")); diff --git a/TAO/tests/Timeout/test_i.h b/TAO/tests/Timeout/test_i.h index 32129102136..a175271fcd8 100644 --- a/TAO/tests/Timeout/test_i.h +++ b/TAO/tests/Timeout/test_i.h @@ -29,7 +29,7 @@ public: // = The Simple_Server methods. CORBA::Long echo (CORBA::Long x, CORBA::Long msecs); - void shutdown (void); + void shutdown (); private: /// The ORB diff --git a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp index d800764960b..191b2ac6a64 100644 --- a/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp +++ b/TAO/tests/TransportCurrent/Framework/Current_Test_Impl.cpp @@ -12,18 +12,18 @@ Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb, { } -Current_Test_Impl::~Current_Test_Impl (void) +Current_Test_Impl::~Current_Test_Impl () { } ::CORBA::Long -Current_Test_Impl::self_test (void) +Current_Test_Impl::self_test () { return 0; } void -Current_Test_Impl::test_transport_current (void) +Current_Test_Impl::test_transport_current () { if (TAO_debug_level > 2) { @@ -66,7 +66,7 @@ Current_Test_Impl::test_transport_current (void) } void -Current_Test_Impl::invoked_by_client (void) +Current_Test_Impl::invoked_by_client () { try { @@ -85,7 +85,7 @@ Current_Test_Impl::invoked_by_client (void) } void -Current_Test_Impl::invoked_by_client_i (void) +Current_Test_Impl::invoked_by_client_i () { if (TAO_debug_level > 2) { ACE_DEBUG ((LM_DEBUG, @@ -120,7 +120,7 @@ Current_Test_Impl::invoked_by_client_i (void) } void -Current_Test_Impl::invoked_during_upcall (void) +Current_Test_Impl::invoked_during_upcall () { if (TAO_debug_level > 2) { ACE_DEBUG ((LM_DEBUG, @@ -131,7 +131,7 @@ Current_Test_Impl::invoked_during_upcall (void) } void -Current_Test_Impl::shutdown (void) +Current_Test_Impl::shutdown () { if (TAO_debug_level > 2) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/TransportCurrent/Framework/client.cpp b/TAO/tests/TransportCurrent/Framework/client.cpp index 5b42814602a..c17b7d4b697 100644 --- a/TAO/tests/TransportCurrent/Framework/client.cpp +++ b/TAO/tests/TransportCurrent/Framework/client.cpp @@ -99,7 +99,7 @@ Worker::Worker (Test::Transport::CurrentTest_ptr server, /// interceptor int -Worker::svc (void) +Worker::svc () { try { diff --git a/TAO/tests/TransportCurrent/Framework/server.cpp b/TAO/tests/TransportCurrent/Framework/server.cpp index 99eac9cedc2..bff3fe20ae0 100644 --- a/TAO/tests/TransportCurrent/Framework/server.cpp +++ b/TAO/tests/TransportCurrent/Framework/server.cpp @@ -73,7 +73,7 @@ Worker::Worker (CORBA::ORB_ptr orb) /// interceptor int -Worker::svc (void) +Worker::svc () { try { diff --git a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp index 5fe338c57c1..4f8461eb7e5 100644 --- a/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp +++ b/TAO/tests/TransportCurrent/IIOP/Current_Test_Impl.cpp @@ -13,18 +13,18 @@ Current_Test_Impl::Current_Test_Impl (CORBA::ORB_ptr orb, { } -Current_Test_Impl::~Current_Test_Impl (void) +Current_Test_Impl::~Current_Test_Impl () { } ::CORBA::Long -Current_Test_Impl::self_test (void) +Current_Test_Impl::self_test () { return 0; } void -Current_Test_Impl::test_transport_current (void) +Current_Test_Impl::test_transport_current () { if (TAO_debug_level > 2) { ACE_DEBUG ((LM_DEBUG, @@ -59,7 +59,7 @@ Current_Test_Impl::test_transport_current (void) void -Current_Test_Impl::invoked_by_client (void) +Current_Test_Impl::invoked_by_client () { if (TAO_debug_level >= 1) { ACE_DEBUG ((LM_DEBUG, @@ -95,7 +95,7 @@ Current_Test_Impl::invoked_by_client (void) } void -Current_Test_Impl::invoked_during_upcall (void) +Current_Test_Impl::invoked_during_upcall () { if (TAO_debug_level > 2) { ACE_DEBUG ((LM_DEBUG, @@ -105,7 +105,7 @@ Current_Test_Impl::invoked_during_upcall (void) } void -Current_Test_Impl::shutdown (void) +Current_Test_Impl::shutdown () { if (TAO_debug_level > 2) { ACE_DEBUG ((LM_DEBUG, diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp index 875a435d594..34628832a2e 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.cpp @@ -15,12 +15,12 @@ namespace Test { { } - IIOP_Server_Request_Interceptor::~IIOP_Server_Request_Interceptor (void) + IIOP_Server_Request_Interceptor::~IIOP_Server_Request_Interceptor () { } char * - IIOP_Server_Request_Interceptor::name (void) + IIOP_Server_Request_Interceptor::name () { return CORBA::string_dup ("II SRI"); } @@ -131,7 +131,7 @@ namespace Test { /// Checks if all the endpoints, encountered on the way in have been /// cleaned on the way out of the interception point bool - IIOP_Server_Request_Interceptor::self_test (void) + IIOP_Server_Request_Interceptor::self_test () { CORBA::String_var name (this->name ()); bool has_remaining_endpoints = false; diff --git a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h index 01942ade9e3..5c95455e007 100644 --- a/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h +++ b/TAO/tests/TransportCurrent/IIOP/IIOP_Server_Request_Interceptor.h @@ -51,7 +51,7 @@ namespace Test */ //@{ /// Return the name of this ServerRequestinterceptor. - virtual char * name (void); + virtual char * name (); /// incomming interception point virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr); diff --git a/TAO/tests/TransportCurrent/IIOP/client.cpp b/TAO/tests/TransportCurrent/IIOP/client.cpp index c9abdc769c5..141d2517b7a 100644 --- a/TAO/tests/TransportCurrent/IIOP/client.cpp +++ b/TAO/tests/TransportCurrent/IIOP/client.cpp @@ -99,7 +99,7 @@ Worker::Worker (Test::Transport::CurrentTest_ptr server, /// interceptor int -Worker::svc (void) +Worker::svc () { try { diff --git a/TAO/tests/TransportCurrent/IIOP/server.cpp b/TAO/tests/TransportCurrent/IIOP/server.cpp index 56d431e9226..1a5ea9153a6 100644 --- a/TAO/tests/TransportCurrent/IIOP/server.cpp +++ b/TAO/tests/TransportCurrent/IIOP/server.cpp @@ -71,7 +71,7 @@ Worker::Worker (CORBA::ORB_ptr orb) /// Test referencing the TC data *inside* the context of a client-side /// interceptor int -Worker::svc (void) +Worker::svc () { try { diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp index 4a282cd8ab6..5d78736cbf0 100644 --- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp +++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.cpp @@ -14,7 +14,7 @@ namespace Test /* no-op */ } - Client_ORBInitializer::~Client_ORBInitializer (void) + Client_ORBInitializer::~Client_ORBInitializer () { /* no-op */ } diff --git a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h index a2f99cfd8bc..e89f12deda2 100644 --- a/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h +++ b/TAO/tests/TransportCurrent/lib/Client_ORBInitializer.h @@ -31,7 +31,7 @@ namespace Test { public: Client_ORBInitializer (PortableInterceptor::ClientRequestInterceptor_ptr interceptor); - virtual ~Client_ORBInitializer (void); + virtual ~Client_ORBInitializer (); virtual void pre_init(PortableInterceptor::ORBInitInfo*); diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp index 890cf65a533..3ef844d0e41 100644 --- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp +++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.cpp @@ -17,13 +17,13 @@ namespace Test } CORBA::Long - Client_Request_Interceptor::interceptions (void) + Client_Request_Interceptor::interceptions () { return this->request_count_; } char * - Client_Request_Interceptor::name (void) + Client_Request_Interceptor::name () { return CORBA::string_dup ("Client_Request_Interceptor"); } @@ -53,7 +53,7 @@ namespace Test } void - Client_Request_Interceptor::destroy (void) + Client_Request_Interceptor::destroy () { } diff --git a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h index 30e64315bf9..49bbe7f5619 100644 --- a/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h +++ b/TAO/tests/TransportCurrent/lib/Client_Request_Interceptor.h @@ -64,9 +64,9 @@ namespace Test */ //@{ /// Return the name of this ClientRequestinterceptor. - virtual char * name (void); + virtual char * name (); - virtual void destroy (void); + virtual void destroy (); virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri); @@ -80,7 +80,7 @@ namespace Test //@} // Number of interceptions - CORBA::Long interceptions (void); + CORBA::Long interceptions (); private: // Implementation method, every inteception point will have to diff --git a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h index 8339d211416..0d585a7ea9a 100644 --- a/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h +++ b/TAO/tests/TransportCurrent/lib/Current_Test_Impl.h @@ -31,21 +31,21 @@ public: Current_Test_Impl (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa, int do_collocated_calls = 1); /// Destructor. - ~Current_Test_Impl (void); + ~Current_Test_Impl (); /// Main servant test method. - virtual void invoked_by_client (void); + virtual void invoked_by_client (); /// No-op method used so that a client request interceptor will be /// invoked when invoking this method from the above invoke_me() /// method. Say that 10 times fast. :-) - virtual void invoked_during_upcall (void); + virtual void invoked_during_upcall (); /// Shutdown the ORB. - virtual void shutdown (void); + virtual void shutdown (); // A self-test for coherency - virtual ::CORBA::Long self_test (void); + virtual ::CORBA::Long self_test (); public: /// Reports if unexpected errors have been encountered for the @@ -53,10 +53,10 @@ public: bool is_successful () const; private: - void test_transport_current (void); + void test_transport_current (); /// Main servant test method. - void invoked_by_client_i (void); + void invoked_by_client_i (); private: /// Pseudo-reference to the ORB. diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp index 8fb8af99ebf..974781ef717 100644 --- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp +++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.cpp @@ -14,7 +14,7 @@ namespace Test /* no-op */ } - Server_ORBInitializer::~Server_ORBInitializer (void) + Server_ORBInitializer::~Server_ORBInitializer () { /* no-op */ } diff --git a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h index f3d554cf14a..2dc95808f3f 100644 --- a/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h +++ b/TAO/tests/TransportCurrent/lib/Server_ORBInitializer.h @@ -30,7 +30,7 @@ namespace Test { public: Server_ORBInitializer (PortableInterceptor::ServerRequestInterceptor_ptr interceptor); - virtual ~Server_ORBInitializer (void); + virtual ~Server_ORBInitializer (); virtual void pre_init(PortableInterceptor::ORBInitInfo*); diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp index 73980f0befb..2e79dc33976 100644 --- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp +++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.cpp @@ -13,7 +13,7 @@ namespace Test { } - Server_Request_Interceptor::~Server_Request_Interceptor (void) + Server_Request_Interceptor::~Server_Request_Interceptor () { } @@ -57,20 +57,20 @@ namespace Test /// queries the status of the test bool - Server_Request_Interceptor::self_test (void) + Server_Request_Interceptor::self_test () { return true; } char * - Server_Request_Interceptor::name (void) + Server_Request_Interceptor::name () { return CORBA::string_dup ("SRI "); } void - Server_Request_Interceptor::destroy (void) + Server_Request_Interceptor::destroy () { } diff --git a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h index 06e0c363d52..ba8378de000 100644 --- a/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h +++ b/TAO/tests/TransportCurrent/lib/Server_Request_Interceptor.h @@ -50,12 +50,12 @@ namespace Test Server_Request_Interceptor (const char*orb_id, TEST test); /// Destructor. - virtual ~Server_Request_Interceptor (void); + virtual ~Server_Request_Interceptor (); virtual void test_transport_current (const ACE_TCHAR* amethod); /// Coherency test - virtual bool self_test (void); + virtual bool self_test (); /** * @name Methods Required by the Server Request Interceptor @@ -67,9 +67,9 @@ namespace Test */ //@{ /// 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/tests/Two_Objects/First_i.cpp b/TAO/tests/Two_Objects/First_i.cpp index 7909a5a3de1..9d4bb52a1f0 100644 --- a/TAO/tests/Two_Objects/First_i.cpp +++ b/TAO/tests/Two_Objects/First_i.cpp @@ -13,7 +13,7 @@ First_i::First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done) } void -First_i::oneway_method (void) +First_i::oneway_method () { ACE_DEBUG ((LM_DEBUG, "Oneway servant : (%P|%t) one way method called. About to wait for two way call completion\n")); diff --git a/TAO/tests/Two_Objects/First_i.h b/TAO/tests/Two_Objects/First_i.h index 9b6f53cc0a1..56a2506f20d 100644 --- a/TAO/tests/Two_Objects/First_i.h +++ b/TAO/tests/Two_Objects/First_i.h @@ -18,7 +18,7 @@ public: First_i (CORBA::ORB_ptr orb, ACE_Auto_Event &two_way_done); /// Interface methods.. - void oneway_method (void); + void oneway_method (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Two_Objects/Object_Factory_i.cpp b/TAO/tests/Two_Objects/Object_Factory_i.cpp index a28794209cd..a01d2199aad 100644 --- a/TAO/tests/Two_Objects/Object_Factory_i.cpp +++ b/TAO/tests/Two_Objects/Object_Factory_i.cpp @@ -12,7 +12,7 @@ Object_Factory_i::Object_Factory_i (CORBA::ORB_ptr orb, CORBA::ULong len) //factory method to create first object Two_Objects_Test::First_ptr -Object_Factory_i::create_first (void) +Object_Factory_i::create_first () { First_i *first_impl; @@ -41,7 +41,7 @@ Object_Factory_i::create_first (void) //factory method to create second object Two_Objects_Test::Second_ptr -Object_Factory_i::create_second (void) +Object_Factory_i::create_second () { Second_i *second_impl; diff --git a/TAO/tests/Two_Objects/Object_Factory_i.h b/TAO/tests/Two_Objects/Object_Factory_i.h index 701a4bfb1df..e851eae2fcd 100644 --- a/TAO/tests/Two_Objects/Object_Factory_i.h +++ b/TAO/tests/Two_Objects/Object_Factory_i.h @@ -17,9 +17,9 @@ public: Object_Factory_i (CORBA::ORB_ptr orb, CORBA::ULong len); - Two_Objects_Test::First_ptr create_first (void); + Two_Objects_Test::First_ptr create_first (); - Two_Objects_Test::Second_ptr create_second (void); + Two_Objects_Test::Second_ptr create_second (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Two_Objects/Second_i.cpp b/TAO/tests/Two_Objects/Second_i.cpp index 286c37b03d2..a2eefb082ac 100644 --- a/TAO/tests/Two_Objects/Second_i.cpp +++ b/TAO/tests/Two_Objects/Second_i.cpp @@ -14,7 +14,7 @@ Second_i::Second_i (CORBA::ORB_ptr orb, } Two_Objects_Test::Octet_Seq * -Second_i::twoway_method (void) +Second_i::twoway_method () { Two_Objects_Test::Octet_Seq *preply_mesg = 0; @@ -45,7 +45,7 @@ Second_i::twoway_method (void) } void -Second_i::shutdown (void) +Second_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "(%P|%t) about to shutdown the orb\n")); this->orb_->shutdown (false); diff --git a/TAO/tests/Two_Objects/Second_i.h b/TAO/tests/Two_Objects/Second_i.h index 895dc85b823..6048b627f25 100644 --- a/TAO/tests/Two_Objects/Second_i.h +++ b/TAO/tests/Two_Objects/Second_i.h @@ -17,9 +17,9 @@ public: CORBA::ULong len, ACE_Auto_Event &two_way_done); Two_Objects_Test::Octet_Seq * - twoway_method (void); + twoway_method (); - void shutdown (void); + void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/Two_Objects/worker.cpp b/TAO/tests/Two_Objects/worker.cpp index 9387edcce9d..126f4e82561 100644 --- a/TAO/tests/Two_Objects/worker.cpp +++ b/TAO/tests/Two_Objects/worker.cpp @@ -7,7 +7,7 @@ Worker::Worker (CORBA::ORB_ptr orb) } int -Worker::svc (void) +Worker::svc () { try { diff --git a/TAO/tests/UNKNOWN_Exception/server.cpp b/TAO/tests/UNKNOWN_Exception/server.cpp index 71855f95da3..0bdedee34a8 100644 --- a/TAO/tests/UNKNOWN_Exception/server.cpp +++ b/TAO/tests/UNKNOWN_Exception/server.cpp @@ -7,7 +7,7 @@ const ACE_TCHAR *ior_output_file = ACE_TEXT("ior"); static int done = 0; void -throw_exception (void) +throw_exception () { throw 1; } @@ -18,14 +18,14 @@ class test_i : public: test_i (CORBA::ORB_ptr orb); - void normal_method (void); + void normal_method (); - void unknown_exception_in_method (void); + void unknown_exception_in_method (); - void unknown_exception_during_deactivation (void); + void unknown_exception_during_deactivation (); - void _add_ref (void); - void _remove_ref (void); + void _add_ref (); + void _remove_ref (); CORBA::ORB_var orb_; @@ -39,14 +39,14 @@ test_i::test_i (CORBA::ORB_ptr orb) } void -test_i::normal_method (void) +test_i::normal_method () { ACE_DEBUG ((LM_DEBUG, "test_i::normal_method() called\n")); } void -test_i::unknown_exception_in_method (void) +test_i::unknown_exception_in_method () { ACE_DEBUG ((LM_DEBUG, "test_i::unknown_exception_in_method() called\n")); @@ -58,7 +58,7 @@ test_i::unknown_exception_in_method (void) } void -test_i::unknown_exception_during_deactivation (void) +test_i::unknown_exception_during_deactivation () { ACE_DEBUG ((LM_DEBUG, "test_i::unknown_exception_during_deactivation() called\n")); @@ -73,7 +73,7 @@ test_i::unknown_exception_during_deactivation (void) } void -test_i::_add_ref (void) +test_i::_add_ref () { ACE_DEBUG ((LM_DEBUG, "test_i::_add_ref() called; current refcount = %d\n", @@ -81,7 +81,7 @@ test_i::_add_ref (void) } void -test_i::_remove_ref (void) +test_i::_remove_ref () { ACE_DEBUG ((LM_DEBUG, "test_i::_remove_ref() called; current refcount = %d\n", @@ -105,9 +105,9 @@ class test_factory_i : public: test_factory_i (CORBA::ORB_ptr orb); - test_ptr create_test (void); + test_ptr create_test (); - void shutdown (void); + void shutdown (); CORBA::ORB_var orb_; }; @@ -119,7 +119,7 @@ test_factory_i::test_factory_i (CORBA::ORB_ptr orb) } test_ptr -test_factory_i::create_test (void) +test_factory_i::create_test () { test_i *servant = new test_i (this->orb_.in ()); @@ -145,7 +145,7 @@ test_factory_i::create_test (void) } void -test_factory_i::shutdown (void) +test_factory_i::shutdown () { ACE_DEBUG ((LM_DEBUG, "factory_i::shutdown() called\n")); diff --git a/TAO/tests/Xt_Stopwatch/Client.h b/TAO/tests/Xt_Stopwatch/Client.h index d46ed4ca6f1..f2a869ca3a3 100644 --- a/TAO/tests/Xt_Stopwatch/Client.h +++ b/TAO/tests/Xt_Stopwatch/Client.h @@ -24,7 +24,7 @@ public: Client (CORBA::ORB_ptr orb); ///Dtor.. - ~Client (void); + ~Client (); /// The callbacks static void start_callback (Widget w, @@ -35,8 +35,8 @@ public: XtPointer call_data); /// The hooks... - void start_hook (void); - void stop_hook (void); + void start_hook (); + void stop_hook (); /// Adds the callbacks to the GUI underneath..... void add_callback (Control &); diff --git a/TAO/tests/Xt_Stopwatch/Control.cpp b/TAO/tests/Xt_Stopwatch/Control.cpp index b539334d7f8..f276b040571 100644 --- a/TAO/tests/Xt_Stopwatch/Control.cpp +++ b/TAO/tests/Xt_Stopwatch/Control.cpp @@ -25,12 +25,12 @@ Control::Control (Widget &parent) 0); } -Control::~Control (void) +Control::~Control () { } void -Control::manage (void) +Control::manage () { XtManageChild (frame_); XtManageChild (rowcolumn_); @@ -39,13 +39,13 @@ Control::manage (void) } Widget & -Control::startwidget (void) +Control::startwidget () { return this->startwidget_; } Widget & -Control::stopwidget (void) +Control::stopwidget () { return this->stopwidget_; } diff --git a/TAO/tests/Xt_Stopwatch/Control.h b/TAO/tests/Xt_Stopwatch/Control.h index 2a80f83d474..959acddd14e 100644 --- a/TAO/tests/Xt_Stopwatch/Control.h +++ b/TAO/tests/Xt_Stopwatch/Control.h @@ -27,16 +27,16 @@ class Control Control (Widget &parent); /// Destructor - virtual ~Control (void); + virtual ~Control (); /// Manage the widget - virtual void manage (void); + virtual void manage (); /// Return the start widget - Widget& startwidget (void); + Widget& startwidget (); /// Return the stop widget.. - Widget& stopwidget (void); + Widget& stopwidget (); private: /// A frame widget... diff --git a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp b/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp index fb6095fd925..b3826ed29f9 100644 --- a/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp +++ b/TAO/tests/Xt_Stopwatch/Stopwatch_display.cpp @@ -17,13 +17,13 @@ Stopwatch_display::Stopwatch_display (Widget &parent) 0); } -Stopwatch_display::~Stopwatch_display (void) +Stopwatch_display::~Stopwatch_display () { //No-op } void -Stopwatch_display::manage (void) +Stopwatch_display::manage () { XtManageChild (this->frame_); XtManageChild (this->label_); diff --git a/TAO/tests/Xt_Stopwatch/Stopwatch_display.h b/TAO/tests/Xt_Stopwatch/Stopwatch_display.h index fcba4acadd9..1c255ddfb33 100644 --- a/TAO/tests/Xt_Stopwatch/Stopwatch_display.h +++ b/TAO/tests/Xt_Stopwatch/Stopwatch_display.h @@ -23,10 +23,10 @@ public: Stopwatch_display (Widget &parent); /// Destructor - virtual ~Stopwatch_display (void); + virtual ~Stopwatch_display (); /// Manage the widget - virtual void manage (void); + virtual void manage (); /// Change the displayed time void set_time (CORBA::Float value); diff --git a/TAO/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp index 7dd4d0ad804..b0fd70e1e59 100644 --- a/TAO/tests/Xt_Stopwatch/client.cpp +++ b/TAO/tests/Xt_Stopwatch/client.cpp @@ -52,7 +52,7 @@ Client::Client (CORBA::ORB_ptr orb) { } -Client::~Client (void) +Client::~Client () { } @@ -130,7 +130,7 @@ Client::stop_callback (Widget /*widget*/, } void -Client::start_hook (void) +Client::start_hook () { try { @@ -145,7 +145,7 @@ Client::start_hook (void) } void -Client::stop_hook (void) +Client::stop_hook () { try { diff --git a/TAO/tests/Xt_Stopwatch/test_i.cpp b/TAO/tests/Xt_Stopwatch/test_i.cpp index 5f7a480883e..b348655e7d8 100644 --- a/TAO/tests/Xt_Stopwatch/test_i.cpp +++ b/TAO/tests/Xt_Stopwatch/test_i.cpp @@ -7,19 +7,19 @@ Stopwatch_imp::Stopwatch_imp (CORBA::ORB_ptr orb, Timer_imp *timer) } void -Stopwatch_imp::start (void) +Stopwatch_imp::start () { this->timer_->start (); } void -Stopwatch_imp::stop (void) +Stopwatch_imp::stop () { this->timer_->stop (); } void -Stopwatch_imp::shutdown (void) +Stopwatch_imp::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/Xt_Stopwatch/test_i.h b/TAO/tests/Xt_Stopwatch/test_i.h index 9e720422d35..7621b3e4ecb 100644 --- a/TAO/tests/Xt_Stopwatch/test_i.h +++ b/TAO/tests/Xt_Stopwatch/test_i.h @@ -29,11 +29,11 @@ public: Stopwatch_imp (CORBA::ORB_ptr, Timer_imp *); // = The Simple_Server methods. - void start (void); + void start (); - void stop (void); + void stop (); - void shutdown (void); + void shutdown (); private: /// The ORB diff --git a/TAO/tests/Xt_Stopwatch/timer.cpp b/TAO/tests/Xt_Stopwatch/timer.cpp index 06050a3169a..af6f071c6b5 100644 --- a/TAO/tests/Xt_Stopwatch/timer.cpp +++ b/TAO/tests/Xt_Stopwatch/timer.cpp @@ -17,7 +17,7 @@ Timer_imp::~Timer_imp () } void -Timer_imp::start (void) +Timer_imp::start () { // Reset the elapsed time this->counter_ = 0; @@ -37,7 +37,7 @@ Timer_imp::start (void) } void -Timer_imp::stop (void) +Timer_imp::stop () { // Remove the current timeout function, if any if (this->id_) @@ -47,7 +47,7 @@ Timer_imp::stop (void) } CORBA::Float -Timer_imp::elapsed_time(void) +Timer_imp::elapsed_time() { return ((CORBA::Float) counter_ * interval_ / 1000.0 ); } @@ -63,7 +63,7 @@ Timer_imp::tick_callback (XtPointer client_data, void -Timer_imp::tick (void) +Timer_imp::tick () { // Increment a counter for each tick counter_++; diff --git a/TAO/tests/Xt_Stopwatch/timer.h b/TAO/tests/Xt_Stopwatch/timer.h index 3870a4c7599..a9fd30dc470 100644 --- a/TAO/tests/Xt_Stopwatch/timer.h +++ b/TAO/tests/Xt_Stopwatch/timer.h @@ -29,13 +29,13 @@ class Timer_imp virtual ~Timer_imp (); /// Resets, and starts the clock ticking - void start (void); + void start (); /// Stops the clock - void stop (void); + void stop (); /// Returns time since timer started - CORBA::Float elapsed_time (void); + CORBA::Float elapsed_time (); private: /// Static member function used for TimeOut callback. @@ -43,7 +43,7 @@ class Timer_imp XtIntervalId *); /// Called every interval_ milliseconds - void tick (void); + void tick (); /// Called at each clock tick... virtual void report_time (CORBA::Float); diff --git a/TAO/tests/ZIOP/Hello.cpp b/TAO/tests/ZIOP/Hello.cpp index 27e011bc7dd..40baa27e09f 100644 --- a/TAO/tests/ZIOP/Hello.cpp +++ b/TAO/tests/ZIOP/Hello.cpp @@ -44,7 +44,7 @@ Hello::big_request (const ::Test::Octet_Seq & octet_in) } void -Hello::shutdown (void) +Hello::shutdown () { this->orb_->shutdown (false); } diff --git a/TAO/tests/ZIOP/Hello.h b/TAO/tests/ZIOP/Hello.h index e92bfe83d9f..1c53b73a4ad 100644 --- a/TAO/tests/ZIOP/Hello.h +++ b/TAO/tests/ZIOP/Hello.h @@ -19,7 +19,7 @@ public: // = The skeleton methods virtual char * get_string (const char * mystring); - virtual void shutdown (void); + virtual void shutdown (); private: /// Use an ORB reference to convert strings to objects and shutdown diff --git a/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.h b/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.h index 61445b5e13a..78ced488b2e 100644 --- a/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.h +++ b/TAO/tests/ZIOP/TestCompressor/TestCompressor_Factory.h @@ -32,7 +32,7 @@ namespace TAO public ::TAO::CompressorFactory { public: - Test_CompressorFactory (void); + Test_CompressorFactory (); virtual ::Compression::Compressor_ptr get_compressor ( ::Compression::CompressionLevel compression_level); |