diff options
Diffstat (limited to 'TAO/tao/AnyTypeCode/Struct_TypeCode.cpp')
| -rw-r--r-- | TAO/tao/AnyTypeCode/Struct_TypeCode.cpp | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp index aa50e7bdf78..ba7d3ad20a4 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp @@ -113,15 +113,14 @@ TAO::TypeCode::Struct<StringType, FieldArrayType, RefCountPolicy>::equal_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // This call shouldn't throw since CORBA::TypeCode::equal() verified // that the TCKind is the same as our's prior to invoking this // method, meaning that member_count() is supported. CORBA::ULong const tc_nfields = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nfields != this->nfields_) return false; @@ -134,8 +133,7 @@ TAO::TypeCode::Struct<StringType, char const * const lhs_name = Traits<StringType>::get_string (lhs_field.name); char const * const rhs_name = tc->member_name (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) return false; @@ -144,13 +142,11 @@ TAO::TypeCode::Struct<StringType, Traits<StringType>::get_typecode (lhs_field.type); CORBA::TypeCode_var const rhs_tc = tc->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); CORBA::Boolean const equal_members = lhs_tc->equal (rhs_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equal_members) return false; @@ -169,14 +165,13 @@ TAO::TypeCode::Struct<StringType, FieldArrayType, RefCountPolicy>::equivalent_i ( CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Perform a structural comparison, excluding the name() and // member_name() operations. CORBA::ULong const tc_nfields = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nfields != this->nfields_) return false; @@ -187,13 +182,11 @@ TAO::TypeCode::Struct<StringType, Traits<StringType>::get_typecode (this->fields_[i].type); CORBA::TypeCode_var const rhs = tc->member_type (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); CORBA::Boolean const equiv_members = lhs->equivalent (rhs.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + ); if (!equiv_members) return false; @@ -211,7 +204,7 @@ TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, RefCountPolicy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { ACE_Array_Base<Struct_Field<CORBA::String_var, CORBA::TypeCode_var> > @@ -233,8 +226,7 @@ TAO::TypeCode::Struct<StringType, tc_fields[i].type = Traits<StringType>::get_typecode ( this->fields_[i].type)->get_compact_typecode ( - ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (CORBA::TypeCode::_nil ()); + ); } } @@ -254,7 +246,7 @@ TAO::TypeCode::Struct<StringType, "" /* empty name */, tc_fields, this->nfields_ - ACE_ENV_ARG_PARAMETER); + ); } template <typename StringType, @@ -266,7 +258,7 @@ TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, RefCountPolicy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -282,7 +274,7 @@ TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, RefCountPolicy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -298,7 +290,7 @@ TAO::TypeCode::Struct<StringType, TypeCodeType, FieldArrayType, RefCountPolicy>::member_count_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->nfields_; } @@ -313,7 +305,7 @@ TAO::TypeCode::Struct<StringType, FieldArrayType, RefCountPolicy>::member_name_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -333,7 +325,7 @@ TAO::TypeCode::Struct<StringType, FieldArrayType, RefCountPolicy>::member_type_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { if (index >= this->nfields_) ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), |