diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Trading/export_test.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/Trading/export_test.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp index ff031a1c450..34801bf7be1 100644 --- a/TAO/orbsvcs/tests/Trading/export_test.cpp +++ b/TAO/orbsvcs/tests/Trading/export_test.cpp @@ -16,7 +16,7 @@ main (int argc, char** argv) ACE_TRY_NEW_ENV { TAO_ORB_Manager orb_manager; - orb_manager.init (argc, argv, ACE_TRY_ENV); + orb_manager.init (argc, argv TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Command line argument interpretation. @@ -29,7 +29,7 @@ main (int argc, char** argv) char* ior = parse_args.ior (); CORBA::Object_var trading_obj = (ior == 0) ? orb->resolve_initial_references ("TradingService") : - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (trading_obj.in ())) @@ -40,86 +40,86 @@ main (int argc, char** argv) // Narrow the lookup interface. ACE_DEBUG ((LM_DEBUG, "*** Narrowing the lookup interface.\n")); CosTrading::Lookup_var lookup_if = - CosTrading::Lookup::_narrow (trading_obj.in (), ACE_TRY_ENV); + CosTrading::Lookup::_narrow (trading_obj.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Run the Service Type Exporter tests ACE_DEBUG ((LM_DEBUG, "*** Running the Service Type Exporter tests.\n")); TAO_Service_Type_Exporter type_exporter (lookup_if.in (), - ! parse_args.quiet (), - ACE_TRY_ENV); + ! parse_args.quiet () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - type_exporter.remove_all_types (ACE_TRY_ENV); + type_exporter.remove_all_types (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - type_exporter.add_all_types (ACE_TRY_ENV); + type_exporter.add_all_types (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - type_exporter.remove_all_types (ACE_TRY_ENV); + type_exporter.remove_all_types (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - type_exporter.add_all_types (ACE_TRY_ENV); + type_exporter.add_all_types (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args.federated ()) { - type_exporter.add_all_types_to_all (ACE_TRY_ENV); + type_exporter.add_all_types_to_all (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - type_exporter.list_all_types (ACE_TRY_ENV); + type_exporter.list_all_types (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - type_exporter.describe_all_types (ACE_TRY_ENV); + type_exporter.describe_all_types (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - type_exporter.fully_describe_all_types (ACE_TRY_ENV); + type_exporter.fully_describe_all_types (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "*** Service Type Exporter tests complete.\n")); // Run the Offer Exporter tests ACE_DEBUG ((LM_DEBUG, "*** Running the Offer Exporter tests.\n")); - TAO_Offer_Exporter offer_exporter (lookup_if.in (), ! parse_args.quiet (), ACE_TRY_ENV); + TAO_Offer_Exporter offer_exporter (lookup_if.in (), ! parse_args.quiet () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // = Test series. - offer_exporter.withdraw_offers (ACE_TRY_ENV); + offer_exporter.withdraw_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.export_offers (ACE_TRY_ENV); + offer_exporter.export_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.describe_offers (ACE_TRY_ENV); + offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.modify_offers (ACE_TRY_ENV); + offer_exporter.modify_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.describe_offers (ACE_TRY_ENV); + offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.withdraw_offers_using_constraints (ACE_TRY_ENV); + offer_exporter.withdraw_offers_using_constraints (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.describe_offers (ACE_TRY_ENV); + offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.withdraw_offers (ACE_TRY_ENV); + offer_exporter.withdraw_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - offer_exporter.export_offers (ACE_TRY_ENV); + offer_exporter.export_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args.federated ()) { - offer_exporter.export_offers_to_all (ACE_TRY_ENV); + offer_exporter.export_offers_to_all (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - offer_exporter.describe_offers (ACE_TRY_ENV); + offer_exporter.describe_offers (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "*** Offer Exporter tests complete.\n")); @@ -143,7 +143,7 @@ main (int argc, char** argv) ACE_DEBUG ((LM_WARNING, "Unable to open %s for output.\n", file)); } - orb_manager.run (ACE_TRY_ENV); + orb_manager.run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |