diff options
Diffstat (limited to 'TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp | 552 |
1 files changed, 276 insertions, 276 deletions
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp index 959b01cc9df..89544592930 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp @@ -56,7 +56,7 @@ Admin_Client::init (int argc, this->orb_ = CORBA::ORB_init (argc, argv, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int retval = this->parse_args (argc, @@ -67,7 +67,7 @@ Admin_Client::init (int argc, CORBA::Object_var object = this->orb_->resolve_initial_references ("InterfaceRepository" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (object.in ())) @@ -82,7 +82,7 @@ Admin_Client::init (int argc, this->repo_ = CORBA::Repository::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (this->repo_.in ())) @@ -117,7 +117,7 @@ Admin_Client::run (void) // CORBA::BAD_PARAM exception the second time. for (CORBA::ULong j = 0; j < this->iterations_; ++j) { - (this->*test_array_[i])(TAO_ENV_SINGLE_ARG_PARAMETER); + (this->*test_array_[i])(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -126,7 +126,7 @@ Admin_Client::run (void) { for (CORBA::ULong j = 0; j < this->iterations_; ++j) { - (this->*test_array_[this->which_test_])(TAO_ENV_SINGLE_ARG_PARAMETER); + (this->*test_array_[this->which_test_])(ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -193,7 +193,7 @@ Admin_Client::parse_args (int argc, } void -Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL) +Admin_Client::array_test (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -201,15 +201,15 @@ Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL) )); CORBA::IDLType_var atype = this->repo_->create_string (7 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ArrayDef_var avar = this->repo_->create_array (5, atype.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::ULong bound = avar->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong bound = avar->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -219,10 +219,10 @@ Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (bound == 5); - CORBA::TypeCode_var tc = avar->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = avar->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -232,9 +232,9 @@ Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (kind == CORBA::tk_array); - tc = avar->element_type (TAO_ENV_SINGLE_ARG_PARAMETER); + tc = avar->element_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -244,9 +244,9 @@ Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (kind == CORBA::tk_string); - CORBA::IDLType_var tdef = avar->element_type_def (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::IDLType_var tdef = avar->element_type_def (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::DefinitionKind dk = tdef->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind dk = tdef->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -259,9 +259,9 @@ Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (dk == CORBA::dk_String); CORBA::StringDef_var pvar = CORBA::StringDef::_narrow (tdef.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - bound = pvar->bound (TAO_ENV_SINGLE_ARG_PARAMETER); + bound = pvar->bound (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -273,19 +273,19 @@ Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL) CORBA::PrimitiveDef_var pdef = this->repo_->get_primitive (CORBA::pk_short - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; avar->element_type_def (pdef.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("ArrayDef::element_type_def (set)\n"))); - tc = avar->type (TAO_ENV_SINGLE_ARG_PARAMETER); + tc = avar->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -295,9 +295,9 @@ Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (kind == CORBA::tk_array); - tdef = avar->element_type_def (TAO_ENV_SINGLE_ARG_PARAMETER); + tdef = avar->element_type_def (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - dk = tdef->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + dk = tdef->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -309,9 +309,9 @@ Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL) CORBA::PrimitiveDef_var zvar = CORBA::PrimitiveDef::_narrow (tdef.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::PrimitiveKind pkind = zvar->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::PrimitiveKind pkind = zvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -321,12 +321,12 @@ Admin_Client::array_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (pkind == CORBA::pk_short); - avar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + avar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL) +Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -344,10 +344,10 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL) "my_enum", "1.0", members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var str = evar->id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var str = evar->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -357,7 +357,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0")); - str = evar->name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = evar->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -367,7 +367,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_enum")); - str = evar->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = evar->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -377,7 +377,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_enum")); - str = evar->version (TAO_ENV_SINGLE_ARG_PARAMETER); + str = evar->version (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -387,7 +387,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "1.0")); - CORBA::DefinitionKind dkind = evar->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind dkind = evar->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -397,7 +397,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (dkind == CORBA::dk_Enum); - CORBA::Contained::Description_var desc = evar->describe (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Contained::Description_var desc = evar->describe (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; dkind = desc->kind; @@ -440,7 +440,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (td->version, "1.0")); - CORBA::TCKind kind = td->type->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = td->type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -450,7 +450,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (kind == CORBA::tk_enum); - str = td->type->id (TAO_ENV_SINGLE_ARG_PARAMETER); + str = td->type->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -460,7 +460,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_enum:1.0")); - str = td->type->name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = td->type->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -485,7 +485,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL) for (i = 0; i < count; i++) { - str = td->type->member_name (i TAO_ENV_ARG_PARAMETER); + str = td->type->member_name (i ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -506,14 +506,14 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL) members[3] = CORBA::string_dup ("TRINITY"); evar->members (members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nEnumDef::members (set)\n\n"))); - CORBA::EnumMemberSeq_var fellows = evar->members (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::EnumMemberSeq_var fellows = evar->members (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; count = fellows->length (); @@ -534,9 +534,9 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL) } evar->name ("another_enum" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - str = evar->name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = evar->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -550,7 +550,7 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "another_enum")); - str = evar->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = evar->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -560,12 +560,12 @@ Admin_Client::enum_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::another_enum")); - evar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + evar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) +Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -575,13 +575,13 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) // This test also tests WstringDef and SequenceDef. CORBA::IDLType_var sq_elem = this->repo_->create_wstring (7 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::SequenceDef_var sq_var = this->repo_->create_sequence (5, sq_elem.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::AliasDef_var a_var = @@ -589,10 +589,10 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) "my_alias", "1.0", sq_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var str = a_var->id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var str = a_var->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -602,7 +602,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0")); - str = a_var->name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = a_var->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -612,7 +612,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_alias")); - str = a_var->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = a_var->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -622,7 +622,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_alias")); - str = a_var->version (TAO_ENV_SINGLE_ARG_PARAMETER); + str = a_var->version (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -637,10 +637,10 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) ACE_TEXT ("AliasDef::version (set)\n"))); a_var->version ("1.1" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - str = a_var->version (TAO_ENV_SINGLE_ARG_PARAMETER); + str = a_var->version (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -650,10 +650,10 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "1.1")); - CORBA::TypeCode_var tc = a_var->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = a_var->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - str = tc->name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = tc->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -663,7 +663,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_alias")); - CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -673,10 +673,10 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (kind == CORBA::tk_alias); - CORBA::TypeCode_var ct = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var ct = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - kind = ct->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + kind = ct->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -686,7 +686,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (kind == CORBA::tk_sequence); - CORBA::ULong length = ct->length (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong length = ct->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -696,10 +696,10 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (length == 5); - CORBA::TypeCode_var ct2 = ct->content_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var ct2 = ct->content_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - kind = ct2->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + kind = ct2->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -710,7 +710,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (kind == CORBA::tk_wstring); - length = ct2->length (TAO_ENV_SINGLE_ARG_PARAMETER); + length = ct2->length (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -721,7 +721,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (length == 7); - CORBA::Contained::Description_var desc = a_var->describe (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Contained::Description_var desc = a_var->describe (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeDescription *td; @@ -741,7 +741,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (td->version, "1.1")); - kind = td->type->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + kind = td->type->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -751,7 +751,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (kind == CORBA::tk_alias); - str = td->type->id (TAO_ENV_SINGLE_ARG_PARAMETER); + str = td->type->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -761,7 +761,7 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_alias:1.0")); - str = td->type->name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = td->type->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -771,15 +771,15 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_alias")); - CORBA::IDLType_var i_var = a_var->original_type_def (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::IDLType_var i_var = a_var->original_type_def (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::SequenceDef_var seq_var = CORBA::SequenceDef::_narrow (i_var.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - length = seq_var->bound (TAO_ENV_SINGLE_ARG_PARAMETER); + length = seq_var->bound (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -789,12 +789,12 @@ Admin_Client::alias_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (length == 5); - a_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + a_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::native_test (TAO_ENV_SINGLE_ARG_DECL) +Admin_Client::native_test (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -805,10 +805,10 @@ Admin_Client::native_test (TAO_ENV_SINGLE_ARG_DECL) this->repo_->create_native ("IDL:my_native:1.0", "my_native", "1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var str = nvar->id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var str = nvar->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -818,7 +818,7 @@ Admin_Client::native_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "IDL:my_native:1.0")); - str = nvar->name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = nvar->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -828,7 +828,7 @@ Admin_Client::native_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "my_native")); - str = nvar->version (TAO_ENV_SINGLE_ARG_PARAMETER); + str = nvar->version (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -838,7 +838,7 @@ Admin_Client::native_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "1.0")); - str = nvar->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = nvar->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -848,7 +848,7 @@ Admin_Client::native_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_native")); - CORBA::DefinitionKind kind = nvar->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind kind = nvar->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -858,12 +858,12 @@ Admin_Client::native_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (kind == CORBA::dk_Native); - nvar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + nvar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) +Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -875,13 +875,13 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) members[0].name = CORBA::string_dup ("ub_string"); members[0].type_def = this->repo_->get_primitive (CORBA::pk_string - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); members[1].name = CORBA::string_dup ("bd_string"); members[1].type_def = this->repo_->create_string (5 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); @@ -898,7 +898,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) "my_enum", "1.0", e_members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; members[2].type_def = CORBA::EnumDef::_duplicate (e_var.in ()); members[2].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); @@ -908,14 +908,14 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) "my_struct", "1.0", members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; // This also tests the members() function. - CORBA::TypeCode_var tc = svar->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = svar->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::ULong length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -930,7 +930,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) for (i = 0; i < length; i++) { - str = tc->member_name (i TAO_ENV_ARG_PARAMETER); + str = tc->member_name (i ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -942,7 +942,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), members[i].name)); } - CORBA::Contained::Description_var desc = svar->describe (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Contained::Description_var desc = svar->describe (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::TypeDescription *td; @@ -972,7 +972,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) members.length (2); members[0].name = CORBA::string_dup ("long_mem"); members[0].type_def = this->repo_->get_primitive (CORBA::pk_long - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); @@ -980,12 +980,12 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) members[1].type_def = this->repo_->create_array (5, members[0].type_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); svar->members (members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1002,10 +1002,10 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) "my_enum", "1.0", def_members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::StructMemberSeq_var out_members = svar->members (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::StructMemberSeq_var out_members = svar->members (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; length = out_members->length (); @@ -1025,10 +1025,10 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Contained_var fox = this->repo_->lookup ("::my_struct::my_enum" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - str = fox->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = fox->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1039,10 +1039,10 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_struct::my_enum")); fox = svar->lookup ("my_enum" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - str = fox->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = fox->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1052,13 +1052,13 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_struct::my_enum")); - CORBA::Container_var outer = fox->defined_in (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Container_var outer = fox->defined_in (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Contained_var schizo = CORBA::Contained::_narrow (outer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - str = schizo->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = schizo->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1071,7 +1071,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) CORBA::ContainedSeq_var contents = this->repo_->contents (CORBA::dk_all, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; length = contents->length (); @@ -1085,7 +1085,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) contents = svar->contents (CORBA::dk_all, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; length = contents->length (); @@ -1099,7 +1099,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) for (i = 0; i < length; ++i) { - str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1124,7 +1124,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) -1, CORBA::dk_all, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; length = contents->length (); @@ -1138,7 +1138,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) for (i = 0; i < length; i++) { - str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1157,7 +1157,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) this->repo_->describe_contents (CORBA::dk_all, 0, -1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; length = cont_desc->length (); @@ -1174,7 +1174,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) CORBA::TypeDescription *td; cont_desc[i].value >>= td; - str = td->type->id (TAO_ENV_SINGLE_ARG_PARAMETER); + str = td->type->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1212,7 +1212,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) } svar->name ("your_struct" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1221,7 +1221,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) contents = svar->contents (CORBA::dk_all, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; length = contents->length (); @@ -1237,7 +1237,7 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) for (i = 0; i < length; i++) { - str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1260,14 +1260,14 @@ Admin_Client::struct_test (TAO_ENV_SINGLE_ARG_DECL) ACE_UNUSED_ARG (tmp); #endif /* ACE_NDEBUG */ - e_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + e_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - svar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + svar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL) +Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -1287,14 +1287,14 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL) "disc_enum", "1.0", d_members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::StructMemberSeq s_members (1); s_members.length (1); s_members[0].name = CORBA::string_dup ("string_in_struct"); s_members[0].type_def = this->repo_->create_string (6 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; s_members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); @@ -1303,7 +1303,7 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL) "struct_in_union", "1.0", s_members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::UnionMemberSeq u_members (4); @@ -1311,10 +1311,10 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL) u_members[0].name = CORBA::string_dup ("longval"); u_members[0].type_def = this->repo_->get_primitive (CORBA::pk_long - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; u_members[0].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); - CORBA::TypeCode_var d_type = d_var->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var d_type = d_var->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; TAO_OutputCDR maker2; maker2.write_ulong (3); // THREE @@ -1326,7 +1326,7 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL) u_members[1].name = CORBA::string_dup ("longval"); u_members[1].type_def = this->repo_->get_primitive (CORBA::pk_long - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; u_members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); TAO_OutputCDR maker0; @@ -1351,7 +1351,7 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL) u_members[3].name = CORBA::string_dup ("stringval"); u_members[3].type_def = this->repo_->create_string (17 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; u_members[3].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void); u_members[3].label <<= CORBA::Any::from_octet (0); // default case (ONE) @@ -1362,13 +1362,13 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL) "1.0", d_var.in (), u_members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::TypeCode_var disc_tc = u_var->discriminator_type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var disc_tc = u_var->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::ULong length = disc_tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong length = disc_tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1380,10 +1380,10 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (length == 4); - CORBA::TypeCode_var tc = u_var->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = u_var->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1393,7 +1393,7 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (length == 3); - CORBA::Long slot = tc->default_index (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Long slot = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1409,7 +1409,7 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL) for (CORBA::ULong i = 0; i < length; i++) { str = tc->member_name (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1422,7 +1422,7 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), u_members[i + 1].name)); CORBA::Any_var label = tc->member_label (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; TAO_InputCDR cdr (label->_tao_get_cdr ()); @@ -1456,16 +1456,16 @@ Admin_Client::union_test (TAO_ENV_SINGLE_ARG_DECL) } } - u_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + u_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - s_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + s_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - d_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + d_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) +Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -1477,16 +1477,16 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) members[0].name = CORBA::string_dup ("ub_string"); members[0].type_def = this->repo_->get_primitive (CORBA::pk_string - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - members[0].type = members[0].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER); + members[0].type = members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; members[1].name = CORBA::string_dup ("bd_string"); members[1].type_def = this->repo_->create_string (5 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - members[1].type = members[1].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER); + members[1].type = members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::EnumMemberSeq e_members (2); @@ -1500,12 +1500,12 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) "my_enum", "1.0", e_members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; members[2].type_def = CORBA::EnumDef::_duplicate (e_var.in ()); - members[2].type = members[2].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER); + members[2].type = members[2].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::ExceptionDef_var exvar = @@ -1513,13 +1513,13 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) "my_exception", "1.0", members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::TypeCode_var tc = exvar->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = exvar->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::ULong length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1534,7 +1534,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) for (i = 0; i < length; i++) { - str = tc->member_name (i TAO_ENV_ARG_PARAMETER); + str = tc->member_name (i ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1546,7 +1546,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), members[i].name)); } - CORBA::Contained::Description_var desc = exvar->describe (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Contained::Description_var desc = exvar->describe (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::ExceptionDescription *ed; @@ -1583,23 +1583,23 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) members.length (2); members[0].name = CORBA::string_dup ("long_mem"); members[0].type_def = this->repo_->get_primitive (CORBA::pk_long - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - members[0].type = members[0].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER); + members[0].type = members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; members[1].name = CORBA::string_dup ("array_mem"); CORBA::ArrayDef_ptr a_ptr = this->repo_->create_array (5, members[0].type_def.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; members[1].type_def = a_ptr; - members[1].type = members[1].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER); + members[1].type = members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; exvar->members (members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1616,10 +1616,10 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) "my_enum", "1.0", def_members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::StructMemberSeq_var out_members = exvar->members (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::StructMemberSeq_var out_members = exvar->members (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; length = out_members->length (); @@ -1637,14 +1637,14 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (out_members[i].name, members[i].name)); } - a_ptr->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + a_ptr->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nArrayDef::destroy\n\n"))); - out_members = exvar->members (TAO_ENV_SINGLE_ARG_PARAMETER); + out_members = exvar->members (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; length = out_members->length (); @@ -1663,10 +1663,10 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Contained_var fox = this->repo_->lookup ("::my_exception::my_enum" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - str = fox->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = fox->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1677,10 +1677,10 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::my_exception::my_enum")); fox = exvar->lookup ("my_enum" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - str = fox->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = fox->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1692,7 +1692,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) CORBA::ContainedSeq_var contents = this->repo_->contents (CORBA::dk_all, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; length = contents->length (); @@ -1706,7 +1706,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) contents = exvar->contents (CORBA::dk_all, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; length = contents->length (); @@ -1720,7 +1720,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) for (i = 0; i < length; i++) { - str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1739,7 +1739,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) -1, CORBA::dk_all, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; length = contents->length (); @@ -1753,7 +1753,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) for (i = 0; i < length; i++) { - str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1771,7 +1771,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) this->repo_->describe_contents (CORBA::dk_all, 0, -1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; length = cont_desc->length (); @@ -1792,7 +1792,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) cont_desc[i].value >>= ed; CORBA::TypeCode_ptr tc = ed->type.in (); - length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1818,7 +1818,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) cont_desc[i].value >>= td; CORBA::TypeCode_ptr tc = td->type.in (); - length = tc->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + length = tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1842,7 +1842,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) } exvar->name ("your_exception" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1851,7 +1851,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) contents = exvar->contents (CORBA::dk_all, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; length = contents->length (); @@ -1859,7 +1859,7 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) for (i = 0; i < length; i++) { - str = contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1878,14 +1878,14 @@ Admin_Client::exception_test (TAO_ENV_SINGLE_ARG_DECL) ACE_UNUSED_ARG (tmp); #endif /* ACE_NDEBUG */ - e_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + e_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - exvar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + exvar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL) +Admin_Client::constant_test (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -1893,7 +1893,7 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL) )); CORBA::IDLType_var ivar = this->repo_->get_primitive (CORBA::pk_string - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Any any; @@ -1906,12 +1906,12 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL) "1.0", ivar.in (), any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::TypeCode_var tc = cvar->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = cvar->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1921,9 +1921,9 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (kind == CORBA::tk_string); - CORBA::IDLType_var tdef = cvar->type_def (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::IDLType_var tdef = cvar->type_def (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::DefinitionKind def_kind = tdef->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::DefinitionKind def_kind = tdef->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1934,7 +1934,7 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (def_kind == CORBA::dk_Primitive); CORBA::Any_var out_any; - out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER); + out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; const char *out_s; @@ -1948,16 +1948,16 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (out_s, s)); ivar = this->repo_->get_primitive (CORBA::pk_double - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; cvar->type_def (ivar.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Double double_val = -1223.42256; any <<= double_val; cvar->value (any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -1965,7 +1965,7 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL) ACE_TEXT ("\nConstantDef::type_def (set)\n") ACE_TEXT ("ConstantDef::value (set)\n"))); - out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER); + out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Double out_double_val; @@ -1979,9 +1979,9 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (out_double_val == double_val); ivar = this->repo_->get_primitive (CORBA::pk_short - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); cvar->type_def (ivar.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); if (this->debug_) ACE_DEBUG ((LM_DEBUG, @@ -1992,9 +1992,9 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL) any <<= short_val; cvar->value (any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER); + out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Short out_short_val; @@ -2008,10 +2008,10 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (out_short_val == short_val); ivar = this->repo_->get_primitive (CORBA::pk_float - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; cvar->type_def (ivar.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2023,9 +2023,9 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL) any <<= float_val; cvar->value (any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER); + out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Float out_float_val; @@ -2039,10 +2039,10 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (out_float_val == float_val); ivar = this->repo_->get_primitive (CORBA::pk_ulonglong - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; cvar->type_def (ivar.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2054,9 +2054,9 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL) any <<= ull_val; cvar->value (any - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - out_any = cvar->value (TAO_ENV_SINGLE_ARG_PARAMETER); + out_any = cvar->value (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::ULongLong out_ull_val; @@ -2077,12 +2077,12 @@ Admin_Client::constant_test (TAO_ENV_SINGLE_ARG_DECL) } ACE_ASSERT (out_ull_val == ull_val); - cvar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + cvar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) +Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -2099,12 +2099,12 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) "gp_iface", "1.0", in_bases - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::PrimitiveDef_var p_long = this->repo_->get_primitive (CORBA::pk_long - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::AttributeDef_var gp_attr = @@ -2113,7 +2113,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) "1.0", p_long.in (), CORBA::ATTR_NORMAL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; in_bases.length (1); @@ -2124,11 +2124,11 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) "p_iface", "1.0", in_bases - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::StringDef_var p_string = this->repo_->create_string (5 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::AttributeDef_var p_attr = @@ -2137,7 +2137,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) "1.0", p_string.in (), CORBA::ATTR_READONLY - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; const char *names[] = {"inarg", "inoutarg", "outarg"}; @@ -2159,7 +2159,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) "if_exception", "1.0", members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ExceptionDefSeq get_seq (1); @@ -2173,7 +2173,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) { par_seq[i].name = names[i]; par_seq[i].type_def = CORBA::PrimitiveDef::_duplicate (p_long.in ()); - par_seq[i].type = p_long->type (TAO_ENV_SINGLE_ARG_PARAMETER); + par_seq[i].type = p_long->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; par_seq[i].mode = modes[i]; con_seq[i] = contexts[i]; @@ -2188,10 +2188,10 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) par_seq, get_seq, con_seq - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::Contained::Description_var desc = p_op->describe (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Contained::Description_var desc = p_op->describe (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::OperationDescription *od; @@ -2206,7 +2206,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (od->defined_in, "IDL:p_iface:1.0")); CORBA::TypeCode_var result = od->result; - CORBA::TCKind kind = result->kind (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TCKind kind = result->kind (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2253,7 +2253,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) } CORBA::Boolean is_it = p_ivar->is_a ("IDL:p_iface:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2264,7 +2264,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (is_it == 1); is_it = p_ivar->is_a ("IDL:gp_iface:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2275,7 +2275,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (is_it == 1); is_it = gp_ivar->is_a ("IDL:p_iface:1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2286,10 +2286,10 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (is_it == 0); CORBA::InterfaceDef::FullInterfaceDescription_var fifd = - p_ivar->describe_interface (TAO_ENV_SINGLE_ARG_PARAMETER); + p_ivar->describe_interface (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var str = fifd->type->id (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::String_var str = fifd->type->id (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2375,10 +2375,10 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) "iface", "1.0", in_bases - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - desc = ivar->describe (TAO_ENV_SINGLE_ARG_PARAMETER); + desc = ivar->describe (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::InterfaceDescription *ifd; @@ -2409,7 +2409,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) } CORBA::InterfaceDefSeq_var out_bases = - ivar->base_interfaces (TAO_ENV_SINGLE_ARG_PARAMETER); + ivar->base_interfaces (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; length = out_bases->length (); @@ -2423,7 +2423,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) for (i = 0; i < length; i++) { - str = out_bases[i]->name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = out_bases[i]->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2437,7 +2437,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) CORBA::ContainedSeq_var contents = ivar->contents (CORBA::dk_all, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; length = contents->length (); @@ -2451,7 +2451,7 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) for (i = 0; i < length; i++) { - str = contents[i]->name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = contents[i]->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2460,14 +2460,14 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) i, str.in ())); - CORBA::Container_var cr = contents[i]->defined_in (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::Container_var cr = contents[i]->defined_in (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Contained_var cd = CORBA::Contained::_narrow (cr.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - str = cd->name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = cd->name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2481,18 +2481,18 @@ Admin_Client::interface_test (TAO_ENV_SINGLE_ARG_DECL) || !ACE_OS::strcmp (str.in (), "gp_iface")); } - ex_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + ex_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - ivar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + ivar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - gp_ivar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + gp_ivar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - p_ivar->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + p_ivar->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) +Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -2509,7 +2509,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) "o_enum", "1.0", e_members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; e_members[0] = CORBA::string_dup ("TEN"); @@ -2519,7 +2519,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) "i_enum", "1.0", e_members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::StructMemberSeq s_members (2); @@ -2529,14 +2529,14 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) s_members[0].name = s_names[0]; s_members[0].type_def = this->repo_->get_primitive (CORBA::pk_string - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - s_members[0].type = s_members[0].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER); + s_members[0].type = s_members[0].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; s_members[1].name = s_names[1]; s_members[1].type_def = CORBA::EnumDef::_duplicate (e_var2.in ()); - s_members[1].type = s_members[1].type_def->type (TAO_ENV_SINGLE_ARG_PARAMETER); + s_members[1].type = s_members[1].type_def->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::StructDef_var s_var = @@ -2544,7 +2544,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) "o_struct", "1.0", s_members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::UnionMemberSeq u_members (2); @@ -2554,7 +2554,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) u_members[0].name = u_names[0]; u_members[0].type_def = CORBA::EnumDef::_duplicate (e_var.in ()); - u_members[0].type = e_var->type (TAO_ENV_SINGLE_ARG_PARAMETER); + u_members[0].type = e_var->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::Long label = 0; CORBA::Any any; @@ -2563,7 +2563,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) u_members[1].name = u_names[1]; u_members[1].type_def = CORBA::StructDef::_duplicate (s_var.in ()); - u_members[1].type = s_var->type (TAO_ENV_SINGLE_ARG_PARAMETER); + u_members[1].type = s_var->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; label = 1; any <<= label; @@ -2571,7 +2571,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) CORBA::PrimitiveDef_var d_var = this->repo_->get_primitive (CORBA::pk_long - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::UnionDef_var u_var = @@ -2580,10 +2580,10 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) "1.0", d_var.in (), u_members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::UnionMemberSeq_var out_u_members = u_var->members (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::UnionMemberSeq_var out_u_members = u_var->members (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::ULong length = out_u_members->length (); @@ -2613,7 +2613,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) CORBA::ContainedSeq_var out_contents = u_var->contents (CORBA::dk_all, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; length = out_contents->length (); @@ -2628,14 +2628,14 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) e_var->move (u_var.in (), u_names[0], "1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nEnumDef::move (into union)\n"))); - out_u_members = u_var->members (TAO_ENV_SINGLE_ARG_PARAMETER); + out_u_members = u_var->members (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; length = out_u_members->length (); @@ -2685,7 +2685,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) out_contents = u_var->contents (CORBA::dk_all, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; length = out_contents->length (); @@ -2701,7 +2701,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) for (i = 0; i < length; i++) { - str = out_contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = out_contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2727,13 +2727,13 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) e_var2->move (s_var.in (), s_names[1], "1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; s_var->move (u_var.in (), u_names[1], "1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2743,7 +2743,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) out_contents = this->repo_->contents (CORBA::dk_all, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; length = out_contents->length (); @@ -2755,7 +2755,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (length == 1); - out_u_members = u_var->members (TAO_ENV_SINGLE_ARG_PARAMETER); + out_u_members = u_var->members (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; length = out_u_members->length (); @@ -2782,7 +2782,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) out_contents = u_var->contents (CORBA::dk_all, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; length = out_contents->length (); @@ -2799,7 +2799,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) for (i = 0; i < length; i++) { - str = out_contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = out_contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2814,14 +2814,14 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) if (i == 1) { s_tmp = CORBA::StructDef::_narrow (out_contents[i] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } out_contents = s_tmp->contents (CORBA::dk_all, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; length = out_contents->length (); @@ -2837,7 +2837,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) for (i = 0; i < length; i++) { - str = out_contents[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = out_contents[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -2856,7 +2856,7 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) ACE_UNUSED_ARG (base); #endif /* ACE_NDEBUG */ - CORBA::StructMemberSeq_var out_s_members = s_tmp->members (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::StructMemberSeq_var out_s_members = s_tmp->members (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; length = out_s_members->length (); @@ -2881,12 +2881,12 @@ Admin_Client::move_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (tmp, s_names[i])); } - u_var->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + u_var->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL) +Admin_Client::module_test (ACE_ENV_SINGLE_ARG_DECL) { ACE_DEBUG (( LM_DEBUG, @@ -2896,19 +2896,19 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL) CORBA::ModuleDef_var outer = this->repo_->create_module ("IDL:outer:1.0", "outer", "1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ModuleDef_var middle = outer->create_module ("IDL:middle:1.0", "middle", "1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ModuleDef_var inner = middle->create_module ("IDL:inner:1.0", "inner", "1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::InterfaceDefSeq in_bases (1); @@ -2919,7 +2919,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL) "p_iface", "1.0", in_bases - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; in_bases.length (1); @@ -2930,16 +2930,16 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL) "iface", "1.0", in_bases - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::PrimitiveDef_var p_void = this->repo_->get_primitive (CORBA::pk_void - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::PrimitiveDef_var p_long = this->repo_->get_primitive (CORBA::pk_long - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::AttributeDef_var attr = @@ -2948,7 +2948,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL) "1.0", p_void.in (), CORBA::ATTR_NORMAL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ULong length = 3; @@ -2967,7 +2967,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL) { par_seq[i].name = p_names[i]; par_seq[i].type_def = CORBA::PrimitiveDef::_duplicate (p_long.in ()); - par_seq[i].type = p_long->type (TAO_ENV_SINGLE_ARG_PARAMETER); + par_seq[i].type = p_long->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; par_seq[i].mode = ACE_static_cast (CORBA::ParameterMode, i); @@ -2982,7 +2982,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL) "if_exception", "1.0", members - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ExceptionDefSeq get_seq (1); @@ -2998,17 +2998,17 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL) par_seq, get_seq, con_seq - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::String_var str; CORBA::Contained_var result = inner->lookup ("::outer::middle::inner::iface::op" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - str = result->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = result->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -3022,10 +3022,10 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL) "::outer::middle::inner::iface::op")); result = middle->lookup ("inner::iface::op" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - str = result->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = result->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -3042,7 +3042,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL) -1, CORBA::dk_all, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; length = cseq->length (); @@ -3056,7 +3056,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL) for (i = 0; i < length; i++) { - str = cseq[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = cseq[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -3075,7 +3075,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL) 3, CORBA::dk_Attribute, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; length = cseq->length (); @@ -3089,7 +3089,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL) for (i = 0; i < length; i++) { - str = cseq[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = cseq[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -3106,7 +3106,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL) iface->move (outer.in (), "iface", "1.0" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -3117,7 +3117,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL) -1, CORBA::dk_all, 0 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; length = cseq->length (); @@ -3131,7 +3131,7 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL) for (i = 0; i < length; i++) { - str = cseq[i]->absolute_name (TAO_ENV_SINGLE_ARG_PARAMETER); + str = cseq[i]->absolute_name (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->debug_) @@ -3145,6 +3145,6 @@ Admin_Client::module_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ASSERT (!ACE_OS::strcmp (str.in (), "::outer::iface::op")); } - outer->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + outer->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } |