[Boost-commit] svn:boost r61027 - in sandbox/geometry/boost/geometry: algorithms/detail/buffer algorithms/detail/overlay algorithms/overlay strategies

Subject: [Boost-commit] svn:boost r61027 - in sandbox/geometry/boost/geometry: algorithms/detail/buffer algorithms/detail/overlay algorithms/overlay strategies
From: barend.gehrels_at_[hidden]
Date: 2010-04-03 16:33:15

Author: barendgehrels
Date: 2010-04-03 16:33:14 EDT (Sat, 03 Apr 2010)
New Revision: 61027
URL: http://svn.boost.org/trac/boost/changeset/61027

Log:
Buffer - update for gcc, abs->std::abs
Text files modified: 
   sandbox/geometry/boost/geometry/algorithms/detail/buffer/line_line_intersection.hpp |     4 ++--                                    
   sandbox/geometry/boost/geometry/algorithms/detail/overlay/ring_properties.hpp       |     4 ++--                                    
   sandbox/geometry/boost/geometry/algorithms/overlay/assemble.hpp                     |     4 ++--                                    
   sandbox/geometry/boost/geometry/strategies/buffer.hpp                               |     2 +-                                      
   4 files changed, 7 insertions(+), 7 deletions(-)

Modified: sandbox/geometry/boost/geometry/algorithms/detail/buffer/line_line_intersection.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/buffer/line_line_intersection.hpp	(original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/buffer/line_line_intersection.hpp	2010-04-03 16:33:14 EDT (Sat, 03 Apr 2010)
@@ -61,12 +61,12 @@
         set<1>(p, py);
 
 #ifdef BOOST_GEOMETRY_DEBUG_BUFFER
-        if (abs(denominator) < 1e-7)
+        if (std::abs(denominator) < 1.0e-7)
         {
             std::cout << "small " << denominator << std::endl;
         }
 #endif
-        return abs(denominator) > 1e-7;
+        return std::abs(denominator) > 1.0e-7;
     }
 };
 

Modified: sandbox/geometry/boost/geometry/algorithms/detail/overlay/ring_properties.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/detail/overlay/ring_properties.hpp	(original)
+++ sandbox/geometry/boost/geometry/algorithms/detail/overlay/ring_properties.hpp	2010-04-03 16:33:14 EDT (Sat, 03 Apr 2010)
@@ -80,7 +80,7 @@
     inline bool operator<(ring_properties<Point> const& other) const
     {
         // Normal sorting: in reverse order
-        return abs(area) > abs(other.area);
+        return std::abs(area) > std::abs(other.area);
     }
 
     inline ring_identifier const& id() const
@@ -218,7 +218,7 @@
 
         // If it is the same, sort on size descending
         return left_id == right_id
-            ? abs(left.area) > abs(right.area)
+            ? std::abs(left.area) > std::abs(right.area)
             : left_id < right_id;
     }
 };

Modified: sandbox/geometry/boost/geometry/algorithms/overlay/assemble.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/algorithms/overlay/assemble.hpp	(original)
+++ sandbox/geometry/boost/geometry/algorithms/overlay/assemble.hpp	2010-04-03 16:33:14 EDT (Sat, 03 Apr 2010)
@@ -45,7 +45,7 @@
 
 
 #ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace overlay 
+namespace detail { namespace overlay
 {
 
 
@@ -443,7 +443,7 @@
             {
                 item_type& item2 = *it2;
                 if (geometry::within(item2.point, item1.box)
-                    && abs(item2.area) < abs(item1.area)
+                    && std::abs(item2.area) < std::abs(item1.area)
                     && contains(item1, item2, geometry1, geometry2, collection)
                     )
                 {

Modified: sandbox/geometry/boost/geometry/strategies/buffer.hpp
==============================================================================
--- sandbox/geometry/boost/geometry/strategies/buffer.hpp	(original)
+++ sandbox/geometry/boost/geometry/strategies/buffer.hpp	2010-04-03 16:33:14 EDT (Sat, 03 Apr 2010)
@@ -140,7 +140,7 @@
             coordinate_type dy = get<1>(ip) - get<1>(vertex);
 
             coordinate_type length = sqrt(dx * dx + dy * dy);
-            coordinate_type max = 10 * abs(buffer_distance);
+            coordinate_type max = 10.0 * std::abs(buffer_distance);
 
             if (length > max)
             {