diff options
| author | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-01-11 07:11:47 +0000 |
|---|---|---|
| committer | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-01-11 07:11:47 +0000 |
| commit | a39e535b33136c21e2cdc8dcde505cd85d2b6e4b (patch) | |
| tree | 6b28b3ece87cd7f5880007a9228520773adc03ba /TAO | |
| parent | 03345d750f984e40da1a51304bcab5c728103bd4 (diff) | |
| download | ATCD-a39e535b33136c21e2cdc8dcde505cd85d2b6e4b.tar.gz | |
ChangeLogTag: Tue Jan 11 07:09:15 UTC 2011 Olli Savia <ops@iki.fi>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp | 4 | ||||
| -rw-r--r-- | TAO/tests/Alt_Mapping/ub_struct_seq.cpp | 4 | ||||
| -rw-r--r-- | TAO/tests/DynAny_Test/test_dynany.cpp | 8 |
4 files changed, 15 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 875e203b08a..009d58db041 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Tue Jan 11 07:09:15 UTC 2011 Olli Savia <ops@iki.fi> + + * orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp: + * tests/Alt_Mapping/ub_struct_seq.cpp: + * tests/DynAny_Test/test_dynany.cpp: + Use ACE::is_equal() to compare floating point values. + Mon Jan 10 14:02:08 UTC 2011 Olli Savia <ops@iki.fi> * tests/OctetSeq/client.cpp: diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp index dd6fac0acb6..079010fab3b 100644 --- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp +++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp @@ -2030,7 +2030,7 @@ Admin_Client::constant_test (void) out_double_val)); } - ACE_ASSERT (out_double_val == double_val); + ACE_ASSERT (ACE::is_equal (out_double_val, double_val)); ivar = this->repo_->get_primitive (CORBA::pk_short); cvar->type_def (ivar.in ()); @@ -2086,7 +2086,7 @@ Admin_Client::constant_test (void) out_float_val)); } - ACE_ASSERT (out_float_val == float_val); + ACE_ASSERT (ACE::is_equal (out_float_val, float_val)); ivar = this->repo_->get_primitive (CORBA::pk_ulonglong); cvar->type_def (ivar.in ()); diff --git a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp index c7fdad7fde3..019df9de1f0 100644 --- a/TAO/tests/Alt_Mapping/ub_struct_seq.cpp +++ b/TAO/tests/Alt_Mapping/ub_struct_seq.cpp @@ -157,9 +157,9 @@ Test_Unbounded_Struct_Sequence::compare ( || vs1.c != vs2.c || vs1.s != vs2.s || vs1.o != vs2.o - || vs1.f != vs2.f + || !ACE::is_equal (vs1.f, vs2.f) || vs1.b != vs2.b - || vs1.d != vs2.d ) + || !ACE::is_equal (vs1.d, vs2.d)) return false; } diff --git a/TAO/tests/DynAny_Test/test_dynany.cpp b/TAO/tests/DynAny_Test/test_dynany.cpp index 344d2542c63..4db67d87c5c 100644 --- a/TAO/tests/DynAny_Test/test_dynany.cpp +++ b/TAO/tests/DynAny_Test/test_dynany.cpp @@ -79,7 +79,7 @@ Test_DynAny::run_test (void) CORBA::Double d_out = fa1->get_double (); - if (d_out == data.m_double1) + if (ACE::is_equal (d_out, data.m_double1)) { ACE_DEBUG ((LM_DEBUG, "++ OK ++\n")); @@ -102,7 +102,7 @@ Test_DynAny::run_test (void) CORBA::Any_var out_any1 = ftc1->to_any (); out_any1 >>= d_out; - if (d_out == data.m_double1) + if (ACE::is_equal (d_out, data.m_double1)) { ACE_DEBUG ((LM_DEBUG, "++ OK ++\n")); @@ -133,7 +133,7 @@ Test_DynAny::run_test (void) CORBA::LongDouble d_out = fa1->get_longdouble (); - if (d_out == data.m_longdouble1) + if (ACE::is_equal (d_out, data.m_longdouble1)) { ACE_DEBUG ((LM_DEBUG, "++ OK ++\n")); @@ -160,7 +160,7 @@ Test_DynAny::run_test (void) out_any1.in() >>= d_out; - if (d_out == data.m_longdouble1) + if (ACE::is_equal (d_out, data.m_longdouble1)) { ACE_DEBUG ((LM_DEBUG, "++ OK ++\n")); |