diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Notify/Basic/Updates.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Notify/Basic/Updates.cpp | 122 |
1 files changed, 61 insertions, 61 deletions
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp index c103b0be690..d200b31c9ad 100644 --- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp +++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp @@ -17,7 +17,7 @@ void Update_StructuredPushConsumer::offer_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC (( CORBA::SystemException, @@ -27,14 +27,14 @@ Update_StructuredPushConsumer::offer_change ( if (added.length () > 0) { test_client_->offers_added_ = added.length (); - this->test_client_->end_test (TAO_ENV_SINGLE_ARG_PARAMETER); + this->test_client_->end_test (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } if (removed.length () > 0) { test_client_->offers_removed_ = removed.length (); - this->test_client_->end_test (TAO_ENV_SINGLE_ARG_PARAMETER); + this->test_client_->end_test (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -56,7 +56,7 @@ void Update_StructuredPushSupplier::subscription_change ( const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed - TAO_ENV_ARG_DECL + ACE_ENV_ARG_DECL ) ACE_THROW_SPEC ((CORBA::SystemException, CosNotifyComm::InvalidEventType)) @@ -64,14 +64,14 @@ Update_StructuredPushSupplier::subscription_change ( if (added.length () > 0) { test_client_->subscriptions_added_ = added.length (); - this->test_client_->end_test (TAO_ENV_SINGLE_ARG_PARAMETER); + this->test_client_->end_test (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } if (removed.length () > 0) { test_client_->subscriptions_removed_ = removed.length (); - this->test_client_->end_test (TAO_ENV_SINGLE_ARG_PARAMETER); + this->test_client_->end_test (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -89,34 +89,34 @@ Updates::~Updates () } int -Updates::init (int argc, - char* argv [] - TAO_ENV_ARG_DECL) +Updates::init (int argc, + char* argv [] + ACE_ENV_ARG_DECL) { // Initialize base class. - Notify_Test_Client::init (argc, - argv - TAO_ENV_ARG_PARAMETER); + Notify_Test_Client::init (argc, + argv + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); // Create all participents. - this->create_EC (TAO_ENV_SINGLE_ARG_PARAMETER); + this->create_EC (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); CosNotifyChannelAdmin::AdminID adminid; supplier_admin_ = - ec_->new_for_suppliers (this->ifgop_, - adminid - TAO_ENV_ARG_PARAMETER); + ec_->new_for_suppliers (this->ifgop_, + adminid + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_ASSERT (!CORBA::is_nil (supplier_admin_.in ())); consumer_admin_ = - ec_->new_for_consumers (this->ifgop_, - adminid - TAO_ENV_ARG_PARAMETER); + ec_->new_for_consumers (this->ifgop_, + adminid + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_ASSERT (!CORBA::is_nil (consumer_admin_.in ())); @@ -124,33 +124,33 @@ Updates::init (int argc, ACE_NEW_RETURN (consumer_, Update_StructuredPushConsumer (this), -1); - consumer_->init (root_poa_.in () - TAO_ENV_ARG_PARAMETER); + consumer_->init (root_poa_.in () + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - consumer_->connect (this->consumer_admin_.in () - TAO_ENV_ARG_PARAMETER); + consumer_->connect (this->consumer_admin_.in () + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); ACE_NEW_RETURN (supplier_, Update_StructuredPushSupplier (this), -1); - supplier_->init (root_poa_.in () - TAO_ENV_ARG_PARAMETER); + supplier_->init (root_poa_.in () + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - supplier_->connect (this->supplier_admin_.in () - TAO_ENV_ARG_PARAMETER); + supplier_->connect (this->supplier_admin_.in () + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); return 0; } int -Updates::parse_args (int argc, +Updates::parse_args (int argc, char *argv[]) { - ACE_Arg_Shifter arg_shifter (argc, + ACE_Arg_Shifter arg_shifter (argc, argv); const char *current_arg = 0; @@ -168,7 +168,7 @@ Updates::parse_args (int argc, ACE_DEBUG ((LM_DEBUG, "usage: %s " "-updates update_count \n", - argv[0], + argv[0], argv[0])); arg_shifter.consume_arg (); @@ -185,21 +185,21 @@ Updates::parse_args (int argc, } void -Updates::create_EC (TAO_ENV_SINGLE_ARG_DECL) +Updates::create_EC (ACE_ENV_SINGLE_ARG_DECL) { CosNotifyChannelAdmin::ChannelID id; ec_ = notify_factory_->create_channel (initial_qos_, initial_admin_, id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_ASSERT (!CORBA::is_nil (ec_.in ())); } void -Updates::run_test (TAO_ENV_SINGLE_ARG_DECL) +Updates::run_test (ACE_ENV_SINGLE_ARG_DECL) { CosNotification::EventTypeSeq added (update_count_), removed (update_count_); added.length (update_count_); @@ -220,16 +220,16 @@ Updates::run_test (TAO_ENV_SINGLE_ARG_DECL) // Test added. this->supplier_->get_proxy_consumer ()->offer_change ( - added, - removed - TAO_ENV_ARG_PARAMETER + added, + removed + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; this->consumer_->get_proxy_supplier ()->subscription_change ( - added, + added, removed - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; @@ -240,40 +240,40 @@ Updates::run_test (TAO_ENV_SINGLE_ARG_DECL) for (i = 0; i < update_count_; ++i) { - ACE_OS::sprintf (update_test_buf, - "%s_%d", - this->domain_name_, + ACE_OS::sprintf (update_test_buf, + "%s_%d", + this->domain_name_, i); removed[i].domain_name = CORBA::string_dup (update_test_buf); - ACE_OS::sprintf (update_test_buf, - "%s_%d", - this->type_name_, + ACE_OS::sprintf (update_test_buf, + "%s_%d", + this->type_name_, i); removed[i].type_name = CORBA::string_dup (update_test_buf); } this->supplier_->get_proxy_consumer ()->offer_change ( - added, - removed - TAO_ENV_ARG_PARAMETER + added, + removed + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; this->consumer_->get_proxy_supplier ()->subscription_change ( - added, + added, removed - TAO_ENV_ARG_PARAMETER + ACE_ENV_ARG_PARAMETER ); ACE_CHECK; } void -Updates::end_test (TAO_ENV_SINGLE_ARG_DECL) +Updates::end_test (ACE_ENV_SINGLE_ARG_DECL) { if (++this->result_count_ == 4) { - this->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -282,16 +282,16 @@ int Updates::check_results (void) { // Destroy the channel. - TAO_ENV_DECLARE_NEW_ENV; - this->ec_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + ACE_DECLARE_NEW_CORBA_ENV; + this->ec_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "offers_added_ = %d, offers_removed_ = %d, " "subscriptions_added_= %d, subscriptions_removed_ = %d\n", - offers_added_, - offers_removed_, - subscriptions_added_, + offers_added_, + offers_removed_, + subscriptions_added_, subscriptions_removed_)); if (offers_added_ == update_count_ && @@ -303,7 +303,7 @@ Updates::check_results (void) } else { - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, "Updates test failed!\n")); return 1; } @@ -323,12 +323,12 @@ main (int argc, char* argv[]) ACE_TRY_NEW_ENV { - updates.init (argc, + updates.init (argc, argv - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - updates.run_test (TAO_ENV_SINGLE_ARG_PARAMETER); + updates.run_test (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; updates.ORB_run (); |