[Boost-commit] svn:boost r76931 - in sandbox/gtl/boost/polygon: . detail

Subject: [Boost-commit] svn:boost r76931 - in sandbox/gtl/boost/polygon: . detail
From: sydorchuk.andriy_at_[hidden]
Date: 2012-02-07 04:52:09

Author: asydorchuk
Date: 2012-02-07 04:52:07 EST (Tue, 07 Feb 2012)
New Revision: 76931
URL: http://svn.boost.org/trac/boost/changeset/76931

Log:
Fixing gcc errors.

Text files modified: 
   sandbox/gtl/boost/polygon/detail/voronoi_predicates.hpp |    32 ++++++++++++++++----------------        
   sandbox/gtl/boost/polygon/voronoi_diagram.hpp           |     4 ++--                                    
   2 files changed, 18 insertions(+), 18 deletions(-)

Modified: sandbox/gtl/boost/polygon/detail/voronoi_predicates.hpp
==============================================================================
--- sandbox/gtl/boost/polygon/detail/voronoi_predicates.hpp	(original)
+++ sandbox/gtl/boost/polygon/detail/voronoi_predicates.hpp	2012-02-07 04:52:07 EST (Tue, 07 Feb 2012)
@@ -1022,9 +1022,9 @@
             c_event = circle_type(c_x.dif().fpv() * inv_orientation.fpv(),
                                   c_y.dif().fpv() * inv_orientation.fpv(),
                                   lower_x.dif().fpv() * inv_orientation.fpv());
-            bool recompute_c_x = c_x.dif().ulp() > to_fpt(ULPS);
-            bool recompute_c_y = c_y.dif().ulp() > to_fpt(ULPS);
-            bool recompute_lower_x = lower_x.dif().ulp() > to_fpt(ULPS);
+            bool recompute_c_x = c_x.dif().ulp() > ULPS;
+            bool recompute_c_y = c_y.dif().ulp() > ULPS;
+            bool recompute_lower_x = lower_x.dif().ulp() > ULPS;
             if (recompute_c_x || recompute_c_y || recompute_lower_x) {
                 exact_circle_formation_functor_.ppp(
                     site1, site2, site3, c_event, recompute_c_x, recompute_c_y, recompute_lower_x);
@@ -1079,9 +1079,9 @@
             }
             lower_x += r * inv_segm_len;
             c_event = circle_type(c_x.dif().fpv(), c_y.dif().fpv(), lower_x.dif().fpv());
-            bool recompute_c_x = c_x.dif().ulp() > to_fpt(ULPS);
-            bool recompute_c_y = c_y.dif().ulp() > to_fpt(ULPS);
-            bool recompute_lower_x = lower_x.dif().ulp() > to_fpt(ULPS);
+            bool recompute_c_x = c_x.dif().ulp() > ULPS;
+            bool recompute_c_y = c_y.dif().ulp() > ULPS;
+            bool recompute_lower_x = lower_x.dif().ulp() > ULPS;
             if (recompute_c_x || recompute_c_y || recompute_lower_x) {
                 exact_circle_formation_functor_.pps(
                     site1, site2, site3, segment_index, c_event,
@@ -1146,9 +1146,9 @@
                 } else {
                     lower_x += robust_fpt_type(0.5, false) * c / a.sqrt();
                 }
-                recompute_c_x = c_x.dif().ulp() > to_fpt(ULPS);
-                recompute_c_y = c_y.dif().ulp() > to_fpt(ULPS);
-                recompute_lower_x = lower_x.dif().ulp() > to_fpt(ULPS);
+                recompute_c_x = c_x.dif().ulp() > ULPS;
+                recompute_c_y = c_y.dif().ulp() > ULPS;
+                recompute_lower_x = lower_x.dif().ulp() > ULPS;
                 c_event = circle_type(c_x.dif().fpv(), c_y.dif().fpv(), lower_x.dif().fpv());
             } else {
                 robust_fpt_type sqr_sum1(get_sqrt(a1 * a1 + b1 * b1), 2.0);
@@ -1212,9 +1212,9 @@
                 } else {
                     lower_x += t * orientation;
                 }
-                recompute_c_x = c_x.dif().ulp() > to_fpt(ULPS);
-                recompute_c_y = c_y.dif().ulp() > to_fpt(ULPS);
-                recompute_lower_x = lower_x.dif().ulp() > to_fpt(ULPS);
+                recompute_c_x = c_x.dif().ulp() > ULPS;
+                recompute_c_y = c_y.dif().ulp() > ULPS;
+                recompute_lower_x = lower_x.dif().ulp() > ULPS;
                 c_event = circle_type(c_x.dif().fpv(), c_y.dif().fpv(), lower_x.dif().fpv());
             }
             if (recompute_c_x || recompute_c_y || recompute_lower_x) {
@@ -1277,10 +1277,10 @@
             c_y += b3 * c1 * len2;
             c_y -= b1 * c3 * len2;
             robust_dif_type lower_x(c_x + r);
-            bool recompute_c_x = c_x.dif().ulp() > to_fpt(ULPS);
-            bool recompute_c_y = c_y.dif().ulp() > to_fpt(ULPS);
-            bool recompute_lower_x = lower_x.dif().ulp() > to_fpt(ULPS);
-            bool recompute_denom = denom.dif().ulp() > to_fpt(ULPS);
+            bool recompute_c_x = c_x.dif().ulp() > ULPS;
+            bool recompute_c_y = c_y.dif().ulp() > ULPS;
+            bool recompute_lower_x = lower_x.dif().ulp() > ULPS;
+            bool recompute_denom = denom.dif().ulp() > ULPS;
             c_event = circle_type(c_x.dif().fpv() / denom.dif().fpv(),
                                   c_y.dif().fpv() / denom.dif().fpv(),
                                   lower_x.dif().fpv() / denom.dif().fpv());

Modified: sandbox/gtl/boost/polygon/voronoi_diagram.hpp
==============================================================================
--- sandbox/gtl/boost/polygon/voronoi_diagram.hpp	(original)
+++ sandbox/gtl/boost/polygon/voronoi_diagram.hpp	2012-02-07 04:52:07 EST (Tue, 07 Feb 2012)
@@ -731,8 +731,8 @@
         }
 
     private:
-        template <typename T>
-        point_type prepare_point(const T& x, const T& y) {
+        template <typename CT>
+        point_type prepare_point(const CT& x, const CT& y) {
             coordinate_type xc = convert_(x);
             coordinate_type yc = convert_(y);
             return point_type(xc, yc);