[Boost-commit] svn:boost r52157 - trunk/boost/graph

Subject: [Boost-commit] svn:boost r52157 - trunk/boost/graph
From: jewillco_at_[hidden]
Date: 2009-04-03 10:55:02

Author: jewillco
Date: 2009-04-03 10:55:01 EDT (Fri, 03 Apr 2009)
New Revision: 52157
URL: http://svn.boost.org/trac/boost/changeset/52157

Log:
Trying to fix Sun CC 5.9 error by fully qualifying root_two
Text files modified: 
   trunk/boost/graph/topology.hpp |    13 ++++++-------                           
   1 files changed, 6 insertions(+), 7 deletions(-)

Modified: trunk/boost/graph/topology.hpp
==============================================================================
--- trunk/boost/graph/topology.hpp	(original)
+++ trunk/boost/graph/topology.hpp	2009-04-03 10:55:01 EDT (Fri, 03 Apr 2009)
@@ -14,7 +14,7 @@
 #include <cmath>
 #include <boost/random/uniform_01.hpp>
 #include <boost/random/linear_congruential.hpp>
-#include <boost/math/constants/constants.hpp>
+#include <boost/math/constants/constants.hpp> // For root_two
 #include <boost/algorithm/minmax.hpp>
 #include <boost/config.hpp> // For BOOST_STATIC_CONSTANT
 #include <boost/math/special_functions/hypot.hpp>
@@ -42,6 +42,7 @@
     double values[Dims];
   };
 
+  friend struct point_difference; // Workaround for VisualAge C++ bug
   struct point_difference
   {
     BOOST_STATIC_CONSTANT(std::size_t, dimensions = Dims);
@@ -438,14 +439,13 @@
   {
 #ifndef BOOST_NO_STDC_NAMESPACE
     using std::abs;
-    using boost::math::constants::root_two;
 #endif
 
     if (p[1] < abs(p[0]) - 2000) return false; // Bottom
     if (p[1] <= -1000) return true; // Diagonal of square
-    if (boost::math::hypot(p[0] - -500, p[1] - -500) <= 500. * root_two<double>())
+    if (boost::math::hypot(p[0] - -500, p[1] - -500) <= 500. * boost::math::constants::root_two<double>())
       return true; // Left circle
-    if (boost::math::hypot(p[0] - 500, p[1] - -500) <= 500. * root_two<double>())
+    if (boost::math::hypot(p[0] - 500, p[1] - -500) <= 500. * boost::math::constants::root_two<double>())
       return true; // Right circle
     return false;
   }
@@ -475,10 +475,9 @@
   point random_point() const 
   {
     point result;
-    using boost::math::constants::root_two;
     do {
-      result[0] = (*rand)() * (1000 + 1000 * root_two<double>()) - (500 + 500 * root_two<double>());
-      result[1] = (*rand)() * (2000 + 500 * (root_two<double>() - 1)) - 2000;
+      result[0] = (*rand)() * (1000 + 1000 * boost::math::constants::root_two<double>()) - (500 + 500 * boost::math::constants::root_two<double>());
+      result[1] = (*rand)() * (2000 + 500 * (boost::math::constants::root_two<double>() - 1)) - 2000;
     } while (!in_heart(result));
     return result;
   }