Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r78386 - trunk/boost/polygon
From: sydorchuk.andriy_at_[hidden]
Date: 2012-05-08 16:19:16


Author: asydorchuk
Date: 2012-05-08 16:19:15 EDT (Tue, 08 May 2012)
New Revision: 78386
URL: http://svn.boost.org/trac/boost/changeset/78386

Log:
Polygon: fixing voronoi static construction template methods (AIX IBM Canada Ltd.).
Text files modified:
   trunk/boost/polygon/voronoi.hpp | 34 +++++++++++++++++++++++++++-------
   1 files changed, 27 insertions(+), 7 deletions(-)

Modified: trunk/boost/polygon/voronoi.hpp
==============================================================================
--- trunk/boost/polygon/voronoi.hpp (original)
+++ trunk/boost/polygon/voronoi.hpp 2012-05-08 16:19:15 EDT (Tue, 08 May 2012)
@@ -29,10 +29,13 @@
 namespace boost {
 namespace polygon {
 
+struct voronoi_insert_point_yes : gtl_yes {};
+
 template <typename Point, typename VB>
 static inline
 typename enable_if<
- typename gtl_if<
+ typename gtl_and<
+ voronoi_insert_point_yes,
     typename is_point_concept<
       typename geometry_concept<Point>::type
>::type
@@ -43,11 +46,13 @@
   vb->insert_point(x(point), y(point));
 }
 
+struct voronoi_insert_points_yes : gtl_yes {};
 
 template <typename PointIterator, typename VB>
 static inline
 typename enable_if<
- typename gtl_if<
+ typename gtl_and<
+ voronoi_insert_points_yes,
     typename is_point_concept<
       typename geometry_concept<
         typename std::iterator_traits<PointIterator>::value_type
@@ -62,10 +67,13 @@
   }
 }
 
+struct voronoi_insert_segment_yes : gtl_yes {};
+
 template <typename Segment, typename VB>
 static inline
 typename enable_if<
- typename gtl_if<
+ typename gtl_and<
+ voronoi_insert_segment_yes,
     typename is_segment_concept<
       typename geometry_concept<Segment>::type
>::type
@@ -76,10 +84,13 @@
   vb->insert_segment(x(low(segment)), y(low(segment)), x(high(segment)), y(high(segment)));
 }
 
+struct voronoi_insert_segments_yes : gtl_yes {};
+
 template <typename SegmentIterator, typename VB>
 static inline
 typename enable_if<
- typename gtl_if<
+ typename gtl_and<
+ voronoi_insert_segments_yes,
     typename is_segment_concept<
       typename geometry_concept<
         typename std::iterator_traits<SegmentIterator>::value_type
@@ -94,10 +105,13 @@
   }
 }
 
+struct voronoi_construct_points_yes : gtl_yes {};
+
 template <typename PointIterator, typename VD>
 static inline
 typename enable_if<
- typename gtl_if<
+ typename gtl_and<
+ voronoi_construct_points_yes,
     typename is_point_concept<
       typename geometry_concept<
         typename std::iterator_traits<PointIterator>::value_type
@@ -112,10 +126,13 @@
   builder.construct(vd);
 }
 
+struct voronoi_construct_segments_yes : gtl_yes {};
+
 template <typename SegmentIterator, typename VD>
 static inline
 typename enable_if<
- typename gtl_if<
+ typename gtl_and<
+ voronoi_construct_segments_yes,
     typename is_segment_concept<
       typename geometry_concept<
         typename std::iterator_traits<SegmentIterator>::value_type
@@ -130,10 +147,13 @@
   builder.construct(vd);
 }
 
+struct voronoi_construct_points_and_segments_yes : gtl_yes {};
+
 template <typename PointIterator, typename SegmentIterator, typename VD>
 static inline
 typename enable_if<
- typename gtl_and<
+ typename gtl_and_3<
+ voronoi_construct_points_and_segments_yes,
     typename gtl_if<
       typename is_point_concept<
         typename geometry_concept<


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk