diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-05-04 18:56:36 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-05-04 18:56:36 +0000 |
| commit | 839c1b3c0a973d3e32445946a8532d3a9ad34000 (patch) | |
| tree | 4fee0d0d20b0d6429b7f0792ccbaf3f86dd8f5d2 | |
| parent | 6072a983aafaf21934b18f9fccc7cce40cc945ac (diff) | |
| download | ATCD-839c1b3c0a973d3e32445946a8532d3a9ad34000.tar.gz | |
ChangeLogTag:Wed May 4 11:54:01 2005 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/Union_TypeCode.cpp | 10 | ||||
| -rw-r--r-- | TAO/tao/Union_TypeCode_Static.cpp | 10 |
3 files changed, 20 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f5ffe0deaaf..7400a6682f7 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Wed May 4 11:54:01 2005 Ossama Othman <ossama@dre.vanderbilt.edu> + + * tao/Union_TypeCode.cpp (equal, equivalent): + * tao/Union_TypeCode_Static.cpp (equal, equivalent): + + Use Traits<>::get_typecode() to get the discriminant TypeCode. + Addresses dynamic union TypeCode compile-time problems. + Wed May 4 09:25:13 2005 Ossama Othman <ossama@dre.vanderbilt.edu> * tao/Objref_TypeCode_Factory.h: diff --git a/TAO/tao/Union_TypeCode.cpp b/TAO/tao/Union_TypeCode.cpp index e85a3f00cbe..0d26bdbafa3 100644 --- a/TAO/tao/Union_TypeCode.cpp +++ b/TAO/tao/Union_TypeCode.cpp @@ -124,8 +124,9 @@ TAO::TypeCode::Union<StringType, ACE_CHECK_RETURN (0); CORBA::Boolean const equal_discriminators = - (*this->discriminant_type_)->equal (tc_discriminator.in () - ACE_ENV_ARG_PARAMETER); + Traits<StringType>::get_typecode (this->discriminant_type_)->equal ( + tc_discriminator.in () + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!equal_discriminators) @@ -181,8 +182,9 @@ TAO::TypeCode::Union<StringType, ACE_CHECK_RETURN (0); CORBA::Boolean const equiv_discriminators = - (*this->discriminant_type_)->equivalent (tc_discriminator.in () - ACE_ENV_ARG_PARAMETER); + Traits<StringType>::get_typecode (this->discriminant_type_)->equivalent ( + tc_discriminator.in () + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!equiv_discriminators) diff --git a/TAO/tao/Union_TypeCode_Static.cpp b/TAO/tao/Union_TypeCode_Static.cpp index 6a4d35b3222..222ebe48475 100644 --- a/TAO/tao/Union_TypeCode_Static.cpp +++ b/TAO/tao/Union_TypeCode_Static.cpp @@ -114,8 +114,9 @@ TAO::TypeCode::Union<char const *, ACE_CHECK_RETURN (0); CORBA::Boolean const equal_discriminators = - (*this->discriminant_type_)->equal (tc_discriminator.in () - ACE_ENV_ARG_PARAMETER); + Traits<char const *>::get_typecode (this->discriminant_type_)->equal ( + tc_discriminator.in () + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!equal_discriminators) @@ -168,8 +169,9 @@ TAO::TypeCode::Union<char const *, ACE_CHECK_RETURN (0); CORBA::Boolean const equiv_discriminators = - (*this->discriminant_type_)->equivalent (tc_discriminator.in () - ACE_ENV_ARG_PARAMETER); + Traits<char const *>::get_typecode (this->discriminant_type_)->equivalent ( + tc_discriminator.in () + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); if (!equiv_discriminators) |