diff options
| author | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-10-29 12:03:38 +0000 |
|---|---|---|
| committer | olli <olli@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-10-29 12:03:38 +0000 |
| commit | 448ce763f5cacc519fe113286b18d32bb73cf8eb (patch) | |
| tree | fae2d3bfebdb880681fb9e5ad5d40dd367c34a6d | |
| parent | 896f6bf19991395105921bf9fa61c06696e341cb (diff) | |
| download | ATCD-448ce763f5cacc519fe113286b18d32bb73cf8eb.tar.gz | |
ChangeLogTag: Fri Oct 29 12:02:11 UTC 2010 Olli Savia <ops@iki.fi>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp | 12 |
3 files changed, 15 insertions, 9 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ce488d12ae2..953c6d99ea2 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Fri Oct 29 12:02:11 UTC 2010 Olli Savia <ops@iki.fi> + + * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp: + * orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp: + Use ACE::is_equal() to compare floating point values. + Fri Oct 29 08:25:58 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> * tests/IDL_Test/IDL_Test.mpc: diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp index d17cbab374e..41eef2b6963 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp @@ -588,7 +588,7 @@ operator== (const TAO_Literal_Constraint& left, return_value = (ACE_OS::strcmp ((const char*) left, (const char*) right) == 0); break; case TAO_DOUBLE: - return_value = (CORBA::Double) left == (CORBA::Double) right; + return_value = ACE::is_equal ((CORBA::Double) left, (CORBA::Double) right); break; case TAO_SIGNED: return_value = static_cast<CORBA::LongLong> (left) == @@ -672,7 +672,7 @@ operator> (const TAO_Literal_Constraint& left, bool operator== (CORBA::Double left, const TAO_Literal_Constraint& right) { - return (left == (CORBA::Double) right); + return ACE::is_equal (left, (CORBA::Double) right); } bool @@ -792,7 +792,7 @@ operator/ (const TAO_Literal_Constraint& left, { case TAO_DOUBLE: { - if ((CORBA::Double) right == 0.0) + if (ACE::is_equal ((CORBA::Double) right, 0.0)) return TAO_Literal_Constraint ((CORBA::Double) 0.0); CORBA::Double result = (CORBA::Double) left / (CORBA::Double) right; diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp index 934b29867d7..b63cdad8681 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp @@ -131,16 +131,16 @@ join_object_group (CORBA::ORB_ptr orb, strategy_info.name = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(strategy)); if (ACE_OS::strcasecmp (strategy, ACE_TEXT("LeastLoaded")) == 0 - && (reject_threshold != 0 - || critical_threshold != 0 - || dampening != 0)) + && (!ACE::is_equal (reject_threshold, (CORBA::Float)0.0) + || !ACE::is_equal (critical_threshold, (CORBA::Float)0.0) + || !ACE::is_equal (dampening, (CORBA::Float)0.0))) { CORBA::ULong len = 1; PortableGroup::Properties & props = strategy_info.props; - if (reject_threshold != 0) + if (!ACE::is_equal (reject_threshold, (CORBA::Float)0.0)) { const CORBA::ULong i = len - 1; @@ -152,7 +152,7 @@ join_object_group (CORBA::ORB_ptr orb, props[i].val <<= reject_threshold; } - if (critical_threshold != 0) + if (!ACE::is_equal (critical_threshold, (CORBA::Float)0.0)) { const CORBA::ULong i = len - 1; @@ -164,7 +164,7 @@ join_object_group (CORBA::ORB_ptr orb, props[i].val <<= critical_threshold; } - if (dampening != 0) + if (!ACE::is_equal (dampening, (CORBA::Float)0.0)) { const CORBA::ULong i = len - 1; |