diff options
| author | Olli Savia <ops@iki.fi> | 2010-10-29 12:04:27 +0000 |
|---|---|---|
| committer | Olli Savia <ops@iki.fi> | 2010-10-29 12:04:27 +0000 |
| commit | 8fce8be0e2cae7b11d8c2ecf8312723c1ec199a9 (patch) | |
| tree | f5074fde7e41ad24654cc1e1dea2b174df4315c4 | |
| parent | 25c072e0c4d25a686ccf51365c6ad3161c2cde07 (diff) | |
| download | ATCD-8fce8be0e2cae7b11d8c2ecf8312723c1ec199a9.tar.gz | |
ChangeLogTag: Fri Oct 29 12:03:44 UTC 2010 Olli Savia <ops@iki.fi>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/DynamicAny/DynAny_i.cpp | 4 | ||||
| -rw-r--r-- | TAO/tao/ETCL/TAO_ETCL_Constraint.cpp | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 953c6d99ea2..6fabe54201a 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Fri Oct 29 12:03:44 UTC 2010 Olli Savia <ops@iki.fi> + + * tao/DynamicAny/DynAny_i.cpp: + * tao/ETCL/TAO_ETCL_Constraint.cpp: + Use ACE::is_equal() to compare floating point values. + Fri Oct 29 12:02:11 UTC 2010 Olli Savia <ops@iki.fi> * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp: diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp index 8585ba2fcd1..06f33e73a24 100644 --- a/TAO/tao/DynamicAny/DynAny_i.cpp +++ b/TAO/tao/DynamicAny/DynAny_i.cpp @@ -313,7 +313,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs) rhs_n->any_ >>= rhs_v; CORBA::Float lhs_v; this->any_ >>= lhs_v; - return (lhs_v == rhs_v); + return ACE::is_equal (lhs_v, rhs_v); } case CORBA::tk_double: { @@ -321,7 +321,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs) rhs_n->any_ >>= rhs_v; CORBA::Double lhs_v; this->any_ >>= lhs_v; - return (lhs_v == rhs_v); + return ACE::is_equal (lhs_v, rhs_v); } case CORBA::tk_longlong: { diff --git a/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp b/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp index f3657585eea..46feb6fbe6c 100644 --- a/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp +++ b/TAO/tao/ETCL/TAO_ETCL_Constraint.cpp @@ -384,7 +384,7 @@ TAO_ETCL_Literal_Constraint::operator/ (const TAO_ETCL_Literal_Constraint & rhs) { case ACE_ETCL_DOUBLE: { - if ((ACE_CDR::Double) rhs == 0.0) + if (ACE::is_equal ((ACE_CDR::Double) rhs, 0.0)) return TAO_ETCL_Literal_Constraint ((ACE_CDR::Double) 0.0); CORBA::Double result = (CORBA::Double) *this / (CORBA::Double) rhs; |