diff options
| author | Phil Mesnier <mesnier_p@ociweb.com> | 2014-04-04 15:38:27 +0000 |
|---|---|---|
| committer | Phil Mesnier <mesnier_p@ociweb.com> | 2014-04-04 15:38:27 +0000 |
| commit | a2abc291feda1b33c4c248653a6f4b5a68efbd14 (patch) | |
| tree | 3472eec48633e3ef4d688d2ef55dfbbd775ccdf1 | |
| parent | f5879632a1ba9c138de832a8c3a5feb2512928f8 (diff) | |
| download | ATCD-a2abc291feda1b33c4c248653a6f4b5a68efbd14.tar.gz | |
Fri Apr 4 15:33:08 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com>
* tao/DynamicAny/DynAny_i.cpp:
Type LongDouble was not being compared with the equality test.
* tests/DynAny_Test/test_dynany.cpp:
Enhanced to show the LongDouble equality test fix.
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/DynamicAny/DynAny_i.cpp | 8 | ||||
| -rw-r--r-- | TAO/tests/DynAny_Test/test_dynany.cpp | 23 |
3 files changed, 39 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a233799cffb..e68ab24285e 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Fri Apr 4 15:33:08 UTC 2014 Phil Mesnier <mesnier_p@ociweb.com> + + * tao/DynamicAny/DynAny_i.cpp: + Type LongDouble was not being compared with the equality test. + + * tests/DynAny_Test/test_dynany.cpp: + Enhanced to show the LongDouble equality test fix. + Fri Apr 4 08:40:43 UTC 2014 Martin Corino <mcorino@remedy.nl> * bin/tao_orb_tests.lst: diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp index e772ecb30db..dfbf475b6db 100644 --- a/TAO/tao/DynamicAny/DynAny_i.cpp +++ b/TAO/tao/DynamicAny/DynAny_i.cpp @@ -322,6 +322,14 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs) this->any_ >>= lhs_v; return ACE::is_equal (lhs_v, rhs_v); } + case CORBA::tk_longdouble: + { + CORBA::LongDouble rhs_v; + rhs_n->any_ >>= rhs_v; + CORBA::LongDouble lhs_v; + this->any_ >>= lhs_v; + return ACE::is_equal (lhs_v, rhs_v); + } case CORBA::tk_longlong: { CORBA::LongLong rhs_v; diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp index baa4bb70a10..c58a7d4f2c9 100644 --- a/TAO/tests/DynAny_Test/test_dynany.cpp +++ b/TAO/tests/DynAny_Test/test_dynany.cpp @@ -74,6 +74,17 @@ Test_DynAny::run_test (void) DynamicAny::DynAny_var fa1 = dynany_factory->create_dyn_any (in1); + if (fa1->equal(fa1)) + { + ACE_DEBUG ((LM_DEBUG, + "++ OK ++\n")); + } + else + { + ACE_DEBUG ((LM_DEBUG, + "Double Not equal\n")); + ++this->error_count_; + } fa1->insert_double (data.m_double1); CORBA::Double d_out = @@ -129,6 +140,18 @@ Test_DynAny::run_test (void) DynamicAny::DynAny_var fa1 = dynany_factory->create_dyn_any (in1); + if (fa1->equal(fa1)) + { + ACE_DEBUG ((LM_DEBUG, + "++ OK ++\n")); + } + else + { + ACE_DEBUG ((LM_DEBUG, + "Long Double Not equal\n")); + ++this->error_count_; + } + fa1->insert_longdouble (data.m_longdouble1); CORBA::LongDouble d_out = fa1->get_longdouble (); |