summaryrefslogtreecommitdiff
path: root/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp')
-rw-r--r--TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp68
1 files changed, 34 insertions, 34 deletions
diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
index c2b2605dd4d..124ffcb5e2e 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
@@ -12,47 +12,47 @@ ACE_RCSID(EC_Tests, Disconnect, "$Id$")
static void run_test (PortableServer::POA_ptr poa,
int use_callbacks
- TAO_ENV_ARG_DECL);
+ ACE_ENV_ARG_DECL);
int
main (int argc, char* argv[])
{
TAO_EC_Default_Factory::init_svcs ();
- TAO_ENV_DECLARE_NEW_ENV;
+ ACE_DECLARE_NEW_CORBA_ENV;
ACE_TRY
{
// ORB initialization boiler plate...
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;
CORBA::Object_var object =
- orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER);
+ orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
PortableServer::POA_var poa =
- PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
+ PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
PortableServer::POAManager_var poa_manager =
- poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
+ poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
- poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+ poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
// ****************************************************************
- run_test (poa.in (), 0 TAO_ENV_ARG_PARAMETER);
+ run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- run_test (poa.in (), 1 TAO_ENV_ARG_PARAMETER);
+ run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
// ****************************************************************
- poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
+ poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
ACE_TRY_CHECK;
- orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_TRY_CHECK;
}
@@ -69,44 +69,44 @@ main (int argc, char* argv[])
void
deactivate_servant (PortableServer::Servant servant
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
{
PortableServer::POA_var poa =
- servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
+ servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
PortableServer::ObjectId_var id =
- poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER);
+ poa->servant_to_id (servant 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
run_test (PortableServer::POA_ptr poa,
int use_callbacks
- TAO_ENV_ARG_DECL)
+ ACE_ENV_ARG_DECL)
{
TAO_EC_Event_Channel_Attributes attributes (poa, poa);
attributes.disconnect_callbacks = use_callbacks;
TAO_EC_Event_Channel ec_impl (attributes);
- ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER);
+ ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
RtecEventChannelAdmin::EventChannel_var event_channel =
- ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
+ ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
// ****************************************************************
// Obtain the consumer admin..
RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
- event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER);
+ event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
// and the supplier admin..
RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
- event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER);
+ event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
// ****************************************************************
@@ -134,55 +134,55 @@ run_test (PortableServer::POA_ptr poa,
{
supplier_0.connect (supplier_admin.in (),
supplier_qos.get_SupplierQOS ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
consumer_0.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
if (i % 2 == 1)
{
supplier_1.connect (supplier_admin.in (),
supplier_qos.get_SupplierQOS ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
consumer_1.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
}
- supplier_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+ supplier_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
- consumer_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+ consumer_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
if (i % 2 == 1)
{
- consumer_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+ consumer_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
- supplier_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
+ supplier_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
}
}
supplier_0.connect (supplier_admin.in (),
supplier_qos.get_SupplierQOS ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
consumer_0.connect (consumer_admin.in (),
consumer_qos.get_ConsumerQOS ()
- TAO_ENV_ARG_PARAMETER);
+ ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
- event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
+ event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
ACE_CHECK;
- deactivate_servant (&supplier_0 TAO_ENV_ARG_PARAMETER);
+ deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
- deactivate_servant (&consumer_0 TAO_ENV_ARG_PARAMETER);
+ deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
- deactivate_servant (&ec_impl TAO_ENV_ARG_PARAMETER);
+ deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER);
ACE_CHECK;
CORBA::ULong count_0 = 1;