summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp')
-rw-r--r--TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp93
1 files changed, 37 insertions, 56 deletions
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
index b677c11d0db..2e3c6a5ff22 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
@@ -31,9 +31,9 @@ Subscribe::~Subscribe ()
}
void
-Subscribe::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
+Subscribe::init (int argc, char *argv [])
{
- init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
+ init_ORB (argc, argv);
resolve_naming_service ();
resolve_Notify_factory ();
create_EC ();
@@ -64,17 +64,14 @@ Subscribe::done (void)
void
Subscribe::init_ORB (int argc,
- char *argv []
- ACE_ENV_ARG_DECL)
+ char *argv [])
{
this->orb_ = CORBA::ORB_init (argc,
argv,
- ""
- ACE_ENV_ARG_PARAMETER);
+ "");
CORBA::Object_ptr poa_object =
- this->orb_->resolve_initial_references("RootPOA"
- ACE_ENV_ARG_PARAMETER);
+ this->orb_->resolve_initial_references("RootPOA");
if (CORBA::is_nil (poa_object))
{
@@ -83,7 +80,7 @@ Subscribe::init_ORB (int argc,
return;
}
this->root_poa_ =
- PortableServer::POA::_narrow (poa_object ACE_ENV_ARG_PARAMETER);
+ PortableServer::POA::_narrow (poa_object);
PortableServer::POAManager_var poa_manager =
root_poa_->the_POAManager ();
@@ -95,15 +92,14 @@ void
Subscribe::resolve_naming_service (void)
{
CORBA::Object_var naming_obj =
- this->orb_->resolve_initial_references (NAMING_SERVICE_NAME
- ACE_ENV_ARG_PARAMETER);
+ this->orb_->resolve_initial_references (NAMING_SERVICE_NAME);
// Need to check return value for errors.
if (CORBA::is_nil (naming_obj.in ()))
- ACE_THROW (CORBA::UNKNOWN ());
+ throw CORBA::UNKNOWN ();
this->naming_context_ =
- CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER);
+ CosNaming::NamingContext::_narrow (naming_obj.in ());
}
void
@@ -114,12 +110,10 @@ Subscribe::resolve_Notify_factory (void)
name[0].id = CORBA::string_dup (NOTIFY_FACTORY_NAME);
CORBA::Object_var obj =
- this->naming_context_->resolve (name
- ACE_ENV_ARG_PARAMETER);
+ this->naming_context_->resolve (name);
this->notify_factory_ =
- CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ()
- ACE_ENV_ARG_PARAMETER);
+ CosNotifyChannelAdmin::EventChannelFactory::_narrow (obj.in ());
}
void
@@ -129,8 +123,7 @@ Subscribe::create_EC (void)
ec_ = notify_factory_->create_channel (initial_qos_,
initial_admin_,
- id
- ACE_ENV_ARG_PARAMETER);
+ id);
ACE_ASSERT (!CORBA::is_nil (ec_.in ()));
}
@@ -141,7 +134,7 @@ Subscribe::create_supplieradmin (void)
CosNotifyChannelAdmin::AdminID adminid;
supplier_admin_ =
- ec_->new_for_suppliers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
+ ec_->new_for_suppliers (this->ifgop_, adminid);
ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ()));
}
@@ -152,7 +145,7 @@ Subscribe:: create_consumeradmin (void)
CosNotifyChannelAdmin::AdminID adminid;
consumer_admin_ =
- ec_->new_for_consumers (this->ifgop_, adminid ACE_ENV_ARG_PARAMETER);
+ ec_->new_for_consumers (this->ifgop_, adminid);
ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ()));
}
@@ -161,24 +154,20 @@ void
Subscribe::create_consumers (void)
{
consumer_1_ = new Subscribe_StructuredPushConsumer (this);
- consumer_1_->connect (this->consumer_admin_.in ()
- ACE_ENV_ARG_PARAMETER);
+ consumer_1_->connect (this->consumer_admin_.in ());
consumer_2_ = new Subscribe_StructuredPushConsumer (this);
- consumer_2_->connect (this->consumer_admin_.in ()
- ACE_ENV_ARG_PARAMETER);
+ consumer_2_->connect (this->consumer_admin_.in ());
}
void
Subscribe::create_suppliers (void)
{
supplier_1_ = new Subscribe_StructuredPushSupplier ();
- supplier_1_->connect (this->supplier_admin_.in ()
- ACE_ENV_ARG_PARAMETER);
+ supplier_1_->connect (this->supplier_admin_.in ());
supplier_2_ = new Subscribe_StructuredPushSupplier ();
- supplier_2_->connect (this->supplier_admin_.in ()
- ACE_ENV_ARG_PARAMETER);
+ supplier_2_->connect (this->supplier_admin_.in ());
}
void
@@ -192,7 +181,7 @@ Subscribe::send_events (void)
added[0].domain_name = CORBA::string_dup (DOMAIN_A);
added[0].type_name = CORBA::string_dup (TYPE_A);
- this->consumer_admin_->subscription_change (added, removed ACE_ENV_ARG_PARAMETER);
+ this->consumer_admin_->subscription_change (added, removed);
// Setup the Consumer 1 to receive event_type : "domain_B", "Type_b"
CosNotification::EventTypeSeq added_1(1);
@@ -203,8 +192,7 @@ Subscribe::send_events (void)
added_1.length (1);
removed_1.length (0);
- this->consumer_1_->get_proxy_supplier ()->subscription_change (added_1, removed_1
- ACE_ENV_ARG_PARAMETER);
+ this->consumer_1_->get_proxy_supplier ()->subscription_change (added_1, removed_1);
// Setup the Consumer 2 to receive event_type : "domain_C", "Type_c"
CosNotification::EventTypeSeq added_2(1);
@@ -215,8 +203,7 @@ Subscribe::send_events (void)
added_2.length (1);
removed_2.length (0);
- this->consumer_2_->get_proxy_supplier ()->subscription_change (added_2, removed_2
- ACE_ENV_ARG_PARAMETER);
+ this->consumer_2_->get_proxy_supplier ()->subscription_change (added_2, removed_2);
// Create the events - one of each type
// Event 1
@@ -255,9 +242,9 @@ Subscribe::send_events (void)
// let supplier 1 send all these events
for (int i = 0; i < 1; ++i)
{
- supplier_1_->send_event (event1 ACE_ENV_ARG_PARAMETER);
- supplier_1_->send_event (event2 ACE_ENV_ARG_PARAMETER);
- supplier_1_->send_event (event3 ACE_ENV_ARG_PARAMETER);
+ supplier_1_->send_event (event1);
+ supplier_1_->send_event (event2);
+ supplier_1_->send_event (event3);
}
}
@@ -273,27 +260,25 @@ Subscribe_StructuredPushConsumer::~Subscribe_StructuredPushConsumer ()
void
Subscribe_StructuredPushConsumer::connect
- (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin
- ACE_ENV_ARG_DECL)
+ (CosNotifyChannelAdmin::ConsumerAdmin_ptr consumer_admin)
{
// Activate the consumer with the default_POA_
CosNotifyComm::StructuredPushConsumer_var objref =
this->_this ();
CosNotifyChannelAdmin::ProxySupplier_var proxysupplier =
- consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_ ACE_ENV_ARG_PARAMETER);
+ consumer_admin->obtain_notification_push_supplier (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_supplier_id_);
ACE_ASSERT (!CORBA::is_nil (proxysupplier.in ()));
// narrow
this->proxy_supplier_ =
CosNotifyChannelAdmin::StructuredProxyPushSupplier::
- _narrow (proxysupplier.in () ACE_ENV_ARG_PARAMETER);
+ _narrow (proxysupplier.in ());
ACE_ASSERT (!CORBA::is_nil (proxy_supplier_.in ()));
- proxy_supplier_->connect_structured_push_consumer (objref.in ()
- ACE_ENV_ARG_PARAMETER);
+ proxy_supplier_->connect_structured_push_consumer (objref.in ());
}
void
@@ -307,7 +292,7 @@ void
Subscribe_StructuredPushConsumer::offer_change
(const CosNotification::EventTypeSeq & /*added*/,
const CosNotification::EventTypeSeq & /*removed*/
- ACE_ENV_ARG_DECL_NOT_USED)
+ )
ACE_THROW_SPEC ((
CORBA::SystemException,
CosNotifyComm::InvalidEventType
@@ -318,8 +303,7 @@ Subscribe_StructuredPushConsumer::offer_change
void
Subscribe_StructuredPushConsumer::push_structured_event
- (const CosNotification::StructuredEvent & notification
- ACE_ENV_ARG_DECL_NOT_USED)
+ (const CosNotification::StructuredEvent & notification)
ACE_THROW_SPEC ((
CORBA::SystemException,
CosEventComm::Disconnected
@@ -366,25 +350,23 @@ Subscribe_StructuredPushSupplier::~Subscribe_StructuredPushSupplier ()
void
Subscribe_StructuredPushSupplier::connect
- (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin
- ACE_ENV_ARG_DECL)
+ (CosNotifyChannelAdmin::SupplierAdmin_ptr supplier_admin)
{
CosNotifyComm::StructuredPushSupplier_var objref =
this->_this ();
CosNotifyChannelAdmin::ProxyConsumer_var proxyconsumer =
- supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_ ACE_ENV_ARG_PARAMETER);
+ supplier_admin->obtain_notification_push_consumer (CosNotifyChannelAdmin::STRUCTURED_EVENT, proxy_consumer_id_);
ACE_ASSERT (!CORBA::is_nil (proxyconsumer.in ()));
// narrow
this->proxy_consumer_ =
- CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in () ACE_ENV_ARG_PARAMETER);
+ CosNotifyChannelAdmin::StructuredProxyPushConsumer::_narrow (proxyconsumer.in ());
ACE_ASSERT (!CORBA::is_nil (proxy_consumer_.in ()));
- proxy_consumer_->connect_structured_push_supplier (objref.in ()
- ACE_ENV_ARG_PARAMETER);
+ proxy_consumer_->connect_structured_push_supplier (objref.in ());
}
void
@@ -399,7 +381,7 @@ void
Subscribe_StructuredPushSupplier::subscription_change
(const CosNotification::EventTypeSeq & /*added*/,
const CosNotification::EventTypeSeq & /*removed */
- ACE_ENV_ARG_DECL_NOT_USED)
+ )
ACE_THROW_SPEC ((
CORBA::SystemException,
CosNotifyComm::InvalidEventType
@@ -410,12 +392,11 @@ Subscribe_StructuredPushSupplier::subscription_change
void
Subscribe_StructuredPushSupplier::send_event
- (const CosNotification::StructuredEvent& event
- ACE_ENV_ARG_DECL)
+ (const CosNotification::StructuredEvent& event)
{
ACE_ASSERT (!CORBA::is_nil (this->proxy_consumer_.in ()));
- proxy_consumer_->push_structured_event (event ACE_ENV_ARG_PARAMETER);
+ proxy_consumer_->push_structured_event (event);
}
void
View Lorry Controller Status