diff options
Diffstat (limited to 'TAO/tests/DynAny_Test/test_dynenum.cpp')
| -rw-r--r-- | TAO/tests/DynAny_Test/test_dynenum.cpp | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/TAO/tests/DynAny_Test/test_dynenum.cpp b/TAO/tests/DynAny_Test/test_dynenum.cpp index b0b04b65927..1b8b4d77894 100644 --- a/TAO/tests/DynAny_Test/test_dynenum.cpp +++ b/TAO/tests/DynAny_Test/test_dynenum.cpp @@ -49,13 +49,13 @@ Test_DynEnum::run_test (void) "testing: constructor(Any)/set_as_string/get_as_ulong\n")); CORBA::Object_var factory_obj = - this->orb_->resolve_initial_references ("DynAnyFactory", - ACE_TRY_ENV); + this->orb_->resolve_initial_references ("DynAnyFactory" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynAnyFactory_var dynany_factory = - DynamicAny::DynAnyFactory::_narrow (factory_obj.in (), - ACE_TRY_ENV); + DynamicAny::DynAnyFactory::_narrow (factory_obj.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (dynany_factory.in ())) @@ -69,17 +69,17 @@ Test_DynEnum::run_test (void) CORBA_Any in_any1; in_any1 <<= te; DynamicAny::DynAny_var dp1 = - dynany_factory->create_dyn_any (in_any1, - ACE_TRY_ENV); + dynany_factory->create_dyn_any (in_any1 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - DynamicAny::DynEnum_var de1 = - DynamicAny::DynEnum::_narrow (dp1.in (), - ACE_TRY_ENV); + DynamicAny::DynEnum_var de1 = + DynamicAny::DynEnum::_narrow (dp1.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - de1->set_as_string ("TE_FIRST", - ACE_TRY_ENV); + de1->set_as_string ("TE_FIRST" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::ULong ul_out1 = de1->get_as_ulong (ACE_TRY_ENV); + CORBA::ULong ul_out1 = de1->get_as_ulong (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ul_out1 == 1) @@ -95,10 +95,10 @@ Test_DynEnum::run_test (void) ACE_DEBUG ((LM_DEBUG, "testing: set_as_ulong/get_as_string\n")); - de1->set_as_ulong (3, - ACE_TRY_ENV); + de1->set_as_ulong (3 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA::String_var s = de1->get_as_string (ACE_TRY_ENV); + CORBA::String_var s = de1->get_as_string (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (ACE_OS::strcmp (s.in (), "TE_THIRD") == 0) @@ -116,13 +116,13 @@ Test_DynEnum::run_test (void) "testing: constructor(TypeCode)/from_any/to_any\n")); DynamicAny::DynAny_var de2_base = - dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_enum, - ACE_TRY_ENV); + dynany_factory->create_dyn_any_from_type_code (DynAnyTests::_tc_test_enum + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; DynamicAny::DynEnum_var de2 = - DynamicAny::DynEnum::_narrow (de2_base.in (), - ACE_TRY_ENV); + DynamicAny::DynEnum::_narrow (de2_base.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (de2.in ())) @@ -134,10 +134,10 @@ Test_DynEnum::run_test (void) CORBA_Any in_any2; in_any2 <<= DynAnyTests::TE_THIRD; - de2->from_any (in_any2, - ACE_TRY_ENV); + de2->from_any (in_any2 + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - CORBA_Any_var out_any1 = de2->to_any (ACE_TRY_ENV); + CORBA_Any_var out_any1 = de2->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; out_any1.in () >>= te; @@ -151,9 +151,9 @@ Test_DynEnum::run_test (void) ++this->error_count_; } - de1->destroy (ACE_TRY_ENV); + de1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - de2->destroy (ACE_TRY_ENV); + de2->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |