diff options
| author | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-29 20:21:11 +0000 |
|---|---|---|
| committer | okellogg <okellogg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-01-29 20:21:11 +0000 |
| commit | 56681ffa90714cf82c32e907c0f80cea75166740 (patch) | |
| tree | fd798ba5478a08b4b6f842cb8515ed9776861f5f /TAO/orbsvcs/orbsvcs/Event | |
| parent | 6b5e98c78a7f66029147fad41e2e75cea35854aa (diff) | |
| download | ATCD-56681ffa90714cf82c32e907c0f80cea75166740.tar.gz | |
ChangeLogTag:Tue Jan 29 21:09:12 2002 Oliver Kellogg <oliver.kellogg@sysde.eads.net>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Event')
93 files changed, 960 insertions, 960 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp index 62f0d7a8402..21d3100981f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp @@ -152,11 +152,11 @@ int ACE_ES_Dispatching_Base::dispatch_event (ACE_ES_Dispatch_Request *request, u_long &command_action) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Forward the request. - up_->push (request TAO_ENV_ARG_PARAMETER); + up_->push (request ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -241,9 +241,9 @@ ACE_ES_Priority_Dispatching::initialize_queues (void) void ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - down_->connected (consumer TAO_ENV_ARG_PARAMETER); + down_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; // This code does dynamic allocation of channel dispatch threads. @@ -255,7 +255,7 @@ ACE_ES_Priority_Dispatching::connected (ACE_Push_Consumer_Proxy *consumer // We have to tell the lower portions of the channel about the // consumer first. This is so that any changes to the consumer's // qos will take effect when we get the dispatch priority. - down_->connected (consumer TAO_ENV_ARG_PARAMETER); + down_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::OS_Priority priority = @@ -338,7 +338,7 @@ ACE_ES_Priority_Dispatching::disconnected (ACE_Push_Consumer_Proxy *consumer) // <request> has been dynamically allocated by the filtering module. void ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TIMEPROBE (TAO_DISPATCHING_MODULES_PUSH_SOURCE_TYPE_CORRELATION_MODULE); @@ -355,14 +355,14 @@ ACE_ES_Priority_Dispatching::push (ACE_ES_Dispatch_Request *request thread_priority, subpriority, preemption_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server ()->priority (request->rt_info (), thread_priority, subpriority, preemption_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_TIMEPROBE (TAO_DISPATCHING_MODULES_PRIORITY_DISPATCHING_PUSH_PRIORITY_OBTAINED); ACE_CHECK; @@ -619,7 +619,7 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period, "ACE_ES_Dispatch_Queue::open_queue"), -1); case 0: { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY {// @@ TODO: Handle exceptions... #if 1 @@ -634,7 +634,7 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period, ORBSVCS_Time::zero (), 1, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->set (rt_info_, RtecScheduler::VERY_HIGH_CRITICALITY, @@ -646,7 +646,7 @@ ACE_ES_Dispatch_Queue::open_queue (RtecScheduler::Period_t &period, ORBSVCS_Time::zero (), 1, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } @@ -686,7 +686,7 @@ ACE_ES_EFD_Dispatching::ACE_ES_EFD_Dispatching (ACE_EventChannel *channel) void ACE_ES_EFD_Dispatching::push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { // If it's a request to forward an event, it needs a reference to us // to call dispatch_event. @@ -727,11 +727,11 @@ ACE_ES_RTU_Dispatching::dispatch_event (ACE_ES_Dispatch_Request *request, // Store the priority of the task currently running. channel_->rtu_manager ()->priority (request->priority ()); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Forward the request. - up_->push (request TAO_ENV_ARG_PARAMETER); + up_->push (request ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -759,10 +759,10 @@ ACE_ES_RTU_Dispatching::dispatch_event (ACE_ES_Dispatch_Request *request, void ACE_ES_RTU_Dispatching::push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // First enqueue the message in the proper queue. - ACE_ES_Priority_Dispatching::push (request TAO_ENV_ARG_PARAMETER); + ACE_ES_Priority_Dispatching::push (request ACE_ENV_ARG_PARAMETER); ACE_CHECK; // If the current event is higher priority (lower value) than the diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h index 30f14e7fd21..ab82394c9ec 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.h @@ -64,11 +64,11 @@ public: // Link to adjacent modules. virtual void connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Forward down_. virtual void disconnecting (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Forward down_. virtual void disconnected (ACE_Push_Consumer_Proxy *consumer); @@ -79,7 +79,7 @@ public: // void disconnecting (ACE_Push_Supplier_Proxy *supplier); virtual void push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; // Forward up_. virtual int dispatch_event (ACE_ES_Dispatch_Request *request, @@ -386,7 +386,7 @@ public: // Delete queues. void connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Allocate any needed dispatching resources for this consumers // priority. @@ -398,7 +398,7 @@ public: // void disconnecting (ACE_Push_Supplier_Proxy *supplier); virtual void push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Enqueues the request on the appropriate Dispatch Queue. virtual void activate (int threads_per_queue); @@ -471,7 +471,7 @@ public: // the dispatching base constructor. virtual void push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Forward up_. }; @@ -495,7 +495,7 @@ public: // policy. virtual void push (ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Calls ACE_ES_Priority_Dispatching::push and then checks if // preemption is necessary. }; diff --git a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i index cc6c5d64243..e2091091c6d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i +++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.i @@ -156,9 +156,9 @@ ACE_ES_Dispatching_Base::open (ACE_ES_Consumer_Module *up, ACE_INLINE void ACE_ES_Dispatching_Base::connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - down_->connected (consumer TAO_ENV_ARG_PARAMETER); + down_->connected (consumer ACE_ENV_ARG_PARAMETER); } ACE_INLINE void @@ -170,9 +170,9 @@ ACE_ES_Dispatching_Base::disconnected (ACE_Push_Consumer_Proxy *consumer) ACE_INLINE void ACE_ES_Dispatching_Base::disconnecting (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - down_->disconnecting (consumer TAO_ENV_ARG_PARAMETER); + down_->disconnecting (consumer ACE_ENV_ARG_PARAMETER); } ACE_INLINE void diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp index 624920c3b4e..a22b6ca2963 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp @@ -29,7 +29,7 @@ TAO_ECG_Mcast_EH::~TAO_ECG_Mcast_EH (void) int TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // @@ TODO Think about the exception safety (or lack thereof) of // this code, what if the following operations fail? @@ -44,13 +44,13 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec // its lifetime. RtecEventChannelAdmin::Observer_var obs = - this->observer_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->observer_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_TRY { this->handle_ = - this->ec_->append_observer (obs.in () TAO_ENV_ARG_PARAMETER); + this->ec_->append_observer (obs.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } ACE_CATCH(CORBA::SystemException, ex) @@ -60,12 +60,12 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec // we should encapsulate it in a Deactivator. PortableServer::POA_var poa = - this->observer_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->observer_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::ObjectId_var id = - poa->servant_to_id (&this->observer_ TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (&this->observer_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_RE_THROW; @@ -77,26 +77,26 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec } int -TAO_ECG_Mcast_EH::close (TAO_ENV_SINGLE_ARG_DECL) +TAO_ECG_Mcast_EH::close (ACE_ENV_SINGLE_ARG_DECL) { if (this->handle_ == 0) return 0; RtecEventChannelAdmin::Observer_Handle h = this->handle_; this->handle_ = 0; - this->ec_->remove_observer (h TAO_ENV_ARG_PARAMETER); + this->ec_->remove_observer (h ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // @@ TODO If the first operation raises an exception then the // second one never executes!!! { PortableServer::POA_var poa = - this->observer_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->observer_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::ObjectId_var id = - poa->servant_to_id (&this->observer_ TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (&this->observer_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } @@ -144,7 +144,7 @@ void TAO_ECG_Mcast_EH::compute_required_subscriptions ( const RtecEventChannelAdmin::ConsumerQOS& sub, Address_Set& multicast_addresses - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { CORBA::ULong count = sub.dependencies.length (); @@ -170,7 +170,7 @@ TAO_ECG_Mcast_EH::compute_required_subscriptions ( // opportunity to recover it. // + Close the MCast Event Handler completely, too much policy // for this level. - this->receiver_->get_addr (header, addr TAO_ENV_ARG_PARAMETER); + this->receiver_->get_addr (header, addr ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_INET_Addr inet_addr (addr.port, addr.ipaddr); @@ -299,7 +299,7 @@ TAO_ECG_Mcast_EH::add_new_subscriptions ( void TAO_ECG_Mcast_EH::update_consumer ( const RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // @@ TODO This function turned out to be too long, we need to break @@ -310,7 +310,7 @@ TAO_ECG_Mcast_EH::update_consumer ( Address_Set multicast_addresses; - this->compute_required_subscriptions (sub, multicast_addresses TAO_ENV_ARG_PARAMETER); + this->compute_required_subscriptions (sub, multicast_addresses ACE_ENV_ARG_PARAMETER); ACE_CHECK; // 2) To conserve OS and network resources we first unsubscribe from @@ -329,7 +329,7 @@ TAO_ECG_Mcast_EH::update_consumer ( void TAO_ECG_Mcast_EH::update_supplier (const RtecEventChannelAdmin::SupplierQOS& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing @@ -345,19 +345,19 @@ TAO_ECG_Mcast_EH::Observer::Observer (TAO_ECG_Mcast_EH* eh) void TAO_ECG_Mcast_EH::Observer::update_consumer ( const RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->eh_->update_consumer (sub TAO_ENV_ARG_PARAMETER); + this->eh_->update_consumer (sub ACE_ENV_ARG_PARAMETER); } void TAO_ECG_Mcast_EH::Observer::update_supplier ( const RtecEventChannelAdmin::SupplierQOS& pub - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->eh_->update_supplier (pub TAO_ENV_ARG_PARAMETER); + this->eh_->update_supplier (pub ACE_ENV_ARG_PARAMETER); } #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h index a4f52be104d..fa9fc0dd703 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h @@ -59,24 +59,24 @@ public: * reactor. */ int open (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * Remove ourselves from the event channel, unsubscribe from the * multicast groups, close the sockets and unsubscribe from the * reactor. */ - int close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Reactor callbacks virtual int handle_input (ACE_HANDLE fd); /// The Observer methods void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /** @@ -100,11 +100,11 @@ public: // The Observer methods virtual void update_consumer ( const RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void update_supplier ( const RtecEventChannelAdmin::SupplierQOS& pub - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -134,7 +134,7 @@ private: void compute_required_subscriptions ( const RtecEventChannelAdmin::ConsumerQOS& sub, Address_Set& multicast_addresses - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Delete the list of multicast addresses that we need not diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp index 33a372afecc..eac9230d22c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.cpp @@ -61,7 +61,7 @@ void TAO_ECG_UDP_Sender::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, RtecUDPAdmin::AddrServer_ptr addr_server, TAO_ECG_UDP_Out_Endpoint* endpoint - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_duplicate (lcl_ec); @@ -83,23 +83,23 @@ TAO_ECG_UDP_Sender::mtu (CORBA::ULong new_mtu) } void -TAO_ECG_UDP_Sender::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_ECG_UDP_Sender::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->close (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_nil (); } void TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Open gateway\n")); if (CORBA::is_nil (this->lcl_ec_.in ())) return; if (!CORBA::is_nil (this->supplier_proxy_.in ())) - this->close (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (sub.dependencies.length () == 0) @@ -109,15 +109,15 @@ TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub //ACE_SupplierQOS_Factory::debug (pub); RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->lcl_ec_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lcl_ec_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventComm::PushConsumer_var consumer_ref = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; //ACE_DEBUG ((LM_DEBUG, "ECG (%t) Gateway/Consumer ")); @@ -125,35 +125,35 @@ TAO_ECG_UDP_Sender::open (RtecEventChannelAdmin::ConsumerQOS& sub this->supplier_proxy_->connect_push_consumer (consumer_ref.in (), sub - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_ECG_UDP_Sender::close (TAO_ENV_SINGLE_ARG_DECL) +TAO_ECG_UDP_Sender::close (ACE_ENV_SINGLE_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n")); if (CORBA::is_nil (this->supplier_proxy_.in ())) return; - this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil (); PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_ECG_UDP_Sender::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ECG_UDP_Sender::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -163,7 +163,7 @@ TAO_ECG_UDP_Sender::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "ECG_UDP_Sender::push - \n")); @@ -192,11 +192,11 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events RtecUDPAdmin::UDP_Addr udp_addr; this->addr_server_->get_addr (header, udp_addr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->send_event (udp_addr, e - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // That's it, no need to continue... @@ -219,7 +219,7 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events // Grab the right mcast group for this event... RtecUDPAdmin::UDP_Addr udp_addr; this->addr_server_->get_addr (e.header, udp_addr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; Destination_Map::ENTRY *entry; @@ -249,11 +249,11 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events ++k) { this->marshal_one_event (events[(*k)], cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } this->send_cdr_stream ((*j).ext_id_, cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -269,7 +269,7 @@ TAO_ECG_UDP_Sender::push (const RtecEventComm::EventSet &events void TAO_ECG_UDP_Sender::marshal_one_event (const RtecEventComm::Event& e, TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // We need to modify the TTL field, but copying the entire event // would be wasteful; instead we create a new header and only @@ -285,7 +285,7 @@ TAO_ECG_UDP_Sender::marshal_one_event (const RtecEventComm::Event& e, void TAO_ECG_UDP_Sender::send_event (const RtecUDPAdmin::UDP_Addr& udp_addr, const RtecEventComm::Event& e - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This is the CDR stream used to marshal the event... TAO_OutputCDR cdr; @@ -295,17 +295,17 @@ TAO_ECG_UDP_Sender::send_event (const RtecUDPAdmin::UDP_Addr& udp_addr, // marshal without any extra copies. cdr.write_ulong (1); - this->marshal_one_event (e, cdr TAO_ENV_ARG_PARAMETER); + this->marshal_one_event (e, cdr ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->send_cdr_stream (udp_addr, cdr - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr, TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // @@ TODO precompute this when the MTU changes... CORBA::ULong max_fragment_payload = this->mtu () - @@ -364,7 +364,7 @@ TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr, fragment_count, iov, iovcnt - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; fragment_id++; fragment_offset += max_fragment_payload; @@ -392,7 +392,7 @@ TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr, fragment_count, iov, iovcnt - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; fragment_id++; fragment_offset += max_fragment_payload; @@ -413,7 +413,7 @@ TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr, fragment_count, iov, iovcnt - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; fragment_id++; fragment_offset += fragment_size; @@ -437,7 +437,7 @@ TAO_ECG_UDP_Sender::send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr, fragment_count, iov, iovcnt - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; fragment_id++; fragment_offset += fragment_size; @@ -460,7 +460,7 @@ TAO_ECG_UDP_Sender::send_fragment (const RtecUDPAdmin::UDP_Addr& udp_addr, CORBA::ULong fragment_count, iovec iov[], int iovcnt - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::ULong header[TAO_ECG_UDP_Protocol::ECG_HEADER_SIZE / sizeof(CORBA::ULong) diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h index 7757cbce581..a039adeb648 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h +++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h @@ -59,7 +59,7 @@ public: void init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, RtecUDPAdmin::AddrServer_ptr addr_server, TAO_ECG_UDP_Out_Endpoint *endpoint - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * The sender may need to fragment the message, otherwise the @@ -72,20 +72,20 @@ public: /// Disconnect and shutdown the sender, no further connections will /// work unless init() is called again. - void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Connect (or reconnect) to the EC with the given subscriptions. void open (RtecEventChannelAdmin::ConsumerQOS &sub - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Disconnect from the EC, but reconnection is still possible. - void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// The PushConsumer methods. - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -96,18 +96,18 @@ private: */ void marshal_one_event (const RtecEventComm::Event& e, TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Helper function to marshal and send a single event. void send_event (const RtecUDPAdmin::UDP_Addr& udp_addr, const RtecEventComm::Event& e - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Helper function to send one or more events once they have been /// marshaled into a CDR stream. void send_cdr_stream (const RtecUDPAdmin::UDP_Addr& udp_addr, TAO_OutputCDR &cdr - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Send one fragment, the first entry in the iovec is used to send @@ -123,7 +123,7 @@ private: CORBA::ULong fragment_count, iovec iov[], int iovcnt - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /** * Count the number of fragments that will be required to send the diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp index 7efa43f67b9..f9562d11194 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp @@ -59,12 +59,12 @@ TAO_EC_And_Filter::size (void) const int TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n == 0) return 0; @@ -73,7 +73,7 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event, // All children accepted the event, push up... if (this->parent () != 0) { - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -83,12 +83,12 @@ TAO_EC_And_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + int n = (*i)->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n == 0) return 0; @@ -97,7 +97,7 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event, // All children accepted the event, push up... if (this->parent () != 0) { - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -107,14 +107,14 @@ TAO_EC_And_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_And_Filter::push (const RtecEventComm::EventSet&, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_And_Filter::push_nocopy (RtecEventComm::EventSet&, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -165,7 +165,7 @@ int TAO_EC_And_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h index cd510858f4e..631198f7014 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h @@ -51,22 +51,22 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); typedef unsigned int Word; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp index 5725d9bf671..b1b7b1ca222 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp @@ -25,7 +25,7 @@ TAO_EC_Filter* TAO_EC_Basic_Filter_Builder::build ( TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL_NOT_USED) const + ACE_ENV_ARG_DECL_NOT_USED) const { CORBA::ULong pos = 0; return this->recursive_build (supplier, qos, pos); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h index 38d4c5fb386..ddbfcfe1bbd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h @@ -47,7 +47,7 @@ public: // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; private: /// Recursively build the filter tree. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp index c958f40e5e5..da2d0e66069 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp @@ -45,7 +45,7 @@ TAO_EC_Bitmask_Filter::size (void) const int TAO_EC_Bitmask_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (event.length () != 1) return 0; @@ -54,13 +54,13 @@ TAO_EC_Bitmask_Filter::filter (const RtecEventComm::EventSet& event, || (event[0].header.source & this->source_mask_) == 0) return 0; - return this->child_->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + return this->child_->filter (event, qos_info ACE_ENV_ARG_PARAMETER); } int TAO_EC_Bitmask_Filter::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (event.length () != 1) return 0; @@ -69,25 +69,25 @@ TAO_EC_Bitmask_Filter::filter_nocopy (RtecEventComm::EventSet& event, || (event[0].header.source & this->source_mask_) == 0) return 0; - return this->child_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + return this->child_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); } void TAO_EC_Bitmask_Filter::push (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); } void TAO_EC_Bitmask_Filter::push_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -117,7 +117,7 @@ int TAO_EC_Bitmask_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h index 69984a309ef..f617b1a7f53 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h @@ -68,22 +68,22 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Bitmask_Filter diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp index bc5b04a77c1..913e5ce35ce 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp @@ -83,14 +83,14 @@ TAO_EC_Conjunction_Filter::size (void) const int TAO_EC_Conjunction_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (this->current_child_ = this->begin (); this->current_child_ != end; ++this->current_child_) { - int n = (*this->current_child_)->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + int n = (*this->current_child_)->filter (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n != 0) return n; @@ -101,14 +101,14 @@ TAO_EC_Conjunction_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Conjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + int n = (*i)->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n != 0) return n; @@ -119,7 +119,7 @@ TAO_EC_Conjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Conjunction_Filter::push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Long pos = this->current_child_ - this->begin (); int w = pos / bits_per_word; @@ -135,15 +135,15 @@ TAO_EC_Conjunction_Filter::push (const RtecEventComm::EventSet& event, this->event_[l + i] = event[i]; } if (this->all_received () && this->parent () != 0) - this->parent ()->push_nocopy (this->event_, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (this->event_, qos_info ACE_ENV_ARG_PARAMETER); } void TAO_EC_Conjunction_Filter::push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->push (event, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -203,7 +203,7 @@ int TAO_EC_Conjunction_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h index bf49e8a52e3..b2788d196a2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h @@ -53,22 +53,22 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); typedef unsigned int Word; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp index ddcfd4faa5f..90f84370770 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp @@ -26,14 +26,14 @@ TAO_EC_ConsumerAdmin::~TAO_EC_ConsumerAdmin (void) } RtecEventChannelAdmin::ProxyPushSupplier_ptr -TAO_EC_ConsumerAdmin::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ConsumerAdmin::obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->obtain (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->obtain (ACE_ENV_SINGLE_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_EC_ConsumerAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ConsumerAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h index cac71634fde..7914fc9f6c2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h @@ -38,7 +38,7 @@ class TAO_EC_ProxyPushConsumer; * <H2> Memory Management</H2> * It does not assume ownership of the TAO_EC_Event_Channel object; * but it *does* assume ownership of the TAO_EC_ProxyPushSupplier_Set - * object. + * object. * * <H2>Locking</H2> * No provisions for locking, access must be serialized externally. @@ -60,11 +60,11 @@ public: // = The RtecEventChannelAdmin::ConsumerAdmin methods... virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); private: /// Store the default POA. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp index 654bb82e8e8..0d0a8be8ed3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp @@ -30,14 +30,14 @@ TAO_EC_ConsumerControl::shutdown (void) void TAO_EC_ConsumerControl::consumer_not_exist (TAO_EC_ProxyPushSupplier * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_ConsumerControl::system_exception (TAO_EC_ProxyPushSupplier *, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h index 1af9cbbfe63..1d39d13cf24 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h @@ -56,12 +56,12 @@ public: * reclaim all the resources attached to that object. */ virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Some system exception was rasied while trying to push an event. virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp index dce14cd6423..97b182299fe 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp @@ -59,14 +59,14 @@ TAO_EC_Disjunction_Filter::size (void) const int TAO_EC_Disjunction_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n != 0) return n; @@ -77,14 +77,14 @@ TAO_EC_Disjunction_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Disjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - int n = (*i)->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + int n = (*i)->filter (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (n != 0) return n; @@ -95,19 +95,19 @@ TAO_EC_Disjunction_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Disjunction_Filter::push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); } void TAO_EC_Disjunction_Filter::push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -157,7 +157,7 @@ int TAO_EC_Disjunction_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h index 02e2752af51..e450d1c4a8c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h @@ -52,22 +52,22 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Disjunction_Filter diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp index b1195799e0e..71f099ef2f3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp @@ -34,9 +34,9 @@ TAO_EC_Reactive_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - proxy->reactive_push_to_consumer (consumer, event TAO_ENV_ARG_PARAMETER); + proxy->reactive_push_to_consumer (consumer, event ACE_ENV_ARG_PARAMETER); } void @@ -44,7 +44,7 @@ TAO_EC_Reactive_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - proxy->reactive_push_to_consumer (consumer, event TAO_ENV_ARG_PARAMETER); + proxy->reactive_push_to_consumer (consumer, event ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h index 9ed29c5a12d..3aa53499fd4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h @@ -64,12 +64,12 @@ public: RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; virtual void push_nocopy (TAO_EC_ProxyPushSupplier *proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL_WITH_DEFAULTS) = 0; + ACE_ENV_ARG_DECL_WITH_DEFAULTS) = 0; }; // **************************************************************** @@ -96,12 +96,12 @@ public: RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); virtual void push_nocopy (TAO_EC_ProxyPushSupplier *proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp index 79303ce3ebb..cb0a9a28d24 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp @@ -42,7 +42,7 @@ TAO_EC_Dispatching_Task::svc (void) continue; } - int result = command->execute (TAO_ENV_SINGLE_ARG_PARAMETER); + int result = command->execute (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Message_Block::release (mb); @@ -64,7 +64,7 @@ void TAO_EC_Dispatching_Task::push (TAO_EC_ProxyPushSupplier *proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->allocator_ == 0) this->allocator_ = ACE_Allocator::instance (); @@ -93,7 +93,7 @@ TAO_EC_Dispatch_Command::~TAO_EC_Dispatch_Command (void) // **************************************************************** int -TAO_EC_Shutdown_Task_Command::execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_Shutdown_Task_Command::execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return -1; } @@ -106,11 +106,11 @@ TAO_EC_Push_Command::~TAO_EC_Push_Command (void) } int -TAO_EC_Push_Command::execute (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Push_Command::execute (ACE_ENV_SINGLE_ARG_DECL) { this->proxy_->push_to_consumer (this->consumer_.in (), this->event_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h index dd2cd77fc51..21f03a332c4 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h @@ -59,7 +59,7 @@ public: virtual void push (TAO_EC_ProxyPushSupplier *proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// An per-task allocator @@ -88,7 +88,7 @@ public: virtual ~TAO_EC_Dispatch_Command (void); /// Command callback - virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) = 0; + virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) = 0; }; // **************************************************************** @@ -100,7 +100,7 @@ public: TAO_EC_Shutdown_Task_Command (ACE_Allocator *mb_allocator = 0); /// Command callback - virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); }; // **************************************************************** @@ -119,7 +119,7 @@ public: virtual ~TAO_EC_Push_Command (void); /// Command callback - virtual int execute (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual int execute (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); private: /// The proxy diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp index 94e1737e919..24c4a9ab38a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp @@ -101,7 +101,7 @@ TAO_EC_Event_Channel::~TAO_EC_Event_Channel (void) } void -TAO_EC_Event_Channel::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_Event_Channel::activate (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->dispatching_->activate (); this->timeout_generator_->activate (); @@ -110,7 +110,7 @@ TAO_EC_Event_Channel::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -TAO_EC_Event_Channel::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Event_Channel::shutdown (ACE_ENV_SINGLE_ARG_DECL) { this->dispatching_->shutdown (); this->timeout_generator_->shutdown (); @@ -118,144 +118,144 @@ TAO_EC_Event_Channel::shutdown (TAO_ENV_SINGLE_ARG_DECL) this->consumer_control_->shutdown (); PortableServer::POA_var consumer_poa = - this->consumer_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var consumer_id = - consumer_poa->servant_to_id (this->consumer_admin_ TAO_ENV_ARG_PARAMETER); + consumer_poa->servant_to_id (this->consumer_admin_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER); + consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POA_var supplier_poa = - this->supplier_admin_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_admin_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var supplier_id = - supplier_poa->servant_to_id (this->supplier_admin_ TAO_ENV_ARG_PARAMETER); + supplier_poa->servant_to_id (this->supplier_admin_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER); + supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->consumer_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_admin_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->peer_connected (consumer TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->peer_connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_admin_->connected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->connected (consumer TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_Event_Channel::reconnected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->peer_reconnected (consumer TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->peer_reconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_admin_->reconnected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->reconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->connected (consumer TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->consumer_admin_->peer_disconnected (consumer TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->peer_disconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->supplier_admin_->disconnected (consumer TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->disconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->disconnected (consumer TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->disconnected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_Event_Channel::connected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->peer_connected (supplier TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->peer_connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->consumer_admin_->connected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->connected (supplier TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_Event_Channel::reconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->peer_reconnected (supplier TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->peer_reconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->consumer_admin_->reconnected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->reconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->connected (supplier TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_Event_Channel::disconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->supplier_admin_->peer_disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->supplier_admin_->peer_disconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->consumer_admin_->disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->consumer_admin_->disconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->observer_strategy_->disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->disconnected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; } RtecEventChannelAdmin::ConsumerAdmin_ptr -TAO_EC_Event_Channel::for_consumers (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Event_Channel::for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->consumer_admin_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->consumer_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } RtecEventChannelAdmin::SupplierAdmin_ptr -TAO_EC_Event_Channel::for_suppliers (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Event_Channel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->supplier_admin_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->supplier_admin_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_EC_Event_Channel::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Event_Channel::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } RtecEventChannelAdmin::Observer_Handle TAO_EC_Event_Channel::append_observer ( RtecEventChannelAdmin::Observer_ptr observer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) { - return this->observer_strategy_->append_observer (observer TAO_ENV_ARG_PARAMETER); + return this->observer_strategy_->append_observer (observer ACE_ENV_ARG_PARAMETER); } void TAO_EC_Event_Channel::remove_observer ( RtecEventChannelAdmin::Observer_Handle handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)) { - this->observer_strategy_->remove_observer (handle TAO_ENV_ARG_PARAMETER); + this->observer_strategy_->remove_observer (handle ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h index e731eb6fb4e..b095cfaebe9 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h @@ -120,11 +120,11 @@ public: /// Start the internal threads (if any), etc. /// After this call the EC can be used. - virtual void activate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void activate (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Shutdown any internal threads, cleanup all the internal /// structures, flush all the messages, etc. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Access the dispatching module.... TAO_EC_Dispatching* dispatching (void) const; @@ -188,20 +188,20 @@ public: /// Used to inform the EC that a Consumer has connected or /// disconnected from it. virtual void connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); /// Used to inform the EC that a Supplier has connected or /// disconnected from it. virtual void connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void reconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Simple flags to control the EC behavior, set by the application // at construction time. @@ -226,31 +226,31 @@ public: // = The RtecEventChannelAdmin::EventChannel methods... /// The default implementation is: - /// this->consumer_admin ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + /// this->consumer_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER); virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (TAO_ENV_SINGLE_ARG_DECL) + for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// The default implementation is: - /// this->supplier_admin ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + /// this->supplier_admin ()->_this (ACE_ENV_SINGLE_ARG_PARAMETER); virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (TAO_ENV_SINGLE_ARG_DECL) + for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Commit suicide. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp index f2e738b5b2b..aebd91da40b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp @@ -38,7 +38,7 @@ TAO_EC_Filter::size (void) const void TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_THROW (CORBA::NO_IMPLEMENT (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); @@ -49,11 +49,11 @@ TAO_EC_Filter::get_qos_info (TAO_EC_QOS_Info& int TAO_EC_Null_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This is a leaf, no need to query any children, and we accept all // events, so push it. - this->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -61,11 +61,11 @@ TAO_EC_Null_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Null_Filter::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // This is a leaf, no need to query any children, and we accept all // events, so push it. - this->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -73,19 +73,19 @@ TAO_EC_Null_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Null_Filter::push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); } void TAO_EC_Null_Filter::push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -113,7 +113,7 @@ int TAO_EC_Null_Filter::add_dependencies ( const RtecEventComm::EventHeader &, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h index a9d6c03e718..a3cb7a22850 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.h @@ -86,10 +86,10 @@ public: */ virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /** * This is called by the children when they accept an event and @@ -99,10 +99,10 @@ public: */ virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Clear any saved state, must reset and assume no events have been /// received. @@ -134,7 +134,7 @@ public: */ virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /** * Obtain the QOS information for this filter, the default @@ -143,7 +143,7 @@ public: * Returns 0 on success and -1 on failure */ virtual void get_qos_info (TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// The parent... @@ -175,22 +175,22 @@ public: // TAO_EC_Filter. virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp index fdb29f3ccbb..8b8cc5ddbe7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp @@ -23,7 +23,7 @@ TAO_EC_Filter* TAO_EC_Null_Filter_Builder::build ( TAO_EC_ProxyPushSupplier *, RtecEventChannelAdmin::ConsumerQOS& - TAO_ENV_ARG_DECL_NOT_USED) const + ACE_ENV_ARG_DECL_NOT_USED) const { return new TAO_EC_Null_Filter; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h index 7a81a583244..d267399000a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.h @@ -47,7 +47,7 @@ public: virtual TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) const = 0; + ACE_ENV_ARG_DECL) const = 0; }; @@ -72,7 +72,7 @@ public: // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; }; // **************************************************************** diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp index 87f78dfc03f..ef141efbfb1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp @@ -70,17 +70,17 @@ TAO_EC_Gateway_IIOP::~TAO_EC_Gateway_IIOP (void) void TAO_EC_Gateway_IIOP::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, RtecEventChannelAdmin::EventChannel_ptr lcl_ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - this->init_i (rmt_ec, lcl_ec TAO_ENV_ARG_PARAMETER); + this->init_i (rmt_ec, lcl_ec ACE_ENV_ARG_PARAMETER); } void TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, RtecEventChannelAdmin::EventChannel_ptr lcl_ec - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (!CORBA::is_nil (this->rmt_ec_.in ())) return; @@ -92,16 +92,16 @@ TAO_EC_Gateway_IIOP::init_i (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, } void -TAO_EC_Gateway_IIOP::close (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Gateway_IIOP::close (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - this->close_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close_i (ACE_ENV_SINGLE_ARG_PARAMETER); } void -TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Gateway_IIOP::close_i (ACE_ENV_SINGLE_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n")); @@ -116,7 +116,7 @@ TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL) continue; ACE_TRY { - consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -132,7 +132,7 @@ TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL) if (!CORBA::is_nil (this->default_consumer_proxy_.in ())) { - this->default_consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->default_consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->default_consumer_proxy_ = @@ -141,7 +141,7 @@ TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL) if (!CORBA::is_nil (this->supplier_proxy_.in ())) { - this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = @@ -152,7 +152,7 @@ TAO_EC_Gateway_IIOP::close_i (TAO_ENV_SINGLE_ARG_DECL) void TAO_EC_Gateway_IIOP::update_consumer ( const RtecEventChannelAdmin::ConsumerQOS& c_qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (c_qos.dependencies.length () <= 1) @@ -167,15 +167,15 @@ TAO_EC_Gateway_IIOP::update_consumer ( return; } - this->update_consumer_i (c_qos TAO_ENV_ARG_PARAMETER); + this->update_consumer_i (c_qos ACE_ENV_ARG_PARAMETER); } void TAO_EC_Gateway_IIOP::update_consumer_i ( const RtecEventChannelAdmin::ConsumerQOS& c_qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->close_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (this->lcl_ec_.in ()) @@ -186,7 +186,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( // = Connect as a supplier to the local EC RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->lcl_ec_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lcl_ec_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Change the RT_Info in the consumer QoS. @@ -222,7 +222,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( //ACE_DEBUG ((LM_DEBUG, // "ECG (%t) binding source %d\n", // sid)); - proxy = supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy = supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_map_.bind (sid, proxy); } @@ -237,7 +237,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( // Obtain a reference to our supplier personality... RtecEventComm::PushSupplier_var supplier_ref = - this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // For each subscription by source build the set of publications @@ -281,7 +281,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( // ACE_SupplierQOS_Factory::debug (pub); (*j).int_id_->connect_push_supplier (supplier_ref.in (), pub - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -316,12 +316,12 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( // Obtain a reference to our supplier personality... RtecEventComm::PushSupplier_var supplier_ref = - this->supplier_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Obtain the consumer.... this->default_consumer_proxy_ = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; pub.publications.length (c); @@ -329,23 +329,23 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( // ACE_SupplierQOS_Factory::debug (pub); this->default_consumer_proxy_->connect_push_supplier (supplier_ref.in (), pub - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->rmt_ec_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->rmt_ec_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_is_active_ = 1; RtecEventComm::PushConsumer_var consumer_ref = - this->consumer_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ACE_DEBUG ((LM_DEBUG, "ECG (%P|%t) Gateway/Consumer ")); @@ -353,7 +353,7 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( this->supplier_proxy_->connect_push_consumer (consumer_ref.in (), sub - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -361,14 +361,14 @@ TAO_EC_Gateway_IIOP::update_consumer_i ( void TAO_EC_Gateway_IIOP::update_supplier ( const RtecEventChannelAdmin::SupplierQOS& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // Do nothing... } void -TAO_EC_Gateway_IIOP::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_Gateway_IIOP::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { // ACE_DEBUG ((LM_DEBUG, // "ECG (%t): Supplier-consumer received " @@ -376,7 +376,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -TAO_EC_Gateway_IIOP::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_Gateway_IIOP::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { // ACE_DEBUG ((LM_DEBUG, // "ECG (%t): Supplier received " @@ -385,7 +385,7 @@ TAO_EC_Gateway_IIOP::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "TAO_EC_Gateway_IIOP::push (%P|%t) - \n")); @@ -429,7 +429,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events out[0].header.ttl--; // ACE_DEBUG ((LM_DEBUG, "ECG: event sent to proxy\n")); - proxy->push (out TAO_ENV_ARG_PARAMETER); + proxy->push (out ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -441,7 +441,7 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events if (this->busy_count_ == 0 && this->update_posted_ != 0) { this->update_posted_ = 0; - this->update_consumer_i (this->c_qos_ TAO_ENV_ARG_PARAMETER); + this->update_consumer_i (this->c_qos_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -449,22 +449,22 @@ TAO_EC_Gateway_IIOP::push (const RtecEventComm::EventSet &events } int -TAO_EC_Gateway_IIOP::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Gateway_IIOP::shutdown (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1); - this->close_i (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close_i (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); if (this->supplier_is_active_) { PortableServer::POA_var poa = - this->supplier_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::ObjectId_var id = - poa->servant_to_id (&this->supplier_ TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (&this->supplier_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->supplier_is_active_ = 0; } @@ -472,12 +472,12 @@ TAO_EC_Gateway_IIOP::shutdown (TAO_ENV_SINGLE_ARG_DECL) if (this->consumer_is_active_) { PortableServer::POA_var poa = - this->consumer_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); PortableServer::ObjectId_var id = - poa->servant_to_id (&this->consumer_ TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (&this->consumer_ ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); this->consumer_is_active_ = 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h index 35f630050e1..19f97e9268e 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h @@ -49,7 +49,7 @@ public: /// The gateway must disconnect from all the relevant event channels, /// or any other communication media (such as multicast groups). - virtual void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0; + virtual void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) = 0; /// Obtain and modify the observer handle. void observer_handle (RtecEventChannelAdmin::Observer_Handle h); @@ -100,42 +100,42 @@ public: /// ECs it will connect to, void init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, RtecEventChannelAdmin::EventChannel_ptr lcl_ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// The channel is disconnecting. - void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// The channel is disconnecting. - void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// This is the Consumer side behavior, it pushes the events to the /// local event channel. void push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Disconnect and shutdown the gateway - int shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + int shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // The following methods are documented in the base class. - virtual void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); virtual void update_consumer (const RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void update_supplier (const RtecEventChannelAdmin::SupplierQOS& pub - TAO_ENV_ARG_DECL_WITH_DEFAULTS) + ACE_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); private: - void close_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + void close_i (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); void update_consumer_i (const RtecEventChannelAdmin::ConsumerQOS& sub - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); protected: /// Do the real work in init() void init_i (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, RtecEventChannelAdmin::EventChannel_ptr lcl_ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); protected: /// Lock to synchronize internal changes diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp index a4baa6b4b42..879701a3ee7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp @@ -21,11 +21,11 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, RtecScheduler::Scheduler_ptr lcl_sched, const char* lcl_name, const char* rmt_name - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - this->init_i (rmt_ec, lcl_ec TAO_ENV_ARG_PARAMETER); + this->init_i (rmt_ec, lcl_ec ACE_ENV_ARG_PARAMETER); ACE_CHECK; // @@ Should we throw a system exception here? @@ -36,7 +36,7 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, ACE_THROW (CORBA::BAD_PARAM ()); this->rmt_info_ = - rmt_sched->create (rmt_name TAO_ENV_ARG_PARAMETER); + rmt_sched->create (rmt_name ACE_ENV_ARG_PARAMETER); ACE_CHECK; // @@ TODO Many things are hard-coded in the RT_Info here. @@ -54,11 +54,11 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, time, 0, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->lcl_info_ = - lcl_sched->create (lcl_name TAO_ENV_ARG_PARAMETER); + lcl_sched->create (lcl_name ACE_ENV_ARG_PARAMETER); ACE_CHECK; tv = ACE_Time_Value (0, 500); @@ -71,6 +71,6 @@ TAO_EC_Gateway_Sched::init (RtecEventChannelAdmin::EventChannel_ptr rmt_ec, time, 1, RtecScheduler::REMOTE_DEPENDANT - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h index d93e98634de..2452c13b8b7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.h @@ -48,7 +48,7 @@ public: RtecScheduler::Scheduler_ptr lcl_sched, const char* lcl_name, const char* rmt_name - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); }; #include "ace/post.h" diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp index 7b447516105..544bf3a1891 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp @@ -197,7 +197,7 @@ TAO_ECG_UDP_Request_Entry::fragment_buffer (CORBA::ULong fragment_offset) void TAO_ECG_UDP_Request_Entry::decode (RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_InputCDR cdr (&this->payload_, ACE_static_cast(int,this->byte_order_)); @@ -234,7 +234,7 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, ACE_Reactor *reactor, const ACE_Time_Value &expire_interval, int max_timeout - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { this->ignore_from_ = ignore_from; @@ -258,13 +258,13 @@ TAO_ECG_UDP_Receiver::init (RtecEventChannelAdmin::EventChannel_ptr lcl_ec, void TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (CORBA::is_nil (this->lcl_ec_.in ())) return; if (!CORBA::is_nil (this->consumer_proxy_.in ())) - this->close (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (pub.publications.length () == 0) @@ -272,15 +272,15 @@ TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub // = Connect as a supplier to the local EC RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->lcl_ec_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->lcl_ec_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventComm::PushSupplier_var supplier_ref = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // ACE_DEBUG ((LM_DEBUG, "ECG_UDP_Receiver (%t) Gateway/Supplier ")); @@ -288,35 +288,35 @@ TAO_ECG_UDP_Receiver::open (RtecEventChannelAdmin::SupplierQOS& pub this->consumer_proxy_->connect_push_supplier (supplier_ref.in (), pub - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_ECG_UDP_Receiver::close (TAO_ENV_SINGLE_ARG_DECL) +TAO_ECG_UDP_Receiver::close (ACE_ENV_SINGLE_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "ECG (%t) Closing gateway\n")); if (CORBA::is_nil (this->consumer_proxy_.in ())) return; - this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = RtecEventChannelAdmin::ProxyPushConsumer::_nil (); PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -TAO_ECG_UDP_Receiver::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_ECG_UDP_Receiver::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, @@ -325,9 +325,9 @@ TAO_ECG_UDP_Receiver::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED } void -TAO_ECG_UDP_Receiver::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_ECG_UDP_Receiver::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->close (TAO_ENV_SINGLE_ARG_PARAMETER); + this->close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->lcl_ec_ = RtecEventChannelAdmin::EventChannel::_nil (); @@ -511,14 +511,14 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram) return 0; } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { RtecEventComm::EventSet event; - entry->int_id_->decode (event TAO_ENV_ARG_PARAMETER); + entry->int_id_->decode (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->consumer_proxy_->push (event TAO_ENV_ARG_PARAMETER); + this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_DEBUG ((LM_DEBUG, @@ -539,9 +539,9 @@ TAO_ECG_UDP_Receiver::handle_input (ACE_SOCK_Dgram& dgram) void TAO_ECG_UDP_Receiver::get_addr (const RtecEventComm::EventHeader& header, RtecUDPAdmin::UDP_Addr_out addr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->addr_server_->get_addr (header, addr TAO_ENV_ARG_PARAMETER); + this->addr_server_->get_addr (header, addr ACE_ENV_ARG_PARAMETER); } int diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h index ca2b9d534a3..c854a6abbd5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h @@ -201,7 +201,7 @@ public: /// Decode the events, the message must be complete. void decode (RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Increment the timeout counter... void inc_timeout (void); @@ -299,17 +299,17 @@ public: ACE_Reactor *reactor, const ACE_Time_Value &expire_interval, int max_timeout - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Disconnect and shutdown the gateway, no further connectsions - void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void shutdown (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /// Connect to the EC using the given publications lists. void open (RtecEventChannelAdmin::SupplierQOS& pub - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); /// Disconnect to the EC. - virtual void close (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void close (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); /** * The Event_Handlers call this method when data is available at the @@ -324,13 +324,13 @@ public: const void* act); // The PushSupplier method. - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); /// Call the RtecUDPAdmin::AddrServer void get_addr (const RtecEventComm::EventHeader& header, RtecUDPAdmin::UDP_Addr_out addr - TAO_ENV_ARG_DECL_WITH_DEFAULTS); + ACE_ENV_ARG_DECL_WITH_DEFAULTS); private: /// The remote and the local EC, so we can reconnect when the list changes. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp index 40323210aa1..5463f77f0c1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.cpp @@ -14,7 +14,7 @@ void TAO_EC_Group_Scheduling::add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *, TAO_EC_ProxyPushConsumer * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -22,12 +22,12 @@ void TAO_EC_Group_Scheduling::schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_QOS_Info event_info; // @@ yuck... filter->push_scheduled_event (ACE_const_cast (RtecEventComm::EventSet&, event), event_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h index dc2eeb96d49..0b7b6f318be 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Group_Scheduling.h @@ -37,11 +37,11 @@ public: virtual void add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Group_Scheduling diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp index 9106c478843..a93cd3cf893 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp @@ -68,10 +68,10 @@ TAO_EC_MT_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventComm::EventSet event_copy = event; - this->push_nocopy (proxy, consumer, event_copy, qos_info TAO_ENV_ARG_PARAMETER); + this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -79,11 +79,11 @@ TAO_EC_MT_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Double checked locking.... if (this->active_ == 0) this->activate (); - this->task_.push (proxy, consumer, event TAO_ENV_ARG_PARAMETER); + this->task_.push (proxy, consumer, event ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h index 97165aecb7b..43d1db1820d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h @@ -52,12 +52,12 @@ public: RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// Use our own thread manager. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp index 627c32801f0..5b9cf65242b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp @@ -45,7 +45,7 @@ TAO_EC_Masked_Type_Filter::size (void) const int TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (event.length () != 1) return 0; @@ -56,7 +56,7 @@ TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event, if (this->parent () != 0) { - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; @@ -65,7 +65,7 @@ TAO_EC_Masked_Type_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (event.length () != 1) return 0; @@ -76,7 +76,7 @@ TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, if (this->parent () != 0) { - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; @@ -85,14 +85,14 @@ TAO_EC_Masked_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Masked_Type_Filter::push (const RtecEventComm::EventSet &, TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Masked_Type_Filter::push_nocopy (RtecEventComm::EventSet &, TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -122,7 +122,7 @@ int TAO_EC_Masked_Type_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h index 6a2b6d12317..d28bb93cdcb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h @@ -53,22 +53,22 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Masked_Type_Filter diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp index bed3ab7655b..eb79fe48cd5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp @@ -41,14 +41,14 @@ TAO_EC_Negation_Filter::size (void) const int TAO_EC_Negation_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int n = - this->child_->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + this->child_->filter (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (this->parent () != 0 && n == 0) { - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; @@ -57,14 +57,14 @@ TAO_EC_Negation_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Negation_Filter::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int n = - this->child_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->child_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (this->parent () != 0 && n == 0) { - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 1; @@ -73,14 +73,14 @@ TAO_EC_Negation_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Negation_Filter::push (const RtecEventComm::EventSet&, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Negation_Filter::push_nocopy (RtecEventComm::EventSet&, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -107,7 +107,7 @@ int TAO_EC_Negation_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h index caee63f3b70..f23700ef739 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h @@ -51,22 +51,22 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Negation_Filter diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp index 5c78bc13fbf..d99b8ae69ea 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.cpp @@ -14,7 +14,7 @@ void TAO_EC_Null_Scheduling::add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *, TAO_EC_ProxyPushConsumer * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -22,7 +22,7 @@ void TAO_EC_Null_Scheduling::schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { for (CORBA::ULong j = 0; j < event.length (); ++j) { @@ -33,7 +33,7 @@ TAO_EC_Null_Scheduling::schedule_event (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info event_info; filter->push_scheduled_event (single_event, event_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h index afcb63f7a0b..6ea335511d0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Scheduling.h @@ -38,11 +38,11 @@ public: virtual void add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Null_Scheduling diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp index 6ea6950d196..777b034a758 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp @@ -25,7 +25,7 @@ TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void) RtecEventChannelAdmin::Observer_Handle TAO_EC_Null_ObserverStrategy::append_observer ( RtecEventChannelAdmin::Observer_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -39,7 +39,7 @@ TAO_EC_Null_ObserverStrategy::append_observer ( void TAO_EC_Null_ObserverStrategy::remove_observer ( RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -50,25 +50,25 @@ TAO_EC_Null_ObserverStrategy::remove_observer ( void TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Null_ObserverStrategy::connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Null_ObserverStrategy::disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -83,7 +83,7 @@ TAO_EC_Basic_ObserverStrategy::~TAO_EC_Basic_ObserverStrategy (void) RtecEventChannelAdmin::Observer_Handle TAO_EC_Basic_ObserverStrategy::append_observer ( RtecEventChannelAdmin::Observer_ptr obs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -106,15 +106,15 @@ TAO_EC_Basic_ObserverStrategy::append_observer ( } RtecEventChannelAdmin::ConsumerQOS c_qos; - this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - obs->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); + obs->update_consumer (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecEventChannelAdmin::SupplierQOS s_qos; - this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); - obs->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); + obs->update_supplier (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->handle_generator_; @@ -124,7 +124,7 @@ TAO_EC_Basic_ObserverStrategy::append_observer ( void TAO_EC_Basic_ObserverStrategy::remove_observer ( RtecEventChannelAdmin::Observer_Handle handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -142,13 +142,13 @@ TAO_EC_Basic_ObserverStrategy::remove_observer ( void TAO_EC_Basic_ObserverStrategy::connected ( TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (consumer->publications ().is_gateway) return; RtecEventChannelAdmin::SupplierQOS s_qos; - this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -176,7 +176,7 @@ TAO_EC_Basic_ObserverStrategy::connected ( for (int i = 0; i != size; ++i) { - copy[i]->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); + copy[i]->update_supplier (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -184,13 +184,13 @@ TAO_EC_Basic_ObserverStrategy::connected ( void TAO_EC_Basic_ObserverStrategy::disconnected ( TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (consumer->publications ().is_gateway) return; RtecEventChannelAdmin::SupplierQOS s_qos; - this->fill_qos (s_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -218,7 +218,7 @@ TAO_EC_Basic_ObserverStrategy::disconnected ( for (int i = 0; i != size; ++i) { - copy[i]->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); + copy[i]->update_supplier (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -226,13 +226,13 @@ TAO_EC_Basic_ObserverStrategy::disconnected ( void TAO_EC_Basic_ObserverStrategy::connected ( TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (supplier->subscriptions ().is_gateway) return; RtecEventChannelAdmin::ConsumerQOS c_qos; - this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -260,7 +260,7 @@ TAO_EC_Basic_ObserverStrategy::connected ( for (int i = 0; i != size; ++i) { - copy[i]->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); + copy[i]->update_consumer (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -268,13 +268,13 @@ TAO_EC_Basic_ObserverStrategy::connected ( void TAO_EC_Basic_ObserverStrategy::disconnected ( TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (supplier->subscriptions ().is_gateway) return; RtecEventChannelAdmin::ConsumerQOS c_qos; - this->fill_qos (c_qos TAO_ENV_ARG_PARAMETER); + this->fill_qos (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; int size = 0; @@ -302,7 +302,7 @@ TAO_EC_Basic_ObserverStrategy::disconnected ( for (int i = 0; i != size; ++i) { - copy[i]->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); + copy[i]->update_consumer (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -310,12 +310,12 @@ TAO_EC_Basic_ObserverStrategy::disconnected ( void TAO_EC_Basic_ObserverStrategy::fill_qos ( RtecEventChannelAdmin::ConsumerQOS &qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Headers headers; TAO_EC_Accumulate_Supplier_Headers worker (headers); - this->event_channel_->consumer_admin ()->for_each (&worker TAO_ENV_ARG_PARAMETER); + this->event_channel_->consumer_admin ()->for_each (&worker ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::DependencySet& dep = qos.dependencies; @@ -337,13 +337,13 @@ TAO_EC_Basic_ObserverStrategy::fill_qos ( void TAO_EC_Basic_ObserverStrategy::fill_qos ( RtecEventChannelAdmin::SupplierQOS &qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Headers headers; TAO_EC_Accumulate_Consumer_Headers worker (headers); this->event_channel_->supplier_admin ()->for_each (&worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; qos.publications.length (headers.current_size ()); @@ -359,7 +359,7 @@ TAO_EC_Basic_ObserverStrategy::fill_qos ( void TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { const RtecEventChannelAdmin::ConsumerQOS& sub = supplier->subscriptions (); @@ -381,7 +381,7 @@ TAO_EC_Accumulate_Supplier_Headers::work (TAO_EC_ProxyPushSupplier *supplier void TAO_EC_Accumulate_Consumer_Headers::work (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { const RtecEventChannelAdmin::SupplierQOS& pub = consumer->publications (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h index 1949b1047e9..c36f80e24a0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h @@ -55,7 +55,7 @@ public: /// The basic methods to support the EC strategies. virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -63,7 +63,7 @@ public: = 0; virtual void remove_observer ( RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -73,16 +73,16 @@ public: /// Used by the EC to inform the ObserverStrategy that a Consumer has /// connected or disconnected from it. virtual void connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; virtual void disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; /// Used by the EC to inform the ObserverStrategy that a Consumer has /// connected or disconnected from it. virtual void connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; virtual void disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) = 0; + ACE_ENV_ARG_DECL_NOT_USED) = 0; }; // **************************************************************** @@ -104,26 +104,26 @@ public: // = The TAO_EC_ObserverStrategy methods. virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); virtual void remove_observer ( RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)); virtual void connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); }; // **************************************************************** @@ -156,26 +156,26 @@ public: // = The TAO_EC_ObserverStrategy methods. virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); virtual void remove_observer ( RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)); virtual void connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); struct Observer_Entry @@ -223,9 +223,9 @@ public: protected: /// Helper functions to compute the consumer and supplier QOS. void fill_qos (RtecEventChannelAdmin::ConsumerQOS &qos - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void fill_qos (RtecEventChannelAdmin::SupplierQOS &qos - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); protected: /// The event channel. @@ -251,7 +251,7 @@ public: TAO_EC_Accumulate_Supplier_Headers (TAO_EC_Basic_ObserverStrategy::Headers &headers); virtual void work (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: TAO_EC_Basic_ObserverStrategy::Headers &headers_; @@ -266,7 +266,7 @@ public: TAO_EC_Accumulate_Consumer_Headers (TAO_EC_Basic_ObserverStrategy::Headers &headers); virtual void work (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: TAO_EC_Basic_ObserverStrategy::Headers &headers_; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp index 59415cd120a..2b7fa9d3bba 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp @@ -60,7 +60,7 @@ TAO_EC_Per_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer* consumer) ACE_TRY_NEW_ENV { - this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -72,7 +72,7 @@ TAO_EC_Per_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer* consumer) void TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -98,7 +98,7 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier #if TAO_EC_ENABLE_DEBUG_MESSAGES ACE_DEBUG ((LM_DEBUG, " matched\n")); #endif /* TAO_EC_ENABLED_DEBUG_MESSAGES */ - this->collection_->connected (supplier TAO_ENV_ARG_PARAMETER); + this->collection_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; return; } @@ -110,7 +110,7 @@ TAO_EC_Per_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* supplier void TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -131,47 +131,47 @@ TAO_EC_Per_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* supplier if (supplier->can_match (event.header)) { // ACE_DEBUG ((LM_DEBUG, " matched %x\n", supplier)); - this->collection_->connected (supplier TAO_ENV_ARG_PARAMETER); + this->collection_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; return; } } - this->collection_->disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->collection_->disconnected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_EC_Per_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->collection_->disconnected (supplier TAO_ENV_ARG_PARAMETER); + this->collection_->disconnected (supplier ACE_ENV_ARG_PARAMETER); } void -TAO_EC_Per_Supplier_Filter::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Per_Supplier_Filter::shutdown (ACE_ENV_SINGLE_ARG_DECL) { - this->collection_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->collection_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); } void TAO_EC_Per_Supplier_Filter::push (const RtecEventComm::EventSet& event, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Scheduling_Strategy* scheduling_strategy = this->event_channel_->scheduling_strategy (); scheduling_strategy->schedule_event (event, consumer, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_EC_Per_Supplier_Filter::push_scheduled_event (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Filter_Worker worker (event, event_info); - this->collection_->for_each (&worker TAO_ENV_ARG_PARAMETER); + this->collection_->for_each (&worker ACE_ENV_ARG_PARAMETER); } CORBA::ULong diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h index 3c66a711b74..cc6d6f8f785 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.h @@ -51,18 +51,18 @@ public: virtual void bind (TAO_EC_ProxyPushConsumer* consumer); virtual void unbind (TAO_EC_ProxyPushConsumer* consumer); virtual void connected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void push_scheduled_event (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual CORBA::ULong _decr_refcnt (void); virtual CORBA::ULong _incr_refcnt (void); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp index 4a4296b9e19..ed97744f809 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp @@ -25,7 +25,7 @@ TAO_EC_Filter* TAO_EC_Prefix_Filter_Builder::build ( TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL_NOT_USED) const + ACE_ENV_ARG_DECL_NOT_USED) const { CORBA::ULong pos = 0; return this->recursive_build (supplier, qos, pos); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h index 9622fb15350..8532908b13b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h @@ -46,7 +46,7 @@ public: // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; private: /// Recursively build the filter tree. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp index 6f31edc67ae..2d7a359b555 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.cpp @@ -40,7 +40,7 @@ TAO_EC_Priority_Dispatching::activate (void) ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, priority); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; for (int i = 0; i < this->ntasks_; ++i) { ACE_TRY @@ -51,7 +51,7 @@ TAO_EC_Priority_Dispatching::activate (void) ACE_OS::sprintf (buf, "Dispatching_Task-%d.us", period); RtecScheduler::handle_t rt_info = - this->scheduler_->create (buf TAO_ENV_ARG_PARAMETER); + this->scheduler_->create (buf ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->scheduler_->set (rt_info, @@ -64,7 +64,7 @@ TAO_EC_Priority_Dispatching::activate (void) 0, // quantum 1, // threads RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -113,10 +113,10 @@ TAO_EC_Priority_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventComm::EventSet event_copy = event; - this->push_nocopy (proxy, consumer, event_copy, qos_info TAO_ENV_ARG_PARAMETER); + this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -124,7 +124,7 @@ TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->tasks_ == 0) this->activate (); @@ -137,5 +137,5 @@ TAO_EC_Priority_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, } - this->tasks_[i]->push (proxy, consumer, event TAO_ENV_ARG_PARAMETER); + this->tasks_[i]->push (proxy, consumer, event ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h index f8b78ed2c78..ab0b8acf7e0 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h @@ -60,12 +60,12 @@ public: RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// Use our own thread manager. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp index 68aab6c9f9c..d57458dac62 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp @@ -20,7 +20,7 @@ void TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_DEBUG ((LM_DEBUG, "add_proxy_supplier_dependencies - %x %x\n", supplier, consumer)); @@ -40,11 +40,11 @@ TAO_EC_Priority_Scheduling::add_proxy_supplier_dependencies ( os_priority, p_subpriority, p_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; qos_info.preemption_priority = p_priority; - supplier->add_dependencies (header, qos_info TAO_ENV_ARG_PARAMETER); + supplier->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -53,7 +53,7 @@ void TAO_EC_Priority_Scheduling::schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierQOS qos = consumer->publications (); @@ -84,13 +84,13 @@ TAO_EC_Priority_Scheduling::schedule_event (const RtecEventComm::EventSet &event os_priority, p_subpriority, p_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; qos_info.preemption_priority = p_priority; } filter->push_scheduled_event (single_event, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h index 1bce35148a8..c0ac5d9668d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h @@ -45,11 +45,11 @@ public: virtual void add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Priority_Scheduling @@ -58,7 +58,7 @@ private: (const TAO_EC_Priority_Scheduling&)) /// Initialize our RT_Info handle and dependencies - void init_rt_info (TAO_ENV_SINGLE_ARG_DECL); + void init_rt_info (ACE_ENV_SINGLE_ARG_DECL); private: /// The scheduler we are going to use diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp index e8ac866557a..15c63c16b4c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp @@ -39,7 +39,7 @@ TAO_EC_ProxyPushConsumer::~TAO_EC_ProxyPushConsumer (void) CORBA::Boolean TAO_EC_ProxyPushConsumer::supplier_non_existent ( CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Object_var supplier; { @@ -62,7 +62,7 @@ TAO_EC_ProxyPushConsumer::supplier_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return supplier->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return supplier->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -70,7 +70,7 @@ TAO_EC_ProxyPushConsumer::supplier_non_existent ( void TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_, this->refcount_, @@ -79,12 +79,12 @@ TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushSupplier* supplier if (!ace_mon.locked ()) return; - ace_mon.filter->connected (supplier TAO_ENV_ARG_PARAMETER); + ace_mon.filter->connected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_, this->refcount_, @@ -93,12 +93,12 @@ TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushSupplier* supplier if (!ace_mon.locked ()) return; - ace_mon.filter->reconnected (supplier TAO_ENV_ARG_PARAMETER); + ace_mon.filter->reconnected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_, this->refcount_, @@ -107,29 +107,29 @@ TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushSupplier* supplier if (!ace_mon.locked ()) return; - ace_mon.filter->disconnected (supplier TAO_ENV_ARG_PARAMETER); + ace_mon.filter->disconnected (supplier ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushConsumer::connected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_ProxyPushConsumer::reconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_ProxyPushConsumer::disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL) { RtecEventComm::PushSupplier_var supplier; @@ -144,14 +144,14 @@ TAO_EC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) if (this->filter_ != 0) { - this->filter_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->filter_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->cleanup_i (); } } - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (supplier.in ())) @@ -159,7 +159,7 @@ TAO_EC_ProxyPushConsumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -186,14 +186,14 @@ TAO_EC_ProxyPushConsumer::cleanup_i (void) } RtecEventChannelAdmin::ProxyPushConsumer_ptr -TAO_EC_ProxyPushConsumer::activate (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushConsumer::activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushConsumer_var result; ACE_TRY { result = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -205,17 +205,17 @@ TAO_EC_ProxyPushConsumer::activate (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_EC_ProxyPushConsumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushConsumer::deactivate (ACE_ENV_SINGLE_ARG_DECL) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -254,7 +254,7 @@ void TAO_EC_ProxyPushConsumer::connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected)) { @@ -285,7 +285,7 @@ TAO_EC_ProxyPushConsumer::connect_push_supplier ( // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); ACE_CHECK; - this->event_channel_->reconnected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -311,12 +311,12 @@ TAO_EC_ProxyPushConsumer::connect_push_supplier ( } // Notify the event channel... - this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_EC_ProxyPushConsumer_Guard ace_mon (this->lock_, @@ -328,13 +328,13 @@ TAO_EC_ProxyPushConsumer::push (const RtecEventComm::EventSet& event // No need to keep the lock, the filter_ class is supposed to be // thread safe.... - ace_mon.filter->push (event, this TAO_ENV_ARG_PARAMETER); + ace_mon.filter->push (event, this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_EC_ProxyPushConsumer::disconnect_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventComm::PushSupplier_var supplier; @@ -356,7 +356,7 @@ TAO_EC_ProxyPushConsumer::disconnect_push_consumer ( } // Notify the event channel... - this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (supplier.in ())) @@ -368,7 +368,7 @@ TAO_EC_ProxyPushConsumer::disconnect_push_consumer ( { ACE_TRY { - supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -381,19 +381,19 @@ TAO_EC_ProxyPushConsumer::disconnect_push_consumer ( } PortableServer::POA_ptr -TAO_EC_ProxyPushConsumer::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ProxyPushConsumer::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_EC_ProxyPushConsumer::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ProxyPushConsumer::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_EC_ProxyPushConsumer::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ProxyPushConsumer::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h index 902912a2183..10159ac8bd6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.h @@ -62,10 +62,10 @@ public: virtual ~TAO_EC_ProxyPushConsumer (void); /// Activate in the POA - virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - void deactivate (TAO_ENV_SINGLE_ARG_DECL); + void deactivate (ACE_ENV_SINGLE_ARG_DECL); /// Return 0 if no supplier is connected... CORBA::Boolean is_connected (void) const; @@ -83,28 +83,28 @@ public: * <disconnected> flag. */ CORBA::Boolean supplier_non_existent (CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Concrete implementations can use this methods to keep track of /// the consumers interested in this events. virtual void connected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Usually implemented as no-ops, but some configurations may /// require this methods. virtual void connected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// The event channel is shutting down - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); /// The QoS (subscription) used to connect to the EC, assumes the /// locks are held, use with care! @@ -118,19 +118,19 @@ public: virtual void connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected)); virtual void push (const RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); - virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); protected: /// Set the supplier, used by some implementations to change the diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp index 6ceb4cf2028..be322c6c6a7 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp @@ -39,54 +39,54 @@ TAO_EC_ProxyPushSupplier::~TAO_EC_ProxyPushSupplier (void) void TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Scheduling_Strategy *s = this->event_channel_->scheduling_strategy (); s->add_proxy_supplier_dependencies (this, consumer - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushConsumer* consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Scheduling_Strategy *s = this->event_channel_->scheduling_strategy (); s->add_proxy_supplier_dependencies (this, consumer - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushConsumer* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_ProxyPushSupplier::connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_ProxyPushSupplier::reconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_ProxyPushSupplier::disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushSupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL) { // Save the consumer we where connected to, we need to send a // disconnect message to it. @@ -106,7 +106,7 @@ TAO_EC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) this->cleanup_i (); } - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (consumer.in ())) @@ -114,7 +114,7 @@ TAO_EC_ProxyPushSupplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -138,14 +138,14 @@ TAO_EC_ProxyPushSupplier::cleanup_i (void) } RtecEventChannelAdmin::ProxyPushSupplier_ptr -TAO_EC_ProxyPushSupplier::activate (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushSupplier::activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushSupplier_var result; ACE_TRY { result = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -157,17 +157,17 @@ TAO_EC_ProxyPushSupplier::activate (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_EC_ProxyPushSupplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (()) +TAO_EC_ProxyPushSupplier::deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (()) { ACE_TRY { PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -206,7 +206,7 @@ void TAO_EC_ProxyPushSupplier::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected, RtecEventChannelAdmin::TypeError)) @@ -236,7 +236,7 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer ( this->child_ = this->event_channel_->filter_builder ()->build (this, this->qos_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->adopt_child (this->child_); @@ -250,7 +250,7 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer ( // @@ RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR ()); ACE_CHECK; - this->event_channel_->reconnected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->reconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -272,19 +272,19 @@ TAO_EC_ProxyPushSupplier::connect_push_consumer ( this->child_ = this->event_channel_->filter_builder ()->build (this, this->qos_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->adopt_child (this->child_); } // Notify the event channel... - this->event_channel_->connected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->connected (this ACE_ENV_ARG_PARAMETER); } void TAO_EC_ProxyPushSupplier::disconnect_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventComm::PushConsumer_var consumer; @@ -305,7 +305,7 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier ( } // Notify the event channel.... - this->event_channel_->disconnected (this TAO_ENV_ARG_PARAMETER); + this->event_channel_->disconnected (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!connected) @@ -317,7 +317,7 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier ( { ACE_TRY { - consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -332,7 +332,7 @@ TAO_EC_ProxyPushSupplier::disconnect_push_supplier ( } void -TAO_EC_ProxyPushSupplier::suspend_connection (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushSupplier::suspend_connection (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX ( @@ -345,7 +345,7 @@ TAO_EC_ProxyPushSupplier::suspend_connection (TAO_ENV_SINGLE_ARG_DECL) } void -TAO_EC_ProxyPushSupplier::resume_connection (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_ProxyPushSupplier::resume_connection (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD_THROW_EX ( @@ -362,7 +362,7 @@ typedef TAO_ESF_Proxy_RefCount_Guard<TAO_EC_Event_Channel,TAO_EC_ProxyPushSuppli int TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Destroy_Guard auto_destroy (this->refcount_, this->event_channel_, @@ -379,7 +379,7 @@ TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event, return 0; result = - this->child_->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + this->child_->filter (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return result; @@ -388,7 +388,7 @@ TAO_EC_ProxyPushSupplier::filter (const RtecEventComm::EventSet& event, int TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { Destroy_Guard auto_destroy (this->refcount_, this->event_channel_, @@ -405,7 +405,7 @@ TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event, return 0; result = - this->child_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->child_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return result; @@ -414,7 +414,7 @@ TAO_EC_ProxyPushSupplier::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // The mutex is already held by the caller (usually the filter() // method) @@ -450,7 +450,7 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event, consumer.in (), event, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -461,7 +461,7 @@ TAO_EC_ProxyPushSupplier::push (const RtecEventComm::EventSet& event, void TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // The mutex is already held by the caller (usually the filter() // method) @@ -496,7 +496,7 @@ TAO_EC_ProxyPushSupplier::push_nocopy (RtecEventComm::EventSet& event, consumer.in (), event, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -508,7 +508,7 @@ void TAO_EC_ProxyPushSupplier::push_to_consumer ( RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { { ACE_GUARD_THROW_EX ( @@ -525,7 +525,7 @@ TAO_EC_ProxyPushSupplier::push_to_consumer ( ACE_TRY { - consumer->push (event TAO_ENV_ARG_PARAMETER); + consumer->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used) @@ -542,7 +542,7 @@ TAO_EC_ProxyPushSupplier::push_to_consumer ( TAO_EC_ConsumerControl *control = this->event_channel_->consumer_control (); - control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER); + control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -562,7 +562,7 @@ TAO_EC_ProxyPushSupplier::push_to_consumer ( control->system_exception (this, sysex - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -577,11 +577,11 @@ void TAO_EC_ProxyPushSupplier::reactive_push_to_consumer ( RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { - consumer->push (event TAO_ENV_ARG_PARAMETER); + consumer->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, not_used) @@ -589,7 +589,7 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer ( TAO_EC_ConsumerControl *control = this->event_channel_->consumer_control (); - control->consumer_not_exist (this TAO_ENV_ARG_PARAMETER); + control->consumer_not_exist (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } ACE_CATCH (CORBA::SystemException, sysex) @@ -599,7 +599,7 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer ( control->system_exception (this, sysex - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } ACE_CATCHANY @@ -612,7 +612,7 @@ TAO_EC_ProxyPushSupplier::reactive_push_to_consumer ( CORBA::Boolean TAO_EC_ProxyPushSupplier::consumer_non_existent ( CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Object_var consumer; { @@ -632,7 +632,7 @@ TAO_EC_ProxyPushSupplier::consumer_non_existent ( } #if (TAO_HAS_MINIMUM_CORBA == 0) - return consumer->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER); + return consumer->_non_existent (ACE_ENV_SINGLE_ARG_PARAMETER); #else return 0; #endif /* TAO_HAS_MINIMUM_CORBA */ @@ -670,7 +670,7 @@ int TAO_EC_ProxyPushSupplier::add_dependencies ( const RtecEventComm::EventHeader &header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD_THROW_EX ( ACE_Lock, ace_mon, *this->lock_, @@ -679,23 +679,23 @@ TAO_EC_ProxyPushSupplier::add_dependencies ( return this->child_->add_dependencies (header, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_EC_ProxyPushSupplier::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ProxyPushSupplier::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } void -TAO_EC_ProxyPushSupplier::_add_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ProxyPushSupplier::_add_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_incr_refcnt (); } void -TAO_EC_ProxyPushSupplier::_remove_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_ProxyPushSupplier::_remove_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { this->_decr_refcnt (); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h index 7a74c6c5c83..13c6b12a2d5 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.h @@ -62,10 +62,10 @@ public: virtual ~TAO_EC_ProxyPushSupplier (void); /// Activate in the POA - virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr activate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); + virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr activate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); /// Deactivate from the POA - virtual void deactivate (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (()); + virtual void deactivate (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (()); /// Return 0 if no consumer is connected... CORBA::Boolean is_connected (void) const; @@ -85,32 +85,32 @@ public: /// Concrete implementations can use this methods to keep track of /// the suppliers that publish its events. virtual void connected (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Usually implemented as no-ops, but some configurations may /// require this methods. virtual void connected (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// The event channel is shutting down - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); /// Pushes to the consumer, verifies that it is connected and that it /// is not suspended. void push_to_consumer (RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void reactive_push_to_consumer (RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /** * Invoke the _non_existent() pseudo-operation on the consumer. If @@ -118,21 +118,21 @@ public: * <disconnected> flag. */ CORBA::Boolean consumer_non_existent (CORBA::Boolean_out disconnected - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // = The RtecEventChannelAdmin::ProxyPushSupplier methods... virtual void connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected, RtecEventChannelAdmin::TypeError)); - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void resume_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); /// Increment and decrement the reference count. @@ -142,27 +142,27 @@ public: // = The TAO_EC_Filter methods, only push() is implemented... virtual int filter (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader &header) const; virtual int add_dependencies (const RtecEventComm::EventHeader &header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // = The Servant methods - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); - virtual void _add_ref (TAO_ENV_SINGLE_ARG_DECL); - virtual void _remove_ref (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); + virtual void _add_ref (ACE_ENV_SINGLE_ARG_DECL); + virtual void _remove_ref (ACE_ENV_SINGLE_ARG_DECL); protected: /// Set the consumer, used by some implementations to change the diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp index 8599a2632bc..7ab7c5e6e20 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp @@ -72,10 +72,10 @@ TAO_EC_RTCORBA_Dispatching::push (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventComm::EventSet event_copy = event; - this->push_nocopy (proxy, consumer, event_copy, qos_info TAO_ENV_ARG_PARAMETER); + this->push_nocopy (proxy, consumer, event_copy, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -83,10 +83,10 @@ TAO_EC_RTCORBA_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RTCORBA::Priority current_priority = - this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER); + this->current_->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (CORBA::ULong i = 0; i != this->lanes_.length (); ++i) @@ -98,7 +98,7 @@ TAO_EC_RTCORBA_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, // some... this->tasks_[i].push (proxy, consumer, event - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; break; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h index ab75cb13e33..e5d4508c2b6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.h @@ -51,12 +51,12 @@ public: RtecEventComm::PushConsumer_ptr consumer, const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (TAO_EC_ProxyPushSupplier* proxy, RtecEventComm::PushConsumer_ptr consumer, RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// The thread pools... diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp index ffeaf1d754f..28e88b335ec 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp @@ -49,17 +49,17 @@ TAO_EC_RTCORBA_Factory::create_dispatching (TAO_EC_Event_Channel *) int argc = 0; CORBA::ORB_var orb = CORBA::ORB_init (argc, 0, "" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - + CORBA::Object_var obj = orb->resolve_initial_references ("PriorityMappingManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityMappingManager_var priority_mapping_manager = RTCORBA::PriorityMappingManager::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RTCORBA::PriorityMapping *priority_mapping = @@ -67,10 +67,10 @@ TAO_EC_RTCORBA_Factory::create_dispatching (TAO_EC_Event_Channel *) obj = orb->resolve_initial_references ("RTCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); RTCORBA::Current_var current = RTCORBA::Current::_narrow (obj.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_NEW_RETURN (dispatching, diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp index f7e4467928a..659e6f0250b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.cpp @@ -36,11 +36,11 @@ TAO_EC_Reactive_ConsumerControl::~TAO_EC_Reactive_ConsumerControl (void) void TAO_EC_Reactive_ConsumerControl::query_consumers ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) { TAO_EC_Ping_Consumer worker (this); this->event_channel_->consumer_admin ()->for_each (&worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -56,26 +56,26 @@ TAO_EC_Reactive_ConsumerControl::handle_timeout ( CORBA::PolicyTypeSeq types; CORBA::PolicyList_var policies = this->policy_current_->get_policy_overrides (types - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Query the state of the consumers... - this->query_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->query_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -102,12 +102,12 @@ TAO_EC_Reactive_ConsumerControl::activate (void) // Get the PolicyCurrent object CORBA::Object_var tmp = this->orb_->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_ = CORBA::PolicyCurrent::_narrow (tmp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout @@ -122,7 +122,7 @@ TAO_EC_Reactive_ConsumerControl::activate (void) this->orb_->create_policy ( Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -145,14 +145,14 @@ TAO_EC_Reactive_ConsumerControl::shutdown (void) void TAO_EC_Reactive_ConsumerControl::consumer_not_exist ( TAO_EC_ProxyPushSupplier *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { //ACE_DEBUG ((LM_DEBUG, // "EC_Reactive_ConsumerControl(%P|%t) - " // "Consumer %x does not exists\n", long(proxy))); - proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -168,7 +168,7 @@ void TAO_EC_Reactive_ConsumerControl::system_exception ( TAO_EC_ProxyPushSupplier *proxy, CORBA::SystemException & /* exception */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -182,7 +182,7 @@ TAO_EC_Reactive_ConsumerControl::system_exception ( // return; // Anything else is serious, including timeouts... - proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -213,24 +213,24 @@ TAO_EC_ConsumerControl_Adapter::handle_timeout ( void TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = supplier->consumer_non_existent (disconnected - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) @@ -238,7 +238,7 @@ TAO_EC_Ping_Consumer::work (TAO_EC_ProxyPushSupplier *supplier // This is TAO's minor code for a failed connection, we may // want to be more lenient in the future.. // if (transient.minor () == 0x54410085) - this->control_->consumer_not_exist (supplier TAO_ENV_ARG_PARAMETER); + this->control_->consumer_not_exist (supplier ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h index eddff6b86c9..7c363bf9876 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.h @@ -81,15 +81,15 @@ public: virtual int activate (void); virtual int shutdown (void); virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void system_exception (TAO_EC_ProxyPushSupplier *proxy, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); private: /// Check if the consumers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. - void query_consumers (TAO_ENV_SINGLE_ARG_DECL); + void query_consumers (ACE_ENV_SINGLE_ARG_DECL); private: /// The polling rate @@ -122,7 +122,7 @@ public: TAO_EC_Ping_Consumer (TAO_EC_ConsumerControl *control); virtual void work (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: TAO_EC_ConsumerControl *control_; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp index 4104bcca997..bfb106ef3e3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.cpp @@ -36,11 +36,11 @@ TAO_EC_Reactive_SupplierControl::~TAO_EC_Reactive_SupplierControl (void) void TAO_EC_Reactive_SupplierControl::query_suppliers ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) { TAO_EC_Ping_Supplier worker (this); this->event_channel_->supplier_admin ()->for_each (&worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -56,26 +56,26 @@ TAO_EC_Reactive_SupplierControl::handle_timeout ( CORBA::PolicyTypeSeq types; CORBA::PolicyList_var policies = this->policy_current_->get_policy_overrides (types - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Change the timeout this->policy_current_->set_policy_overrides (this->policy_list_, CORBA::ADD_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Query the state of the suppliers... - this->query_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->query_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_->set_policy_overrides (policies.in (), CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; for (CORBA::ULong i = 0; i != policies->length (); ++i) { - policies[i]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -102,12 +102,12 @@ TAO_EC_Reactive_SupplierControl::activate (void) // Get the PolicyCurrent object CORBA::Object_var tmp = this->orb_->resolve_initial_references ("PolicyCurrent" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->policy_current_ = CORBA::PolicyCurrent::_narrow (tmp.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Pre-compute the policy list to the set the right timeout @@ -122,7 +122,7 @@ TAO_EC_Reactive_SupplierControl::activate (void) this->orb_->create_policy ( Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -145,14 +145,14 @@ TAO_EC_Reactive_SupplierControl::shutdown (void) void TAO_EC_Reactive_SupplierControl::supplier_not_exist ( TAO_EC_ProxyPushConsumer *proxy - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { //ACE_DEBUG ((LM_DEBUG, // "EC_Reactive_SupplierControl(%P|%t) - " // "Consumer %x does not exists\n", long(proxy))); - proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -166,7 +166,7 @@ void TAO_EC_Reactive_SupplierControl::system_exception ( TAO_EC_ProxyPushConsumer *proxy, CORBA::SystemException & /* exception */ - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { @@ -180,7 +180,7 @@ TAO_EC_Reactive_SupplierControl::system_exception ( // return; // Anything else is serious, including timeouts... - proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -211,24 +211,24 @@ TAO_EC_SupplierControl_Adapter::handle_timeout ( void TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TRY { CORBA::Boolean disconnected; CORBA::Boolean non_existent = consumer->supplier_non_existent (disconnected - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (non_existent && !disconnected) { - this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } } ACE_CATCH (CORBA::OBJECT_NOT_EXIST, ex) { - this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::TRANSIENT, transient) @@ -236,7 +236,7 @@ TAO_EC_Ping_Supplier::work (TAO_EC_ProxyPushConsumer *consumer // This is TAO's minor code for a failed connection, we may // want to be more lenient in the future.. // if (transient.minor () == 0x54410085) - this->control_->supplier_not_exist (consumer TAO_ENV_ARG_PARAMETER); + this->control_->supplier_not_exist (consumer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h index ef97e4677df..3eafb702595 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h @@ -81,15 +81,15 @@ public: virtual int activate (void); virtual int shutdown (void); virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void system_exception (TAO_EC_ProxyPushConsumer *proxy, CORBA::SystemException & - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); private: /// Check if the suppliers still exists. It is a helper method for /// handle_timeout() to isolate the exceptions. - void query_suppliers (TAO_ENV_SINGLE_ARG_DECL); + void query_suppliers (ACE_ENV_SINGLE_ARG_DECL); private: /// The polling rate @@ -122,7 +122,7 @@ public: TAO_EC_Ping_Supplier (TAO_EC_SupplierControl *control); virtual void work (TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: TAO_EC_SupplierControl *control_; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp index 6306943ef3f..7391d41bd8c 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp @@ -56,25 +56,25 @@ TAO_EC_Sched_Filter::size (void) const int TAO_EC_Sched_Filter::filter (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - return this->body_->filter (event, qos_info TAO_ENV_ARG_PARAMETER); + return this->body_->filter (event, qos_info ACE_ENV_ARG_PARAMETER); } int TAO_EC_Sched_Filter::filter_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - return this->body_->filter_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + return this->body_->filter_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); } // This is private, so we can make it inline in the .cpp file... void TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER); + this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; qos_info.rt_info = this->rt_info_; @@ -94,7 +94,7 @@ TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info os_priority, p_subpriority, p_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; qos_info.preemption_priority = p_priority; } @@ -104,14 +104,14 @@ TAO_EC_Sched_Filter::compute_qos_info (TAO_EC_QOS_Info& qos_info void TAO_EC_Sched_Filter::push (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) { - this->compute_qos_info (qos_info TAO_ENV_ARG_PARAMETER); + this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -119,14 +119,14 @@ TAO_EC_Sched_Filter::push (const RtecEventComm::EventSet &event, void TAO_EC_Sched_Filter::push_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) { - this->compute_qos_info (qos_info TAO_ENV_ARG_PARAMETER); + this->compute_qos_info (qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -152,25 +152,25 @@ TAO_EC_Sched_Filter::can_match (const RtecEventComm::EventHeader& header) const int TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER); + this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); int matches = this->body_->add_dependencies (header, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (matches != 0) { this->scheduler_->add_dependency (this->rt_info_, qos_info.rt_info, 1, RtecBase::TWO_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecScheduler::RT_Info_var info = - this->scheduler_->get (qos_info.rt_info TAO_ENV_ARG_PARAMETER); + this->scheduler_->get (qos_info.rt_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", this->name_.c_str (), @@ -180,7 +180,7 @@ TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header, ChildrenIterator end = this->end (); for (ChildrenIterator i = this->begin (); i != end; ++i) { - (*i)->add_dependencies (header, qos_info TAO_ENV_ARG_PARAMETER); + (*i)->add_dependencies (header, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } return 0; @@ -188,16 +188,16 @@ TAO_EC_Sched_Filter::add_dependencies (const RtecEventComm::EventHeader& header, void TAO_EC_Sched_Filter::get_qos_info (TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->init_rt_info (TAO_ENV_SINGLE_ARG_PARAMETER); + this->init_rt_info (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; qos_info.rt_info = this->rt_info_; } void -TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_Sched_Filter::init_rt_info (ACE_ENV_SINGLE_ARG_DECL) { if (this->rt_info_computed_) return; @@ -214,7 +214,7 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) 0, // quantum 0, // threads this->info_type_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; #if 0 @@ -224,17 +224,17 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) TAO_EC_Filter* filter = *i; TAO_EC_QOS_Info child; - filter->get_qos_info (child TAO_ENV_ARG_PARAMETER); + filter->get_qos_info (child ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->scheduler_->add_dependency (this->rt_info_, child.rt_info, 1, RtecBase::TWO_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::RT_Info_var info = - this->scheduler_->get (child.rt_info TAO_ENV_ARG_PARAMETER); + this->scheduler_->get (child.rt_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", info->entry_point.in (), @@ -250,11 +250,11 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) this->body_info_, 1, RtecBase::TWO_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::RT_Info_var info = - this->scheduler_->get (this->body_info_ TAO_ENV_ARG_PARAMETER); + this->scheduler_->get (this->body_info_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", info->entry_point.in (), @@ -267,11 +267,11 @@ TAO_EC_Sched_Filter::init_rt_info (TAO_ENV_SINGLE_ARG_DECL) this->rt_info_, 1, RtecBase::TWO_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecScheduler::RT_Info_var info = - this->scheduler_->get (this->parent_info_ TAO_ENV_ARG_PARAMETER); + this->scheduler_->get (this->parent_info_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "[%s] ----> [%s]\n", this->name_.c_str (), diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h index 69accbb1460..79c214263cf 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.h @@ -64,24 +64,24 @@ public: virtual int size (void) const; virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void get_qos_info (TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Sched_Filter @@ -90,11 +90,11 @@ private: (const TAO_EC_Sched_Filter&)) /// Initialize our RT_Info handle and dependencies - void init_rt_info (TAO_ENV_SINGLE_ARG_DECL); + void init_rt_info (ACE_ENV_SINGLE_ARG_DECL); /// Compute a new qos_info to push up. void compute_qos_info (TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// The RT_Info handle for this object diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp index 5f81a9b265a..593fdc01afd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp @@ -23,25 +23,25 @@ TAO_EC_Filter* TAO_EC_Sched_Filter_Builder::build ( TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { CORBA::ULong pos = 0; CORBA::Object_var tmp = this->event_channel_->scheduler (); RtecScheduler::Scheduler_var scheduler = - RtecScheduler::Scheduler::_narrow (tmp.in () TAO_ENV_ARG_PARAMETER); + RtecScheduler::Scheduler::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // @@ How do we figure out which parent??? RtecScheduler::handle_t parent_info = - scheduler->lookup ("Dispatching_Task-250000.us" TAO_ENV_ARG_PARAMETER); + scheduler->lookup ("Dispatching_Task-250000.us" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return this->recursive_build (supplier, qos, pos, scheduler.in (), parent_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } TAO_EC_Filter* @@ -51,7 +51,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( CORBA::ULong& pos, RtecScheduler::Scheduler_ptr scheduler, RtecScheduler::handle_t parent_info - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { const RtecEventComm::Event& e = qos.dependencies[pos].event; @@ -61,11 +61,11 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( ACE_CString name; this->recursive_name (qos, npos, scheduler, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecScheduler::handle_t rt_info = - scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER); + scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); pos++; // Consume the designator @@ -78,7 +78,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( children[i] = this->recursive_build (supplier, qos, pos, scheduler, rt_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -94,7 +94,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( RtecScheduler::CONJUNCTION), 0); TAO_EC_QOS_Info qos_info; - filter->get_qos_info (qos_info TAO_ENV_ARG_PARAMETER); + filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER); // @@ ACE_CHECK_RETURN (0); return filter; @@ -106,11 +106,11 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( ACE_CString name; this->recursive_name (qos, npos, scheduler, name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecScheduler::handle_t rt_info = - scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER); + scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); pos++; // Consume the designator @@ -123,7 +123,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( children[i] = this->recursive_build (supplier, qos, pos, scheduler, rt_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } TAO_EC_Sched_Filter *filter; @@ -139,7 +139,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( 0); TAO_EC_QOS_Info qos_info; - filter->get_qos_info (qos_info TAO_ENV_ARG_PARAMETER); + filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER); // @@ ACE_CHECK_RETURN (0); return filter; @@ -161,7 +161,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( TAO_EC_QOS_Info qos_info; qos_info.rt_info = - scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER); + scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // Convert the time to the proper units.... @@ -179,14 +179,14 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( 0, // quantum 1, // threads RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); scheduler->add_dependency (qos_info.rt_info, parent_info, 1, RtecBase::TWO_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return new TAO_EC_Timeout_Filter (this->event_channel_, @@ -199,14 +199,14 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( RtecScheduler::handle_t body_info = qos.dependencies[pos].rt_info; RtecScheduler::RT_Info_var info = - scheduler->get (body_info TAO_ENV_ARG_PARAMETER); + scheduler->get (body_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_CString name = info->entry_point.in (); name += "#rep"; RtecScheduler::handle_t rt_info = - scheduler->create (name.c_str () TAO_ENV_ARG_PARAMETER); + scheduler->create (name.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); pos++; @@ -222,7 +222,7 @@ TAO_EC_Sched_Filter_Builder::recursive_build ( 0); TAO_EC_QOS_Info qos_info; - filter->get_qos_info (qos_info TAO_ENV_ARG_PARAMETER); + filter->get_qos_info (qos_info ACE_ENV_ARG_PARAMETER); // @@ ACE_CHECK_RETURN (0); return filter; @@ -234,7 +234,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name ( CORBA::ULong& pos, RtecScheduler::Scheduler_ptr scheduler, ACE_CString& name - TAO_ENV_ARG_DECL) const + ACE_ENV_ARG_DECL) const { const RtecEventComm::Event& e = qos.dependencies[pos].event; @@ -249,7 +249,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name ( this->recursive_name (qos, pos, scheduler, child_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (i == 0) @@ -274,7 +274,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name ( this->recursive_name (qos, pos, scheduler, child_name - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (i == 0) @@ -305,7 +305,7 @@ TAO_EC_Sched_Filter_Builder:: recursive_name ( RtecScheduler::handle_t body_info = qos.dependencies[pos].rt_info; RtecScheduler::RT_Info_var info = - scheduler->get (body_info TAO_ENV_ARG_PARAMETER); + scheduler->get (body_info ACE_ENV_ARG_PARAMETER); ACE_CHECK; name = info->entry_point.in (); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h index 138c02e7d04..6a3f89b5922 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h @@ -48,7 +48,7 @@ public: // = The TAO_EC_Filter_Builder methods... TAO_EC_Filter* build (TAO_EC_ProxyPushSupplier *supplier, RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; private: /// Recursively build the filter tree. @@ -57,14 +57,14 @@ private: CORBA::ULong& pos, RtecScheduler::Scheduler_ptr scheduler, RtecScheduler::handle_t parent_info - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; /// Build the name recursively... void recursive_name (RtecEventChannelAdmin::ConsumerQOS& qos, CORBA::ULong& pos, RtecScheduler::Scheduler_ptr scheduler, ACE_CString &name - TAO_ENV_ARG_DECL) const; + ACE_ENV_ARG_DECL) const; /// Count the number of children of the current node, i.e. until a /// conjunction or disjunction starts. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h index 041b592542c..6cf200b1d79 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h @@ -49,14 +49,14 @@ public: virtual void add_proxy_supplier_dependencies ( TAO_EC_ProxyPushSupplier *supplier, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Schedule an event set and deliver them to the filter in the /// desired order and grouping. virtual void schedule_event (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer, TAO_EC_Supplier_Filter *filter - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; }; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp index b58780478d0..f01244e6b09 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp @@ -26,14 +26,14 @@ TAO_EC_SupplierAdmin::~TAO_EC_SupplierAdmin (void) } RtecEventChannelAdmin::ProxyPushConsumer_ptr -TAO_EC_SupplierAdmin::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +TAO_EC_SupplierAdmin::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return this->obtain (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->obtain (ACE_ENV_SINGLE_ARG_PARAMETER); } PortableServer::POA_ptr -TAO_EC_SupplierAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_SupplierAdmin::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h index 73e32e18315..a2258add619 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h @@ -50,11 +50,11 @@ public: // = The RtecEventChannelAdmin::SupplierAdmin methods... virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // = The PortableServer::ServantBase methods - virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL); + virtual PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); private: /// Store the default POA. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp index f80673b22f0..5e93d9f680b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp @@ -30,7 +30,7 @@ TAO_EC_SupplierControl::shutdown (void) void TAO_EC_SupplierControl::supplier_not_exist (TAO_EC_ProxyPushConsumer * - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h index 8c1594f11c5..67ee778ea2f 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h @@ -56,7 +56,7 @@ public: * CORBA::OBJECT_NOT_EXIST exception has been raised). */ virtual void supplier_not_exist (TAO_EC_ProxyPushConsumer *proxy - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); }; #if defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp index 180cf20432c..9267b8c4bbd 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp @@ -18,8 +18,8 @@ TAO_EC_Supplier_Filter::~TAO_EC_Supplier_Filter (void) void TAO_EC_Filter_Worker::work (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_QOS_Info qos_info = this->event_info_; - supplier->filter (this->event_, qos_info TAO_ENV_ARG_PARAMETER); + supplier->filter (this->event_, qos_info ACE_ENV_ARG_PARAMETER); } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h index 890f916d85d..0454161f24d 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h @@ -90,26 +90,26 @@ public: /// Concrete implementations can use this methods to keep track of /// the consumers interested in this events. virtual void connected (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual void reconnected (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; virtual void disconnected (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// The event channel is shutting down. - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL) = 0; + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL) = 0; /// The ProxyPushConsumer delegates on this class to actually send /// the event. virtual void push (const RtecEventComm::EventSet &event, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Events are first scheduled by the TAO_EC_Scheduling_Strategy, /// and then pushed through this class again. virtual void push_scheduled_event (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info - TAO_ENV_ARG_DECL) = 0; + ACE_ENV_ARG_DECL) = 0; /// Increment and decrement the reference count, locking must be /// provided by the user. @@ -126,7 +126,7 @@ public: const TAO_EC_QOS_Info &event_info); virtual void work (TAO_EC_ProxyPushSupplier *supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// The event we push on each case, use a reference to avoid copies. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp index 0753bd74bcc..1a356171387 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp @@ -66,25 +66,25 @@ TAO_EC_Timeout_Filter::~TAO_EC_Timeout_Filter (void) void TAO_EC_Timeout_Filter::push_to_proxy (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { qos_info.timer_id_ = this->id_; if (this->supplier_ != 0) this->supplier_->filter (event, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } int TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (qos_info.timer_id_ == this->id_ && this->parent () != 0) { - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -94,12 +94,12 @@ TAO_EC_Timeout_Filter::filter (const RtecEventComm::EventSet &event, int TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet &event, TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (qos_info.timer_id_ == this->id_ && this->parent () != 0) { - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -109,14 +109,14 @@ TAO_EC_Timeout_Filter::filter_nocopy (RtecEventComm::EventSet &event, void TAO_EC_Timeout_Filter::push (const RtecEventComm::EventSet&, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Timeout_Filter::push_nocopy (RtecEventComm::EventSet&, TAO_EC_QOS_Info& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -159,7 +159,7 @@ int TAO_EC_Timeout_Filter::add_dependencies ( const RtecEventComm::EventHeader&, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h index a0cb386b195..9240db0d29b 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h @@ -57,28 +57,28 @@ public: /// Callback from the Timeout_Generator void push_to_proxy (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // = The TAO_EC_Filter methods, please check the documentation in // TAO_EC_Filter. virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Timeout_Filter diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp index 8ee6be22be4..40552d214d2 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp @@ -42,7 +42,7 @@ TAO_EC_Timeout_Adapter::handle_timeout (const ACE_Time_Value & /* tv */, TAO_EC_QOS_Info qos_info = filter->qos_info (); filter->push_to_proxy (single_event, qos_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp index f4182620759..5e8f5a789bb 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp @@ -34,48 +34,48 @@ TAO_EC_Trivial_Supplier_Filter::unbind (TAO_EC_ProxyPushConsumer*) void TAO_EC_Trivial_Supplier_Filter::connected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Trivial_Supplier_Filter::reconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void TAO_EC_Trivial_Supplier_Filter::disconnected (TAO_EC_ProxyPushSupplier* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void -TAO_EC_Trivial_Supplier_Filter::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_EC_Trivial_Supplier_Filter::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { } void TAO_EC_Trivial_Supplier_Filter::push (const RtecEventComm::EventSet& event, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Scheduling_Strategy* scheduling_strategy = this->event_channel_->scheduling_strategy (); scheduling_strategy->schedule_event (event, consumer, this - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void TAO_EC_Trivial_Supplier_Filter::push_scheduled_event (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Filter_Worker worker (event, event_info); this->event_channel_->consumer_admin ()->for_each (&worker - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } CORBA::ULong diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h index b39fe982298..e0534b2f37a 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h @@ -48,18 +48,18 @@ public: virtual void bind (TAO_EC_ProxyPushConsumer* consumer); virtual void unbind (TAO_EC_ProxyPushConsumer* consumer); virtual void connected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void reconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void disconnected (TAO_EC_ProxyPushSupplier* supplier - TAO_ENV_ARG_DECL); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_ProxyPushConsumer *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void push_scheduled_event (RtecEventComm::EventSet &event, const TAO_EC_QOS_Info &event_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual CORBA::ULong _decr_refcnt (void); virtual CORBA::ULong _incr_refcnt (void); diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp index 5ea4a8cd2b2..04db9a3eb61 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp @@ -16,14 +16,14 @@ TAO_EC_Type_Filter::TAO_EC_Type_Filter (const RtecEventComm::EventHeader& header int TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (event.length () != 1) - return this->filter_set (event, qos_info TAO_ENV_ARG_PARAMETER); + return this->filter_set (event, qos_info ACE_ENV_ARG_PARAMETER); if (this->can_match (event[0].header)) { - this->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->push (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -33,14 +33,14 @@ TAO_EC_Type_Filter::filter (const RtecEventComm::EventSet& event, int TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (event.length () != 1) - return this->filter_set (event, qos_info TAO_ENV_ARG_PARAMETER); + return this->filter_set (event, qos_info ACE_ENV_ARG_PARAMETER); if (this->can_match (event[0].header)) { - this->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; } @@ -50,19 +50,19 @@ TAO_EC_Type_Filter::filter_nocopy (RtecEventComm::EventSet& event, void TAO_EC_Type_Filter::push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push (event, qos_info ACE_ENV_ARG_PARAMETER); } void TAO_EC_Type_Filter::push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (this->parent () != 0) - this->parent ()->push_nocopy (event, qos_info TAO_ENV_ARG_PARAMETER); + this->parent ()->push_nocopy (event, qos_info ACE_ENV_ARG_PARAMETER); } void @@ -116,7 +116,7 @@ int TAO_EC_Type_Filter::add_dependencies ( const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info & - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { return this->can_match (header); } @@ -124,7 +124,7 @@ TAO_EC_Type_Filter::add_dependencies ( int TAO_EC_Type_Filter::filter_set (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::ULong maximum = event.length (); if (event.maximum () == 0) @@ -143,7 +143,7 @@ TAO_EC_Type_Filter::filter_set (const RtecEventComm::EventSet& event, if (matched.length () == 0) return 0; - this->push (matched, qos_info TAO_ENV_ARG_PARAMETER); + this->push (matched, qos_info ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return 1; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h index 9780fab0fd6..cde1c5a8326 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h @@ -41,22 +41,22 @@ public: // TAO_EC_Filter. virtual int filter (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int filter_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void push_nocopy (RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void clear (void); virtual CORBA::ULong max_event_size (void) const; virtual int can_match (const RtecEventComm::EventHeader& header) const; virtual int add_dependencies (const RtecEventComm::EventHeader& header, const TAO_EC_QOS_Info &qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: ACE_UNIMPLEMENTED_FUNC (TAO_EC_Type_Filter @@ -67,7 +67,7 @@ private: /// Filter an EventSet that contains more than one event. int filter_set (const RtecEventComm::EventSet& event, TAO_EC_QOS_Info& qos_info - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: /// Encapsulate the type/source that we must match. diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp index 06f5cf18acb..ad193b971af 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp @@ -16,7 +16,7 @@ TAO_EC_Simple_AddrServer::~TAO_EC_Simple_AddrServer (void) void TAO_EC_Simple_AddrServer::get_addr (const RtecEventComm::EventHeader& header, RtecUDPAdmin::UDP_Addr_out addr - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { addr.ipaddr = header.type; diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h index e59d2951f33..b272d2218ab 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h @@ -44,7 +44,7 @@ public: // = The RtecUDPAdmin::AddrServer methods virtual void get_addr (const RtecEventComm::EventHeader& header, RtecUDPAdmin::UDP_Addr_out addr - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp index 4d3a5f3bdde..b8a4f3184a8 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.cpp @@ -160,7 +160,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Event_Channel_Timeprobe_Description, static RtecScheduler::Preemption_Priority_t Preemption_Priority (RtecScheduler::Scheduler_ptr scheduler, RtecScheduler::handle_t rtinfo - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecScheduler::OS_Priority thread_priority; RtecScheduler::Preemption_Subpriority_t subpriority; @@ -174,14 +174,14 @@ Preemption_Priority (RtecScheduler::Scheduler_ptr scheduler, thread_priority, subpriority, preemption_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server ()->priority (rtinfo, thread_priority, subpriority, preemption_priority - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_CHECK_RETURN (0); return preemption_priority; @@ -231,7 +231,7 @@ public: ACE_Scheduler_MIN_PREEMPTION_PRIORITY; while (iter.advance_dependency () == 0) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { RtecEventComm::EventType &type = (*iter).event.header.type; @@ -242,7 +242,7 @@ public: { RtecScheduler::Preemption_Priority_t q = ::Preemption_Priority (scheduler, (*iter).rt_info - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (rt_info_ == 0 || q < p) { @@ -324,11 +324,11 @@ public: virtual int execute (void* /* arg = 0 */) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { ACE_ES_Dispatch_Request *request = request_; - dispatching_module_->push (request TAO_ENV_ARG_PARAMETER); + dispatching_module_->push (request ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; delete this; } @@ -368,7 +368,7 @@ void ACE_Push_Supplier_Proxy::connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS &qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected)) { @@ -391,12 +391,12 @@ ACE_Push_Supplier_Proxy::connect_push_supplier ( // not work: it usually results in some form of dead-lock. this->source_id_ = qos_.publications[0].event.header.source; - supplier_module_->connected (this TAO_ENV_ARG_PARAMETER); + supplier_module_->connected (this ACE_ENV_ARG_PARAMETER); } void ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TIMEPROBE (TAO_EVENT_CHANNEL_ENTER_PUSH_SUPPLIER_PROXY_PUSH); @@ -413,14 +413,14 @@ ACE_Push_Supplier_Proxy::push (const RtecEventComm::EventSet &event ACE_const_cast (RtecEventComm::EventSet&, event); this->time_stamp (copy); - this->supplier_module_->push (this, copy TAO_ENV_ARG_PARAMETER); + this->supplier_module_->push (this, copy ACE_ENV_ARG_PARAMETER); ACE_CHECK; } else { RtecEventComm::EventSet copy = event; this->time_stamp (copy); - this->supplier_module_->push (this, copy TAO_ENV_ARG_PARAMETER); + this->supplier_module_->push (this, copy ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -442,14 +442,14 @@ ACE_Push_Supplier_Proxy::time_stamp (RtecEventComm::EventSet& event) void ACE_Push_Supplier_Proxy::disconnect_push_consumer ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TIMEPROBE_PRINT; if (this->connected ()) { this->push_supplier_ = 0; - this->supplier_module_->disconnecting (this TAO_ENV_ARG_PARAMETER); + this->supplier_module_->disconnecting (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -457,10 +457,10 @@ ACE_Push_Supplier_Proxy::disconnect_push_consumer ( void ACE_Push_Supplier_Proxy::shutdown (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - push_supplier_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + push_supplier_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -483,7 +483,7 @@ ACE_Push_Consumer_Proxy::~ACE_Push_Consumer_Proxy (void) void ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_TIMEPROBE (TAO_EVENT_CHANNEL_DELIVER_EVENT_TO_CONSUMER_PROXY); @@ -494,7 +494,7 @@ ACE_Push_Consumer_Proxy::push (const RtecEventComm::EventSet &events return; } - push_consumer_->push (events TAO_ENV_ARG_PARAMETER); + push_consumer_->push (events ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -502,7 +502,7 @@ void ACE_Push_Consumer_Proxy::connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS &qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected, RtecEventChannelAdmin::TypeError)) @@ -523,28 +523,28 @@ ACE_Push_Consumer_Proxy::connect_push_consumer ( // ACE_ConsumerQOS_Factory::debug (qos_); - this->consumer_module_->connected (this TAO_ENV_ARG_PARAMETER); + this->consumer_module_->connected (this ACE_ENV_ARG_PARAMETER); } void ACE_Push_Consumer_Proxy::disconnect_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TIMEPROBE_PRINT; this->push_consumer_ = RtecEventComm::PushConsumer::_nil (); - this->consumer_module_->disconnecting (this TAO_ENV_ARG_PARAMETER); + this->consumer_module_->disconnecting (this ACE_ENV_ARG_PARAMETER); } void -ACE_Push_Consumer_Proxy::suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ACE_Push_Consumer_Proxy::suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { correlation_.suspend (); } void -ACE_Push_Consumer_Proxy::resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ACE_Push_Consumer_Proxy::resume_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { correlation_.resume (); @@ -553,10 +553,10 @@ ACE_Push_Consumer_Proxy::resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void ACE_Push_Consumer_Proxy::shutdown (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->push_consumer_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->push_consumer_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -644,10 +644,10 @@ ACE_EventChannel::~ACE_EventChannel (void) // @@ This should go away, it is too late to raise a CORBA // exception, at this point we should only be cleaning up memory, // not sending messages. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -674,7 +674,7 @@ ACE_EventChannel::~ACE_EventChannel (void) } void -ACE_EventChannel::destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ACE_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { { @@ -767,27 +767,27 @@ ACE_EventChannel::report_disconnect_i (u_long event) void ACE_EventChannel::add_gateway (TAO_EC_Gateway* gw - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - RtecEventChannelAdmin::Observer_var observer = gw->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + RtecEventChannelAdmin::Observer_var observer = gw->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - gw->observer_handle (this->append_observer (observer.in () TAO_ENV_ARG_PARAMETER)); + gw->observer_handle (this->append_observer (observer.in () ACE_ENV_ARG_PARAMETER)); ACE_CHECK; } void ACE_EventChannel::del_gateway (TAO_EC_Gateway* gw - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->remove_observer (gw->observer_handle () TAO_ENV_ARG_PARAMETER); + this->remove_observer (gw->observer_handle () ACE_ENV_ARG_PARAMETER); ACE_CHECK; gw->observer_handle (0); } void -ACE_EventChannel::update_consumer_gwys (TAO_ENV_SINGLE_ARG_DECL) +ACE_EventChannel::update_consumer_gwys (ACE_ENV_SINGLE_ARG_DECL) { Observer_Map observers; { @@ -818,13 +818,13 @@ ACE_EventChannel::update_consumer_gwys (TAO_ENV_SINGLE_ARG_DECL) i != observers.end (); ++i) { - (*i).int_id_.observer->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); + (*i).int_id_.observer->update_consumer (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void -ACE_EventChannel::update_supplier_gwys (TAO_ENV_SINGLE_ARG_DECL) +ACE_EventChannel::update_supplier_gwys (ACE_ENV_SINGLE_ARG_DECL) { Observer_Map observers; { @@ -854,14 +854,14 @@ ACE_EventChannel::update_supplier_gwys (TAO_ENV_SINGLE_ARG_DECL) i != observers.end (); ++i) { - (*i).int_id_.observer->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); + (*i).int_id_.observer->update_supplier (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } RtecEventChannelAdmin::Observer_Handle ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -882,12 +882,12 @@ ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs RtecEventChannelAdmin::ConsumerQOS c_qos; this->consumer_module_->fill_qos (c_qos); - obs->update_consumer (c_qos TAO_ENV_ARG_PARAMETER); + obs->update_consumer (c_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); RtecEventChannelAdmin::SupplierQOS s_qos; this->supplier_module_->fill_qos (s_qos); - obs->update_supplier (s_qos TAO_ENV_ARG_PARAMETER); + obs->update_supplier (s_qos ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return entry.handle; @@ -895,7 +895,7 @@ ACE_EventChannel::append_observer (RtecEventChannelAdmin::Observer_ptr obs void ACE_EventChannel::remove_observer (RtecEventChannelAdmin::Observer_Handle h - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -932,7 +932,7 @@ ACE_EventChannel::schedule_timer (RtecScheduler::handle_t rt_info, RtecScheduler::handle_t timer_rtinfo = this->timer_module ()->rt_info (preemption_priority); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if 1 @@ -940,14 +940,14 @@ ACE_EventChannel::schedule_timer (RtecScheduler::handle_t rt_info, timer_rtinfo, 1, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->add_dependency (rt_info, timer_rtinfo, 1, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } @@ -1252,18 +1252,18 @@ ACE_ES_Consumer_Module::open (ACE_ES_Dispatching_Module *down) void ACE_ES_Consumer_Module::connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, // "EC (%t) Consumer_Module - connecting consumer %x\n", // consumer)); this->channel_->report_connect (ACE_EventChannel::CONSUMER); - this->down_->connected (consumer TAO_ENV_ARG_PARAMETER); + this->down_->connected (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!consumer->qos ().is_gateway) - this->channel_->update_consumer_gwys (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_->update_consumer_gwys (ACE_ENV_SINGLE_ARG_PARAMETER); } void @@ -1286,12 +1286,12 @@ ACE_ES_Consumer_Module::shutdown_request (ACE_ES_Dispatch_Request *request) // Deactivate the consumer proxy PortableServer::POA_var poa = - sc->consumer ()->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + sc->consumer ()->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (sc->consumer () TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (sc->consumer () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Delete the consumer proxy, no need to delete it, is is owned @@ -1299,7 +1299,7 @@ ACE_ES_Consumer_Module::shutdown_request (ACE_ES_Dispatch_Request *request) // delete sc->consumer (); if (!dont_update) - this->channel_->update_consumer_gwys (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_->update_consumer_gwys (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_GUARD_THROW_EX ( @@ -1347,7 +1347,7 @@ ACE_ES_Consumer_Module::shutdown (void) { Consumer_Iterator iter (copy); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { for (ACE_Push_Consumer_Proxy **proxy = 0; @@ -1359,12 +1359,12 @@ ACE_ES_Consumer_Module::shutdown (void) // servant. // Deactivate the proxy... PortableServer::POA_var poa = - (*proxy)->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + (*proxy)->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (*proxy TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (*proxy ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Remove the consumer from our list. @@ -1394,7 +1394,7 @@ DONE: void ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { { ACE_GUARD_THROW_EX ( @@ -1411,7 +1411,7 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer // etc. However, messages may still be queued in the ReactorEx or // in the Dispatching Module for this consumer, so no queues or // proxies can be deleted just yet. - down_->disconnecting (consumer TAO_ENV_ARG_PARAMETER); + down_->disconnecting (consumer ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Send a shutdown message through the system. When this is @@ -1459,7 +1459,7 @@ ACE_ES_Consumer_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer // can read the set we allocated off the stack. void ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "EC (%t) Consumer_Module::push\n")); @@ -1478,12 +1478,12 @@ ACE_ES_Consumer_Module::push (const ACE_ES_Dispatch_Request *request ORBSVCS_Time::hrtime_to_TimeT (ev.header.ec_send_time, ec_send); } #endif /* TAO_LACKS_EVENT_CHANNEL_TIMESTAMPS */ - request->consumer ()->push (event_set TAO_ENV_ARG_PARAMETER); + request->consumer ()->push (event_set ACE_ENV_ARG_PARAMETER); } RtecEventChannelAdmin::ProxyPushSupplier_ptr ACE_ES_Consumer_Module::obtain_push_supplier ( - TAO_ENV_SINGLE_ARG_DECL) + ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushSupplier_ptr proxy = @@ -1510,7 +1510,7 @@ ACE_ES_Consumer_Module::obtain_push_supplier ( ACE_ERROR ((LM_ERROR, "ACE_ES_Consumer_Module insert failed.\n")); } - proxy = new_consumer->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy = new_consumer->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxy); // Give away ownership to the POA.... @@ -1622,7 +1622,7 @@ ACE_ES_Correlation_Module::open (ACE_ES_Dispatching_Module *up, void ACE_ES_Correlation_Module::connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Initialize the consumer correlation filter. if (consumer->correlation ().connected (consumer, this) == -1) @@ -1631,7 +1631,7 @@ ACE_ES_Correlation_Module::connected (ACE_Push_Consumer_Proxy *consumer void ACE_ES_Correlation_Module::disconnecting (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (consumer->correlation ().disconnecting () == -1) ACE_ERROR ((LM_ERROR, @@ -1653,7 +1653,7 @@ ACE_ES_Correlation_Module::unsubscribe (ACE_ES_Consumer_Rep *cr) void ACE_ES_Correlation_Module::push (ACE_ES_Consumer_Rep *consumer, const TAO_EC_Event& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "EC (%t) Correlation_Module::push\n")); @@ -1666,7 +1666,7 @@ ACE_ES_Correlation_Module::push (ACE_ES_Consumer_Rep *consumer, // we need to push the event now. if (request != 0) { - up_->push (request TAO_ENV_ARG_PARAMETER); + up_->push (request ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -1814,7 +1814,7 @@ ACE_ES_Consumer_Correlation::~ACE_ES_Consumer_Correlation (void) } void -ACE_ES_Consumer_Correlation::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ACE_ES_Consumer_Correlation::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->connected_ = 0; @@ -2169,10 +2169,10 @@ ACE_ES_Consumer_Correlation::disconnecting (void) // If we were forwarding events, disconnect as a supplier. if (connected_) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - channel_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + channel_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2336,14 +2336,14 @@ ACE_ES_Consumer_Rep_Timeout::execute (void* /* arg */) ACE_TIMEPROBE (TAO_EVENT_CHANNEL_CONSUMER_REP_TIMEOUT_EXECUTE); if (this->receiving_events ()) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { ACE_Time_Value tv = ACE_OS::gettimeofday (); ORBSVCS_Time::Time_Value_to_TimeT (this->timeout_event_.header ().creation_time, tv); correlation_->correlation_module_->push (this, this->timeout_event_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -2385,7 +2385,7 @@ ACE_ES_Subscription_Module::~ACE_ES_Subscription_Module (void) // global type collection. void ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventComm::EventSourceID sid = 0; // We will record the source_id for later usage. @@ -2463,14 +2463,14 @@ ACE_ES_Subscription_Module::connected (ACE_Push_Supplier_Proxy *supplier new_subscribers->dependency_info_->rt_info, new_subscribers->dependency_info_->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->add_dependency ((*proxy)->dependency()->rt_info, new_subscribers->dependency_info_->rt_info, new_subscribers->dependency_info_->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_CHECK; @@ -2538,7 +2538,7 @@ ACE_ES_Subscription_Module::reregister_consumers (RtecEventComm::EventSourceID s void ACE_ES_Subscription_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_WRITE_GUARD_THROW_EX ( ACE_ES_RW_LOCK, ace_mon, this->lock_, @@ -2592,7 +2592,7 @@ ACE_ES_Subscription_Module::subscribe_all (ACE_ES_Consumer_Rep *) int ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source, const TAO_EC_Event &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "EC (%t) Subscription_Module::push_source\n")); @@ -2626,7 +2626,7 @@ ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source, // and not disconnected. if ((*consumer)->receiving_events ()) { - up_->push (*consumer, event TAO_ENV_ARG_PARAMETER); + up_->push (*consumer, event ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } // If the consumer has disconnected, schedule it for @@ -2675,7 +2675,7 @@ ACE_ES_Subscription_Module::push_source (ACE_Push_Supplier_Proxy *source, int ACE_ES_Subscription_Module::push_source_type (ACE_Push_Supplier_Proxy *source, const TAO_EC_Event &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, // "EC (%t) Subscription_Module::push_source_type: \n")); @@ -2742,7 +2742,7 @@ ACE_ES_Subscription_Module::push_source_type (ACE_Push_Supplier_Proxy *source, { if ((*consumer)->receiving_events ()) { - up_->push (*consumer, event TAO_ENV_ARG_PARAMETER); + up_->push (*consumer, event ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } if ((*consumer)->disconnected ()) @@ -2837,7 +2837,7 @@ ACE_ES_Subscription_Module::subscribe_source (ACE_ES_Consumer_Rep *consumer, iter2.next (temp) != 0; iter2.advance ()) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if 1 @@ -2846,14 +2846,14 @@ ACE_ES_Subscription_Module::subscribe_source (ACE_ES_Consumer_Rep *consumer, temp->int_id_->dependency_info_->rt_info, temp->int_id_->dependency_info_->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->add_dependency (consumer->dependency()->rt_info, temp->int_id_->dependency_info_->rt_info, temp->int_id_->dependency_info_->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } @@ -2916,7 +2916,7 @@ ACE_ES_Subscription_Module::subscribe_type (ACE_ES_Consumer_Rep *consumer, // Success. Add the supplier dependency info to the // consumer's dependency list. // @@ TODO handle exceptions. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if 1 @@ -2925,14 +2925,14 @@ ACE_ES_Subscription_Module::subscribe_type (ACE_ES_Consumer_Rep *consumer, dependency_info->rt_info, dependency_info->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->add_dependency (consumer->dependency ()->rt_info, dependency_info->rt_info, dependency_info->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } @@ -2989,7 +2989,7 @@ ACE_ES_Subscription_Module::subscribe_source_type (ACE_ES_Consumer_Rep *consumer // Success. // Add the supplier to the consumer's dependency list. // @@ TODO handle exceptions. - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if 1 @@ -2998,14 +2998,14 @@ ACE_ES_Subscription_Module::subscribe_source_type (ACE_ES_Consumer_Rep *consumer dependency_info->rt_info, dependency_info->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->add_dependency (consumer->dependency ()->rt_info, dependency_info->rt_info, dependency_info->number_of_calls, RtecBase::ONE_WAY_CALL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } @@ -3232,13 +3232,13 @@ ACE_ES_Subscription_Module::unsubscribe_source_type (ACE_ES_Consumer_Rep *consum void ACE_ES_Subscription_Module::push (ACE_Push_Supplier_Proxy *source, const TAO_EC_Event &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // ACE_DEBUG ((LM_DEBUG, "EC (%t) Subscription_Module::push\n")); ACE_TIMEPROBE (TAO_EVENT_CHANNEL_DELIVER_TO_SUBSCRIPTION_MODULE); // These are all inline function calls. - int result = this->push_source (source, event TAO_ENV_ARG_PARAMETER); + int result = this->push_source (source, event ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (result == -1) @@ -3247,7 +3247,7 @@ ACE_ES_Subscription_Module::push (ACE_Push_Supplier_Proxy *source, { ACE_FUNCTION_TIMEPROBE (TAO_EVENT_CHANNEL_BEGIN_PUSH_SOURCE_TYPE); - result = this->push_source_type (source, event TAO_ENV_ARG_PARAMETER); + result = this->push_source_type (source, event ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (result == -1) @@ -3321,19 +3321,19 @@ ACE_ES_Supplier_Module::open (ACE_ES_Subscription_Module *up) void ACE_ES_Supplier_Module::connected (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { channel_->report_connect (ACE_EventChannel::SUPPLIER); - up_->connected (supplier TAO_ENV_ARG_PARAMETER); + up_->connected (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!supplier->qos ().is_gateway) - this->channel_->update_supplier_gwys (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_->update_supplier_gwys (ACE_ENV_SINGLE_ARG_PARAMETER); } void ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::Boolean need_update = 0; { @@ -3345,7 +3345,7 @@ ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier if (all_suppliers_.remove (supplier) == -1) ACE_THROW (RtecEventChannelAdmin::EventChannel::SUBSCRIPTION_ERROR()); - up_->disconnecting (supplier TAO_ENV_ARG_PARAMETER); + up_->disconnecting (supplier ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->all_suppliers_.size () <= 0) @@ -3363,7 +3363,7 @@ ACE_ES_Supplier_Module::disconnecting (ACE_Push_Supplier_Proxy *supplier // CORBA::release (supplier); } if (need_update) - this->channel_->update_supplier_gwys (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channel_->update_supplier_gwys (ACE_ENV_SINGLE_ARG_PARAMETER); } void @@ -3381,14 +3381,14 @@ ACE_ES_Supplier_Module::shutdown (void) { Supplier_Iterator iter (copy); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; for (ACE_Push_Supplier_Proxy **proxy = 0; iter.next (proxy) != 0; iter.advance ()) { (*proxy)->shutdown (); - this->disconnecting (*proxy TAO_ENV_ARG_PARAMETER); + this->disconnecting (*proxy ACE_ENV_ARG_PARAMETER); } } @@ -3396,7 +3396,7 @@ ACE_ES_Supplier_Module::shutdown (void) } RtecEventChannelAdmin::ProxyPushConsumer_ptr -ACE_ES_Supplier_Module::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +ACE_ES_Supplier_Module::obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushConsumer_ptr proxy = @@ -3418,7 +3418,7 @@ ACE_ES_Supplier_Module::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) ACE_ERROR ((LM_ERROR, "ACE_ES_Supplier_Module insert failed.\n")); } - proxy = new_supplier->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy = new_supplier->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (proxy); // Give ownership to the POA @@ -3430,7 +3430,7 @@ ACE_ES_Supplier_Module::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL) void ACE_ES_Supplier_Module::push (ACE_Push_Supplier_Proxy *proxy, RtecEventComm::EventSet &event_set - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // Steal the events from the EventSet and put them into a reference // counted event set. @@ -3447,7 +3447,7 @@ ACE_ES_Supplier_Module::push (ACE_Push_Supplier_Proxy *proxy, // the scope. TAO_EC_Event event_copy (event, i); ACE_TIMEPROBE (TAO_EVENT_CHANNEL_DELIVER_TO_SUPPLIER_MODULE_THRU_SUPPLIER_PROXY); - up_->push (proxy, event_copy TAO_ENV_ARG_PARAMETER); + up_->push (proxy, event_copy ACE_ENV_ARG_PARAMETER); ACE_CHECK; } TAO_EC_Event_Set::_release (event); diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h index 955838fae77..efd24b5d442 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.h @@ -201,7 +201,7 @@ public: virtual ~ACE_EventChannel (void); // Calls destroy. - RtecEventChannelAdmin::EventChannel_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + RtecEventChannelAdmin::EventChannel_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Allow transformations to RtecEventChannelAdmin::EventChannel. ACE_RTU_Manager *rtu_manager (void); @@ -232,12 +232,12 @@ public: void report_disconnect_i (u_long); // Consumer or supplier disconnected. - void add_gateway (TAO_EC_Gateway* gw TAO_ENV_ARG_DECL); - void del_gateway (TAO_EC_Gateway* gw TAO_ENV_ARG_DECL); + void add_gateway (TAO_EC_Gateway* gw ACE_ENV_ARG_DECL); + void del_gateway (TAO_EC_Gateway* gw ACE_ENV_ARG_DECL); // Add and remove gateways from the EC. - void update_consumer_gwys (TAO_ENV_SINGLE_ARG_DECL); - void update_supplier_gwys (TAO_ENV_SINGLE_ARG_DECL); + void update_consumer_gwys (ACE_ENV_SINGLE_ARG_DECL); + void update_supplier_gwys (ACE_ENV_SINGLE_ARG_DECL); // The consumer (or supplier) list has changed, thus the EC has to // inform any gateways it has. @@ -247,30 +247,30 @@ public: // = The RtecEventChannelAdmin::EventChannel methods. virtual RtecEventChannelAdmin::ConsumerAdmin_ptr - for_consumers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + for_consumers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // In this implementation of the EC this returns the interface for // the Consumer_Module. virtual RtecEventChannelAdmin::SupplierAdmin_ptr - for_suppliers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + for_suppliers (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Return an interface to the Supplier_Module. - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Shutdown the EC, free all resources, stop all threads and then // shutdown the server where the Servant is running. virtual RtecEventChannelAdmin::Observer_Handle append_observer (RtecEventChannelAdmin::Observer_ptr observer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, @@ -840,7 +840,7 @@ public: // that ACE_ES_Consumer_Rep_Timeout::execute can access it. private: - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Called when the channel disconnects us. @@ -943,23 +943,23 @@ public: // Link to the next module. virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr - obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Factory method for push consumer proxies. void connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Register the consumer with the Event Service. This handles all // the details regarding Correlation_Module and Subscription_Module. void disconnecting (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Unregister the consumer from the Event Service. virtual void push (const ACE_ES_Dispatch_Request *request - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); - RtecEventChannelAdmin::ConsumerAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + RtecEventChannelAdmin::ConsumerAdmin_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Allow transformations to RtecEventChannelAdmin::ConsumerAdmin. void shutdown_request (ACE_ES_Dispatch_Request *request); @@ -1011,16 +1011,16 @@ public: // Link to adjacent modules. void connected (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Create the consumers filter object. void disconnecting (ACE_Push_Consumer_Proxy *consumer - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Release the consumers filter object. void push (ACE_ES_Consumer_Rep *consumer, const TAO_EC_Event &event - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Take in an event and its subscriber. Apply consumer-specific // filters to each event and forward any dispatch requests to the // Dispatching Module. @@ -1099,13 +1099,13 @@ public: // Removes the -consumer- from any subscription lists. void connected (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); void disconnecting (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); void push (ACE_Push_Supplier_Proxy *source, const TAO_EC_Event &event - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Takes in an event and pushes subscriber sets to the // Correlation Module. @@ -1160,18 +1160,18 @@ private: int push_source (ACE_Push_Supplier_Proxy *source, const TAO_EC_Event &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Push <event> to all consumers subscribed to all events from // <source>. Returns 0 on success, -1 on failure. int push_source_type (ACE_Push_Supplier_Proxy *source, const TAO_EC_Event &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Push <event> to all consumers subscribed to <event>.type_ from // <source>. Returns 0 on success, -1 on failure. void push_all (const TAO_EC_Event &event - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Push <event> to all_suppliers_. ACE_ES_Correlation_Module *up_; @@ -1216,26 +1216,26 @@ public: // Associate the module to a channel. virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr - obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + obtain_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Factory method for push supplier proxies. virtual void push (ACE_Push_Supplier_Proxy *proxy, RtecEventComm::EventSet &event - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // The supplier module acts on behalf of the supplier proxy to // forward events through the channel. void connected (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Register the consumer with the Event Service. This handles all // the details regarding Correlation_Module and Subscription_Module. void disconnecting (ACE_Push_Supplier_Proxy *supplier - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Unregister the consumer from the Event Service. - RtecEventChannelAdmin::SupplierAdmin_ptr get_ref (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + RtecEventChannelAdmin::SupplierAdmin_ptr get_ref (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Allow transformations to RtecEventComm::PushConsumer. void shutdown (void); @@ -1290,7 +1290,7 @@ public: virtual void connect_push_supplier ( RtecEventComm::PushSupplier_ptr push_supplier, const RtecEventChannelAdmin::SupplierQOS& qos - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected)); // Suppliers connect via this interface. <push_supplier> is a @@ -1298,12 +1298,12 @@ public: // the supplier. virtual void push (const RtecEventComm::EventSet &event - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Data arriving from a PushSupplier that must be sent to // consumers. This is the entry point of all events. - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Disconnect the supplier from the channel. @@ -1374,29 +1374,29 @@ public: virtual void connect_push_consumer ( RtecEventComm::PushConsumer_ptr push_consumer, const RtecEventChannelAdmin::ConsumerQOS& qos - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, RtecEventChannelAdmin::AlreadyConnected, RtecEventChannelAdmin::TypeError)); // A push consumer is connecting. <push_consumer> is a reference to // the consumer. <qos> is the subscription types for the consumer. - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The consumer is disconnecting. - virtual void suspend_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void suspend_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Stop forwarding events to the calling consumer. - virtual void resume_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void resume_connection (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // Resume forwarding events to the calling consumer. // = Event Channel operations. void push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Push <events> to push_consumer_. int connected (void); diff --git a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i index 395b70bc70b..d0fbf3acda3 100644 --- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i +++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i @@ -69,37 +69,37 @@ ACE_Push_Consumer_Proxy::correlation (void) } ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr -ACE_ES_Consumer_Module::get_ref (TAO_ENV_SINGLE_ARG_DECL) +ACE_ES_Consumer_Module::get_ref (ACE_ENV_SINGLE_ARG_DECL) { - return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr -ACE_ES_Supplier_Module::get_ref (TAO_ENV_SINGLE_ARG_DECL) +ACE_ES_Supplier_Module::get_ref (ACE_ENV_SINGLE_ARG_DECL) { - return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } // ************************************************** ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr -ACE_EventChannel::get_ref (TAO_ENV_SINGLE_ARG_DECL) +ACE_EventChannel::get_ref (ACE_ENV_SINGLE_ARG_DECL) { - return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr -ACE_EventChannel::for_suppliers (TAO_ENV_SINGLE_ARG_DECL) +ACE_EventChannel::for_suppliers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return supplier_module_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + return supplier_module_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr -ACE_EventChannel::for_consumers (TAO_ENV_SINGLE_ARG_DECL) +ACE_EventChannel::for_consumers (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - return consumer_module_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + return consumer_module_->get_ref (ACE_ENV_SINGLE_ARG_PARAMETER); } ACE_INLINE TAO_EC_Timer_Module* diff --git a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp index 2582e74ee2e..a312c4302f1 100644 --- a/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/RT_Task.cpp @@ -96,7 +96,7 @@ ACE_RT_Task::~ACE_RT_Task (void) int ACE_RT_Task::svc (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // @@ TODO It may be necessary to pass the options to this class @@ -107,7 +107,7 @@ ACE_RT_Task::svc (void) }; int argc = sizeof (argv)/sizeof (argv[0]); CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif @@ -120,14 +120,14 @@ ACE_RT_Task::svc (void) (this->rt_info_, thread_priority, subpriority, - preemption_priority TAO_ENV_ARG_PARAMETER); + preemption_priority ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else ACE_Scheduler_Factory::server ()->priority (this->rt_info_, thread_priority, subpriority, - preemption_priority TAO_ENV_ARG_PARAMETER); + preemption_priority ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif if (ACE_OS::thr_setprio (thread_priority) == -1) @@ -257,17 +257,17 @@ ACE_RT_Task::open_task (const char* name) tempname = tempbuffer; } - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if 1 rt_info_ = - this->scheduler_->create (tempname TAO_ENV_ARG_PARAMETER); + this->scheduler_->create (tempname ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else rt_info_ = ACE_Scheduler_Factory::server()->create (tempname - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif // @@ TODO: We do no initialization of the new rt_info, the @@ -314,7 +314,7 @@ ACE_RT_Task::synch_threads (size_t threads) RtecScheduler::Preemption_Subpriority_t subpriority; RtecScheduler::Preemption_Priority_t preemption_priority; - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { { @@ -325,14 +325,14 @@ ACE_RT_Task::synch_threads (size_t threads) (rt_info_, thread_priority, subpriority, - preemption_priority TAO_ENV_ARG_PARAMETER); + preemption_priority ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else ACE_Scheduler_Factory::server ()->priority (rt_info_, thread_priority, subpriority, - preemption_priority TAO_ENV_ARG_PARAMETER); + preemption_priority ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #endif } diff --git a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp index 826009f8d12..8ea1e243627 100644 --- a/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/ReactorTask.cpp @@ -75,7 +75,7 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period) case 0: // @@ TODO handle exceptions { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { #if 1 @@ -90,7 +90,7 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period) ORBSVCS_Time::zero (), 1, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #else ACE_Scheduler_Factory::server()->set (rt_info_, @@ -103,7 +103,7 @@ ACE_ES_Reactor_Task::open_reactor (RtecScheduler::Period_t &period) ORBSVCS_Time::zero (), 1, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); #endif ACE_TRY_CHECK; } |