diff options
Diffstat (limited to 'TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp')
| -rw-r--r-- | TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp index 64cd8f00d37..e4879dad9cc 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp @@ -79,15 +79,14 @@ TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::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_nenumerators = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nenumerators != this->nenumerators_) return false; @@ -99,8 +98,7 @@ TAO::TypeCode::Enum<char const *, char const * const lhs_name = Traits<char const *>::get_string (lhs_enumerator); 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; @@ -114,14 +112,13 @@ TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::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_nenumerators = - tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (false); + tc->member_count (); if (tc_nenumerators != this->nenumerators_) return false; @@ -133,7 +130,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - ACE_ENV_SINGLE_ARG_DECL) const + void) const { ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_); @@ -165,14 +162,14 @@ TAO::TypeCode::Enum<char const *, "" /* empty name */, tc_enumerators, this->nenumerators_ - ACE_ENV_ARG_PARAMETER); + ); } char const * TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::id_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -183,7 +180,7 @@ char const * TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::name_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -194,7 +191,7 @@ CORBA::ULong TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::member_count_i ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const + void) const { return this->nenumerators_; } @@ -204,7 +201,7 @@ TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::member_name_i ( CORBA::ULong index - ACE_ENV_ARG_DECL) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. |