diff options
author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-09-12 15:14:21 +0000 |
---|---|---|
committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-09-12 15:14:21 +0000 |
commit | fee99bc475b2546aae069901bcb8af60c7fdc4c0 (patch) | |
tree | f7ccb669e65cbb0c750a12627ed82a0bbac36d3a | |
parent | 9ed3855a9d268c4d563b8d56c82b0568c5db7470 (diff) | |
download | ATCD-fee99bc475b2546aae069901bcb8af60c7fdc4c0.tar.gz |
ChangeLogTag: Wed Sep 12 10:13:31 2001 Jeff Parsons <parsons@cs.wustl.edu>
-rw-r--r-- | TAO/tao/DynamicAny/DynAny_i.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp index a3088c0afd2..b451de2e0c3 100644 --- a/TAO/tao/DynamicAny/DynAny_i.cpp +++ b/TAO/tao/DynamicAny/DynAny_i.cpp @@ -469,9 +469,15 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs, CORBA::Char * rhs_v; rhs_n->any_ >>= CORBA::Any::to_string (rhs_v, bound); + + // @@@ (JP) On Windows (only), this any does not get the bound + // set in its type code when copied from another DynAny. So we + // dispense with the to_string here, since the type codes have + // already been checked for equivalence above (done with this + // DynAny's type_ member, which does have the bound set correctly). CORBA::Char * lhs_v; - this->any_ >>= CORBA::Any::to_string (lhs_v, - bound); + this->any_ >>= lhs_v; + return ACE_OS::strcmp (rhs_v, lhs_v) == 0; } case CORBA::tk_wstring: |