diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback')
7 files changed, 16 insertions, 16 deletions
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp index 14ed3bef69e..be8d7d607e5 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.cpp @@ -10,7 +10,7 @@ Callback::Callback (int iterations, } ACE_Sample_History & -Callback::sample_history (void) +Callback::sample_history () { return this->sample_history_; } @@ -27,7 +27,7 @@ Callback::sample (Test::Timestamp the_timestamp) } PortableServer::POA_ptr -Callback::_default_POA (void) +Callback::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h index 91c21047769..2dce97a8261 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Callback.h @@ -27,14 +27,14 @@ public: PortableServer::POA_ptr poa); /// Access the history of samples - ACE_Sample_History &sample_history (void); + ACE_Sample_History &sample_history (); //@{ /** @name The RtecEventComm::PushCallback methods */ virtual void sample (Test::Timestamp the_timestamp); - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); //@} private: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp index fa37c2c2ee1..2af0b2aa734 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.cpp @@ -15,13 +15,13 @@ Session::sample (Test::Timestamp the_timestamp) } void -Session::shutdown (void) +Session::shutdown () { Implicit_Deactivator deactivator (this); } PortableServer::POA_ptr -Session::_default_POA (void) +Session::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h index fc611073c89..935d3bc9e97 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session.h @@ -17,9 +17,9 @@ public: // = The skeleton methods virtual void sample (Test::Timestamp the_timestamp); - virtual void shutdown (void); + virtual void shutdown (); - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); private: Test::Callback_var cb_; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp index b25dd442757..944fa5df865 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.cpp @@ -19,13 +19,13 @@ Session_Factory::create_new_session (Test::Callback_ptr cb) } void -Session_Factory::shutdown (void) +Session_Factory::shutdown () { this->orb_->shutdown (false); } PortableServer::POA_ptr -Session_Factory::_default_POA (void) +Session_Factory::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h index 13665b0a280..a40b375bb4a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Session_Factory.h @@ -17,9 +17,9 @@ public: // = The skeleton methods virtual Test::Session_ptr create_new_session (Test::Callback_ptr cb); - virtual void shutdown (void); + virtual void shutdown (); - PortableServer::POA_ptr _default_POA (void); + PortableServer::POA_ptr _default_POA (); private: /// Use an ORB reference to shutdown the application. diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp index 2f1082f663d..22fb16de51d 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp @@ -36,7 +36,7 @@ public: virtual void run_test (void) = 0; - virtual int svc (void) + virtual int svc () { this->the_barrier_->wait (); try @@ -72,7 +72,7 @@ public: { } - virtual void run_test (void) + virtual void run_test () { Test::Callback_var cb = callback->_this (); @@ -126,13 +126,13 @@ public: { } - void stop (void) + void stop () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->stopped_ = 1; } - virtual void run_test (void) + virtual void run_test () { Test::Callback_var cb = callback->_this (); |