diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Trading/Offer_Importer.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/Offer_Importer.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp index 7debd543db3..440f470bda9 100644 --- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp +++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp @@ -12,7 +12,7 @@ TAO_Offer_Importer::TAO_Offer_Importer (CosTrading::Lookup_ptr lookup_if, } void -TAO_Offer_Importer::perform_queries (CORBA::Environment& ACE_TRY_ENV) +TAO_Offer_Importer::perform_queries (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -34,12 +34,12 @@ TAO_Offer_Importer::perform_queries (CORBA::Environment& ACE_TRY_ENV) policies.return_card (16*NUM_OFFERS); policies.link_follow_rule (CosTrading::always); - this->perform_queries_with_policies (policies, ACE_TRY_ENV); + this->perform_queries_with_policies (policies TAO_ENV_ARG_PARAMETER); // ACE_CHECK; } void -TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV) +TAO_Offer_Importer::perform_directed_queries (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -63,7 +63,7 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV) if (this->verbose_) ACE_DEBUG ((LM_DEBUG, "Obtaining link interface.\n")); - CosTrading::Link_var link_if = this->lookup_->link_if (ACE_TRY_ENV); + CosTrading::Link_var link_if = this->lookup_->link_if (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose_) @@ -71,7 +71,7 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV) ACE_DEBUG ((LM_DEBUG, "Obtaining references to traders directly" " linked to the root trader.\n")); } - CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (ACE_TRY_ENV); + CosTrading::LinkNameSeq_var link_name_seq = link_if->list_links (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (link_name_seq->length () > 0) @@ -83,14 +83,14 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV) } CosTrading::Link::LinkInfo_var link_info = - link_if->describe_link (link_name_seq[0u], ACE_TRY_ENV); + link_if->describe_link (link_name_seq[0u] TAO_ENV_ARG_PARAMETER); ACE_CHECK; CosTrading::Lookup_ptr lookup_if = link_info->target.in (); - CosTrading::Link_var link_if2 = lookup_if->link_if (ACE_TRY_ENV); + CosTrading::Link_var link_if2 = lookup_if->link_if (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CosTrading::LinkNameSeq_var link_name_seq2 = link_if2->list_links (ACE_TRY_ENV); + CosTrading::LinkNameSeq_var link_name_seq2 = link_if2->list_links (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (link_name_seq2->length () > 0) @@ -117,7 +117,7 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV) policies.starting_trader (new CosTrading::TraderName (2, 2, trader_name, 1)); - this->perform_queries_with_policies (policies, ACE_TRY_ENV); + this->perform_queries_with_policies (policies TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -137,8 +137,8 @@ TAO_Offer_Importer::perform_directed_queries (CORBA::Environment& ACE_TRY_ENV) void TAO_Offer_Importer:: -perform_queries_with_policies (const TAO_Policy_Creator& policies, - CORBA::Environment& ACE_TRY_ENV) +perform_queries_with_policies (const TAO_Policy_Creator& policies + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, CosTrading::IllegalServiceType, CosTrading::UnknownServiceType, @@ -189,8 +189,8 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies, 8, offer_seq_out, offer_iterator_out, - limits_applied_out, - ACE_TRY_ENV); + limits_applied_out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosTrading::OfferSeq_var offer_seq (offer_seq_ptr); @@ -201,8 +201,8 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies, { ACE_DEBUG ((LM_DEBUG, "*** Results:\n\n")); this->display_results (*offer_seq_ptr, - offer_iterator_ptr, - ACE_TRY_ENV); + offer_iterator_ptr + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (limits_applied_out->length () > 0) @@ -227,8 +227,8 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies, void TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, - CosTrading::OfferIterator_ptr offer_iterator, - CORBA::Environment& ACE_TRY_ENV) const + CosTrading::OfferIterator_ptr offer_iterator + TAO_ENV_ARG_DECL) const ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY @@ -241,14 +241,14 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, { // Call back to the exported object. TAO_Trader_Test::Remote_Output_var remote_output = - TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in (), - ACE_TRY_ENV); + TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - remote_output->confirm (ACE_TRY_ENV); + remote_output->confirm (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - TT_Info::dump_properties (offer_seq[i].properties, 1, ACE_TRY_ENV); + TT_Info::dump_properties (offer_seq[i].properties, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "------------------------------\n")); } @@ -266,8 +266,8 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, CosTrading::OfferSeq_out iter_offers_out (iter_offers_ptr); any_left = offer_iterator->next_n (length, - iter_offers_out, - ACE_TRY_ENV); + iter_offers_out + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CosTrading::OfferSeq_var iter_offers (iter_offers_ptr); @@ -275,15 +275,15 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, { // Call back to the exported object. TAO_Trader_Test::Remote_Output_var remote_output = - TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in (), - ACE_TRY_ENV); + TAO_Trader_Test::Remote_Output::_narrow (offer_seq[i].reference.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - remote_output->confirm (ACE_TRY_ENV); + remote_output->confirm (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CosTrading::PropertySeq& props = iter_offers[i].properties; - TT_Info::dump_properties (props, 1, ACE_TRY_ENV); + TT_Info::dump_properties (props, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "------------------------------\n")); @@ -291,7 +291,7 @@ TAO_Offer_Importer::display_results (const CosTrading::OfferSeq& offer_seq, } while (any_left); - offer_iterator->destroy (ACE_TRY_ENV); + offer_iterator->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } |