diff options
Diffstat (limited to 'TAO/orbsvcs/examples/CosEC/RtEC_Based/lib')
12 files changed, 53 insertions, 53 deletions
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp index 49a0415e491..fa54c53ca57 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp @@ -1,7 +1,7 @@ #include "ConsumerAdmin_i.h" #include <memory> -TAO_CosEC_ConsumerAdmin_i::TAO_CosEC_ConsumerAdmin_i (void) +TAO_CosEC_ConsumerAdmin_i::TAO_CosEC_ConsumerAdmin_i () : qos_ (), rtec_consumeradmin_ (RtecEventChannelAdmin::ConsumerAdmin::_nil ()) { @@ -18,7 +18,7 @@ TAO_CosEC_ConsumerAdmin_i::init (const RtecEventChannelAdmin::ConsumerQOS &consu } CosEventChannelAdmin::ProxyPushSupplier_ptr -TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (void) +TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier () { CosEventChannelAdmin::ProxyPushSupplier_ptr proxysupplier_nil = CosEventChannelAdmin::ProxyPushSupplier::_nil (); @@ -45,7 +45,7 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (void) } CosEventChannelAdmin::ProxyPullSupplier_ptr -TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (void) +TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier () { // TODO: implement this. return CosEventChannelAdmin::ProxyPullSupplier::_nil (); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h index f84f4654d4f..623b6fb2567 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h @@ -31,7 +31,7 @@ class TAO_RTEC_COSEC_Export TAO_CosEC_ConsumerAdmin_i : // RtecEventChannelAdmin::ConsumerAdmin. public: /// Constructor. - TAO_CosEC_ConsumerAdmin_i (void); + TAO_CosEC_ConsumerAdmin_i (); /// Destructor. ~TAO_CosEC_ConsumerAdmin_i () = default; @@ -41,11 +41,11 @@ public: /// Returns a new ProxyPushSupplier_ptr. virtual CosEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier(void); + obtain_push_supplier(); /// Returns a new ProxyPullSupplier_ptr. virtual CosEventChannelAdmin::ProxyPullSupplier_ptr - obtain_pull_supplier(void); + obtain_pull_supplier(); private: /// The ConsumerQOS specified by the user of this class. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp index 71fbff1ea65..b95e8c9fcce 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.cpp @@ -6,7 +6,7 @@ #include "ace/Auto_Ptr.h" #include <memory> -CosEC_ServantBase::CosEC_ServantBase (void) +CosEC_ServantBase::CosEC_ServantBase () :poa_ (PortableServer::POA::_nil ()), rtec_servant_ (0), cosec_servant_ (0), @@ -44,7 +44,7 @@ CosEC_ServantBase::init (PortableServer::POA_ptr thispoa, } int -CosEC_ServantBase::activate (void) +CosEC_ServantBase::activate () { ACE_ASSERT (!CORBA::is_nil (this->poa_.in ())); ACE_ASSERT (!CORBA::is_nil (this->thispoa_.in ())); @@ -102,7 +102,7 @@ CosEC_ServantBase::activate (const char* servant_id) } void -CosEC_ServantBase::activate_rtec (void) +CosEC_ServantBase::activate_rtec () { // Activate the Rtec PortableServer::ObjectId_var oid = @@ -118,7 +118,7 @@ CosEC_ServantBase::activate_rtec (void) } int -CosEC_ServantBase::activate_cosec (void) +CosEC_ServantBase::activate_cosec () { // Initialize the CosEC servant. RtecBase::handle_t supp_handle = 0; @@ -160,7 +160,7 @@ CosEC_ServantBase::activate_cosec (void) } void -CosEC_ServantBase::deactivate (void) +CosEC_ServantBase::deactivate () { // Deactivate all those we control... this->deactivate_rtec (); @@ -176,7 +176,7 @@ CosEC_ServantBase::deactivate (void) } void -CosEC_ServantBase::deactivate_rtec (void) +CosEC_ServantBase::deactivate_rtec () { // Deactivate the rtec. PortableServer::ObjectId_var oid = @@ -187,7 +187,7 @@ CosEC_ServantBase::deactivate_rtec (void) } void -CosEC_ServantBase::deactivate_cosec (void) +CosEC_ServantBase::deactivate_cosec () { // Deactivate the cosec. PortableServer::ObjectId_var oid = @@ -198,19 +198,19 @@ CosEC_ServantBase::deactivate_cosec (void) } CosEventChannelAdmin::ConsumerAdmin_ptr -CosEC_ServantBase::for_consumers (void) +CosEC_ServantBase::for_consumers () { return this->cosec_->for_consumers (); } CosEventChannelAdmin::SupplierAdmin_ptr -CosEC_ServantBase::for_suppliers (void) +CosEC_ServantBase::for_suppliers () { return this->cosec_->for_suppliers (); } void -CosEC_ServantBase::destroy (void) +CosEC_ServantBase::destroy () { // Deactivate all the contained servants and ourselves. // The poa will "destroy" the ref counted servants. @@ -219,7 +219,7 @@ CosEC_ServantBase::destroy (void) } POA_RtecEventChannelAdmin::EventChannel_ptr -CosEC_ServantBase::create_rtec (void) +CosEC_ServantBase::create_rtec () { // Create the RtEC servant. TAO_EC_Event_Channel_Attributes attr (this->poa_.in (), @@ -233,7 +233,7 @@ CosEC_ServantBase::create_rtec (void) } TAO_CosEC_EventChannel_i* -CosEC_ServantBase::create_cosec (void) +CosEC_ServantBase::create_cosec () { // Create the CosEC servant. TAO_CosEC_EventChannel_i* _cosec_servant; diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h index f3e359d7934..0faed4b7f51 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/CosEvent_Utilities.h @@ -34,7 +34,7 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase : // Clients can derive from this class and create servants. public: /// Constructor. - CosEC_ServantBase (void); + CosEC_ServantBase (); /// Destructor. virtual ~CosEC_ServantBase () = default; @@ -52,45 +52,45 @@ class TAO_RTEC_COSEC_Export CosEC_ServantBase : ACE_TCHAR *source_type_pairs); /// Activates the CosEC with <thispoa_> and friends with the <poa_> - int activate (void); + int activate (); /// If the servant_id is not nil then it is used to supply the object id /// for <this> servant. int activate (const char* servant_id); /// Deactivates the CosEC and friends with the POA. - void deactivate (void); + void deactivate (); // = POA_CosEventChannelAdmin::EventChannel methods. - virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void); + virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (); - virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void); + virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (); /// Destroys this Event Channel object. - virtual void destroy (void); + virtual void destroy (); protected: // = RtEC creation, activation and deactivation methods. /// Create a local rtec. virtual POA_RtecEventChannelAdmin::EventChannel_ptr - create_rtec (void); + create_rtec (); /// Activates the rtec. - virtual void activate_rtec (void); + virtual void activate_rtec (); /// Deactivates the rtec. - virtual void deactivate_rtec (void); + virtual void deactivate_rtec (); // = CosEC creation, activation and deactivation methods. /// Create a local cosec. TAO_CosEC_EventChannel_i* - create_cosec (void); + create_cosec (); /// Activates the cosec. - int activate_cosec (void); + int activate_cosec (); /// Deactivates the cosec. - void deactivate_cosec (void); + void deactivate_cosec (); /// Initialize the SupplierQOS Factory. void init_SupplierQOS (RtecBase::handle_t supp_handle, diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp index 126eed592a0..a9bd639f1c1 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.cpp @@ -1,7 +1,7 @@ #include "EventChannel_i.h" #include <memory> -TAO_CosEC_EventChannel_i::TAO_CosEC_EventChannel_i (void) +TAO_CosEC_EventChannel_i::TAO_CosEC_EventChannel_i () : consumer_admin_ (0), supplier_admin_ (0), consumeradmin_ (CosEventChannelAdmin::ConsumerAdmin::_nil ()), @@ -78,7 +78,7 @@ TAO_CosEC_EventChannel_i::for_suppliers () } void -TAO_CosEC_EventChannel_i::destroy (void) +TAO_CosEC_EventChannel_i::destroy () { // Deactivate the CosEventChannel PortableServer::POA_var poa = @@ -93,7 +93,7 @@ TAO_CosEC_EventChannel_i::destroy (void) } void -TAO_CosEC_EventChannel_i::shutdown (void) +TAO_CosEC_EventChannel_i::shutdown () { this->destroy (); } diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h index 683f878d464..f6924763a89 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/EventChannel_i.h @@ -49,17 +49,17 @@ public: /// The for_consumers method will return the same ConsumerAdmin_ptr /// everytime its called. - virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (void); + virtual CosEventChannelAdmin::ConsumerAdmin_ptr for_consumers (); /// The for_suppliers method will return the same SupplierAdmin_ptr /// everytime its called. - virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (void); + virtual CosEventChannelAdmin::SupplierAdmin_ptr for_suppliers (); /// Destroys this Event Channel object. - virtual void destroy (void); + virtual void destroy (); /// destroys this Event Channel object and <delete>s this object. - void shutdown (void); + void shutdown (); private: /// ConsumerAdmin servant object. diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp index 0adcb289b62..5c70464417d 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.cpp @@ -53,7 +53,7 @@ TAO_CosEC_PushSupplierWrapper::TAO_CosEC_PushSupplierWrapper } void -TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier (void) +TAO_CosEC_PushSupplierWrapper::disconnect_push_supplier () { this->supplier_->disconnect_push_supplier (); @@ -78,7 +78,7 @@ TAO_CosEC_ProxyPushConsumer_i::TAO_CosEC_ProxyPushConsumer_i (const RtecEventCha { } -TAO_CosEC_ProxyPushConsumer_i::~TAO_CosEC_ProxyPushConsumer_i (void) +TAO_CosEC_ProxyPushConsumer_i::~TAO_CosEC_ProxyPushConsumer_i () { } @@ -119,7 +119,7 @@ TAO_CosEC_ProxyPushConsumer_i::push (const CORBA::Any &data) } void -TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer (void) +TAO_CosEC_ProxyPushConsumer_i::disconnect_push_consumer () { this->proxypushconsumer_->disconnect_push_consumer (); @@ -161,7 +161,7 @@ TAO_CosEC_ProxyPushConsumer_i::connect_push_supplier (CosEventComm::PushSupplier } int -TAO_CosEC_ProxyPushConsumer_i::connected (void) +TAO_CosEC_ProxyPushConsumer_i::connected () { return this->wrapper_ == 0 ? 0 : 1; } diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h index 73b04c479e5..17149cf23ed 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushConsumer_i.h @@ -44,13 +44,13 @@ public: RtecEventChannelAdmin::ProxyPushConsumer_ptr proxypushconsumer); /// Destructor. - ~TAO_CosEC_ProxyPushConsumer_i (void); + ~TAO_CosEC_ProxyPushConsumer_i (); /// Suppliers call this method to pass data to connected consumers. virtual void push (const CORBA::Any &data); /// Disconnects the supplier from the event communication. - virtual void disconnect_push_consumer (void); + virtual void disconnect_push_consumer (); /// Connects a push supplier. virtual void connect_push_supplier(CosEventComm::PushSupplier_ptr push_supplier); @@ -58,7 +58,7 @@ public: private: /// Returns 0 if a push_supplier is already connected to this /// ProxyPushConsumer, otherwise it returns a 1. - int connected (void); + int connected (); /// The SupplierQOS specified by the user of this class. const RtecEventChannelAdmin::SupplierQOS &qos_; diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp index 7528c70dfe3..2ec39fed7a6 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.cpp @@ -68,7 +68,7 @@ TAO_CosEC_PushConsumerWrapper::push (const RtecEventComm::EventSet& set) } void -TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer (void) +TAO_CosEC_PushConsumerWrapper::disconnect_push_consumer () { // Deactivate the supplier proxy. this->consumer_->disconnect_push_consumer (); @@ -95,7 +95,7 @@ TAO_CosEC_ProxyPushSupplier_i::TAO_CosEC_ProxyPushSupplier_i } void -TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier (void) +TAO_CosEC_ProxyPushSupplier_i::disconnect_push_supplier () { this->pps_->disconnect_push_supplier (); @@ -142,7 +142,7 @@ TAO_CosEC_ProxyPushSupplier_i::connect_push_consumer (CosEventComm::PushConsumer } int -TAO_CosEC_ProxyPushSupplier_i::connected (void) +TAO_CosEC_ProxyPushSupplier_i::connected () { return this->wrapper_ == 0 ? 0 : 1; } diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h index 245f4f3c449..1f711ec2a26 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ProxyPushSupplier_i.h @@ -40,7 +40,7 @@ public: ~TAO_CosEC_ProxyPushSupplier_i () = default; /// Ends the event communication and disposes this object. - virtual void disconnect_push_supplier (void); + virtual void disconnect_push_supplier (); /// Connects the <push_consumer> to the Event Channel. virtual void connect_push_consumer(CosEventComm::PushConsumer_ptr push_consumer); @@ -48,7 +48,7 @@ public: private: /// Returns 0 if a push_consumer is already connected to this /// ProxyPushSupplier, otherwise it returns a 1. - int connected (void); + int connected (); /// The ConsumerQOS specified by the user of this class. const RtecEventChannelAdmin::ConsumerQOS &qos_; diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp index 9de4ca109e6..54b80aa496f 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp @@ -1,7 +1,7 @@ #include "SupplierAdmin_i.h" #include <memory> -TAO_CosEC_SupplierAdmin_i::TAO_CosEC_SupplierAdmin_i (void) +TAO_CosEC_SupplierAdmin_i::TAO_CosEC_SupplierAdmin_i () : qos_ (), rtec_supplieradmin_ (RtecEventChannelAdmin::SupplierAdmin::_nil ()) { @@ -18,7 +18,7 @@ TAO_CosEC_SupplierAdmin_i::init (const RtecEventChannelAdmin::SupplierQOS &suppl } CosEventChannelAdmin::ProxyPushConsumer_ptr -TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (void) +TAO_CosEC_SupplierAdmin_i::obtain_push_consumer () { CosEventChannelAdmin::ProxyPushConsumer_ptr proxyconsumer_nil = CosEventChannelAdmin::ProxyPushConsumer::_nil (); @@ -46,7 +46,7 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (void) } CosEventChannelAdmin::ProxyPullConsumer_ptr -TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (void) +TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer () { // TODO: implement this. return CosEventChannelAdmin::ProxyPullConsumer::_nil (); diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h index d3c7c3c763a..79bffa8634e 100644 --- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h +++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h @@ -44,7 +44,7 @@ public: virtual CosEventChannelAdmin::ProxyPushConsumer_ptr obtain_push_consumer (); /// Returns a new ProxyPullConsumer_ptr. - virtual CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer(void); + virtual CosEventChannelAdmin::ProxyPullConsumer_ptr obtain_pull_consumer(); private: /// The SupplierQOS specified by the user of this class. |