diff options
Diffstat (limited to 'TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp')
| -rw-r--r-- | TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp index 67edee2d6b8..9cb9957d07e 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp @@ -21,13 +21,12 @@ template <typename StringType, typename TypeCodeType> bool TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Check case names. char const * const lhs_name = this->name (); char const * const rhs_name = tc->member_name (index - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (ACE_OS::strcmp (lhs_name, rhs_name) != 0) return 0; @@ -36,13 +35,11 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index, CORBA::TypeCode_ptr const lhs_tc = this->type (); CORBA::TypeCode_var const rhs_tc = tc->member_type (index - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); CORBA::Boolean const equal_members = lhs_tc->equal (rhs_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (!equal_members) return 0; @@ -50,7 +47,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index, // Check case label. return this->equal_label (index, tc - ACE_ENV_ARG_PARAMETER); + ); } template <typename StringType, typename TypeCodeType> @@ -58,7 +55,7 @@ bool TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent ( CORBA::ULong index, CORBA::TypeCode_ptr tc - ACE_ENV_ARG_DECL) const + ) const { // Member names are ignore when determining equivalence. @@ -66,13 +63,11 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent ( CORBA::TypeCode_ptr const lhs_tc = this->type (); CORBA::TypeCode_var const rhs_tc = tc->member_type (index - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); CORBA::Boolean const equivalent_members = lhs_tc->equivalent (rhs_tc.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); + ); if (!equivalent_members) return 0; @@ -81,7 +76,7 @@ TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent ( // The label must be equal when determining equivalence, too. return this->equal_label (index, tc - ACE_ENV_ARG_PARAMETER); + ); } TAO_END_VERSIONED_NAMESPACE_DECL |