diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-03-11 06:30:57 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-03-11 06:30:57 +0000 |
| commit | 365ecd3742cd9f2b46db5c14f0716e57dc2c866e (patch) | |
| tree | 6322d4f2cc75e89ac4b9a42a3baba7493064f210 | |
| parent | b52b2a7801f2670aa2e2665b609fe0cf3066506e (diff) | |
| download | ATCD-365ecd3742cd9f2b46db5c14f0716e57dc2c866e.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/tao/TypeCode/Value_TypeCode.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/TAO/tao/TypeCode/Value_TypeCode.cpp b/TAO/tao/TypeCode/Value_TypeCode.cpp index 1ddcab31749..07f76c6a228 100644 --- a/TAO/tao/TypeCode/Value_TypeCode.cpp +++ b/TAO/tao/TypeCode/Value_TypeCode.cpp @@ -124,6 +124,15 @@ TAO::TypeCode::Value<StringType, { Field<StringType> const & lhs_field = this->fields_[i]; + CORBA::Visibility const lhs_visibility = lhs_field.visibility; + CORBA::Visibility const rhs_visibility = + tc->member_visibility_i (i + ACE_ENV_ARG_PARAMETER); + ACE_CHECK_RETURN (0); + + if (lhs_visibility != rhs_visibility) + return 0; + char const * const lhs_name = lhs_field.get_name (); char const * const rhs_name = tc->member_name (i ACE_ENV_ARG_PARAMETER); @@ -145,15 +154,6 @@ TAO::TypeCode::Value<StringType, if (!equal_members) return 0; - - CORBA::Visibility const lhs_visibility = lhs_field.visibility; - CORBA::Visibility const rhs_visibility = - tc->member_visibility_i (i - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (0); - - if (lhs_visibility != rhs_visibility) - return 0; } return 1; @@ -220,8 +220,10 @@ TAO::TypeCode::Value<StringType, for (CORBA::ULong i = 0; i < this->nfields_; ++i) { + Field<StringType> const & lhs_field = this->fields_[i]; + CORBA::Visibility const lhs_visibility = - this->fields_[i].visibility; + lhs_field.visibility; CORBA::Visibility const rhs_visibility = tc->member_visibility (i ACE_ENV_ARG_PARAMETER); @@ -230,7 +232,7 @@ TAO::TypeCode::Value<StringType, if (lhs_visibility != rhs_visibility) return 0; - CORBA::TypeCode_ptr const lhs_tc = *(this->fields_[i].type); + CORBA::TypeCode_ptr const lhs_tc = *(lhs_field.type); CORBA::TypeCode_var const rhs_tc = tc->member_type (i ACE_ENV_ARG_PARAMETER); |