diff options
Diffstat (limited to 'TAO/tao/DynamicAny/DynEnum_i.cpp')
| -rw-r--r-- | TAO/tao/DynamicAny/DynEnum_i.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp index b6872777472..b12ddf31c3c 100644 --- a/TAO/tao/DynamicAny/DynEnum_i.cpp +++ b/TAO/tao/DynamicAny/DynEnum_i.cpp @@ -29,13 +29,13 @@ TAO_DynEnum_i::init_common (void) void TAO_DynEnum_i::init (const CORBA_Any &any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TypeCode_var tc = any.type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (kind != CORBA::tk_enum) @@ -57,10 +57,10 @@ TAO_DynEnum_i::init (const CORBA_Any &any void TAO_DynEnum_i::init (CORBA_TypeCode_ptr tc - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (kind != CORBA::tk_enum) @@ -79,7 +79,7 @@ TAO_DynEnum_i::init (CORBA_TypeCode_ptr tc TAO_DynEnum_i * TAO_DynEnum_i::_narrow (CORBA::Object_ptr obj - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { if (CORBA::is_nil (obj)) { @@ -116,13 +116,13 @@ TAO_DynEnum_i::_tao_QueryInterface (ptr_arith_t type) // **************************************************************** char * -TAO_DynEnum_i::get_as_string (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynEnum_i::get_as_string (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { const char *retval = this->type_.in ()->member_name (this->value_ - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); return CORBA::string_dup (retval); @@ -130,13 +130,13 @@ TAO_DynEnum_i::get_as_string (TAO_ENV_SINGLE_ARG_DECL) void TAO_DynEnum_i::set_as_string (const char *value_as_string - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::InvalidValue )) { - CORBA::ULong count = this->type_.in ()->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong count = this->type_.in ()->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::ULong i; @@ -145,7 +145,7 @@ TAO_DynEnum_i::set_as_string (const char *value_as_string for (i = 0; i < count; ++i) { temp = this->type_.in ()->member_name (i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (!ACE_OS::strcmp (value_as_string, @@ -166,7 +166,7 @@ TAO_DynEnum_i::set_as_string (const char *value_as_string } CORBA::ULong -TAO_DynEnum_i::get_as_ulong (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO_DynEnum_i::get_as_ulong (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -176,13 +176,13 @@ TAO_DynEnum_i::get_as_ulong (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::InvalidValue )) { - CORBA::ULong max = this->type_.in ()->member_count (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::ULong max = this->type_.in ()->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (value_as_ulong < max) @@ -199,7 +199,7 @@ TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong void TAO_DynEnum_i::from_any (const CORBA_Any& any - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch, @@ -208,7 +208,7 @@ TAO_DynEnum_i::from_any (const CORBA_Any& any { CORBA::TypeCode_var tc = any.type (); CORBA::TCKind kind = TAO_DynAnyFactory::unalias (tc.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (kind == CORBA::tk_enum) @@ -228,7 +228,7 @@ TAO_DynEnum_i::from_any (const CORBA_Any& any } CORBA::Any_ptr -TAO_DynEnum_i::to_any (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynEnum_i::to_any (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -250,16 +250,16 @@ TAO_DynEnum_i::to_any (TAO_ENV_SINGLE_ARG_DECL) CORBA::Boolean TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) { - CORBA::TypeCode_var tc = rhs->type (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA::TypeCode_var tc = rhs->type (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); CORBA::Boolean equivalent = tc->equivalent (this->type_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!equivalent) @@ -267,7 +267,7 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs return 0; } - CORBA_Any_var any = rhs->to_any (TAO_ENV_SINGLE_ARG_PARAMETER); + CORBA_Any_var any = rhs->to_any (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_Message_Block *mb = any->_tao_get_cdr (); @@ -282,7 +282,7 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs } void -TAO_DynEnum_i::destroy (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynEnum_i::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException )) @@ -299,7 +299,7 @@ TAO_DynEnum_i::destroy (TAO_ENV_SINGLE_ARG_DECL) } DynamicAny::DynAny_ptr -TAO_DynEnum_i::current_component (TAO_ENV_SINGLE_ARG_DECL) +TAO_DynEnum_i::current_component (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC (( CORBA::SystemException, DynamicAny::DynAny::TypeMismatch |