[Boost-commit] svn:boost r80218 - trunk/boost/geometry/algorithms

Subject: [Boost-commit] svn:boost r80218 - trunk/boost/geometry/algorithms
From: bruno.lalande_at_[hidden]
Date: 2012-08-25 17:50:03

Author: bruno.lalande
Date: 2012-08-25 17:50:02 EDT (Sat, 25 Aug 2012)
New Revision: 80218
URL: http://svn.boost.org/trac/boost/changeset/80218

Log:
Defaulted more template params in dispatch::union.
Text files modified: 
   trunk/boost/geometry/algorithms/union.hpp |    27 ++++++++++++---------------             
   1 files changed, 12 insertions(+), 15 deletions(-)

Modified: trunk/boost/geometry/algorithms/union.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/union.hpp	(original)
+++ trunk/boost/geometry/algorithms/union.hpp	2012-08-25 17:50:02 EDT (Sat, 25 Aug 2012)
@@ -32,7 +32,6 @@
 <
     // real types
     typename Geometry1, typename Geometry2,
-    bool Reverse1, bool Reverse2, bool ReverseOut,
     typename OutputIterator,
     typename GeometryOut,
     typename Strategy,
@@ -41,7 +40,10 @@
     typename TagOut = typename tag<GeometryOut>::type,
     bool Areal1 = geometry::is_areal<Geometry1>::value,
     bool Areal2 = geometry::is_areal<Geometry2>::value,
-    bool ArealOut = geometry::is_areal<GeometryOut>::value
+    bool ArealOut = geometry::is_areal<GeometryOut>::value,
+    bool Reverse1 = detail::overlay::do_reverse<geometry::point_order<Geometry1>::value>::value,
+    bool Reverse2 = detail::overlay::do_reverse<geometry::point_order<Geometry2>::value>::value,
+    bool ReverseOut = detail::overlay::do_reverse<geometry::point_order<GeometryOut>::value>::value
 >
 struct union_insert
 {
@@ -56,20 +58,20 @@
 template
 <
     typename Geometry1, typename Geometry2,
-    bool Reverse1, bool Reverse2, bool ReverseOut,
     typename OutputIterator,
     typename GeometryOut,
     typename Strategy,
-    typename TagIn1, typename TagIn2, typename TagOut
+    typename TagIn1, typename TagIn2, typename TagOut,
+    bool Reverse1, bool Reverse2, bool ReverseOut
 >
 struct union_insert
     <
         Geometry1, Geometry2,
-        Reverse1, Reverse2, ReverseOut,
         OutputIterator, GeometryOut,
         Strategy,
         TagIn1, TagIn2, TagOut,
-        true, true, true
+        true, true, true,
+        Reverse1, Reverse2, ReverseOut
     > : detail::overlay::overlay
         <Geometry1, Geometry2, Reverse1, Reverse2, ReverseOut, OutputIterator, GeometryOut, overlay_union, Strategy>
 {};
@@ -79,7 +81,6 @@
 template
 <
     typename Geometry1, typename Geometry2,
-    bool Reverse1, bool Reverse2, bool ReverseOut,
     typename OutputIterator, typename GeometryOut,
     typename Strategy,
     typename TagIn1 = typename tag<Geometry1>::type,
@@ -87,7 +88,10 @@
     typename TagOut = typename tag<GeometryOut>::type,
     bool Areal1 = geometry::is_areal<Geometry1>::value,
     bool Areal2 = geometry::is_areal<Geometry2>::value,
-    bool ArealOut = geometry::is_areal<GeometryOut>::value
+    bool ArealOut = geometry::is_areal<GeometryOut>::value,
+    bool Reverse1 = detail::overlay::do_reverse<geometry::point_order<Geometry1>::value>::value,
+    bool Reverse2 = detail::overlay::do_reverse<geometry::point_order<Geometry2>::value>::value,
+    bool ReverseOut = detail::overlay::do_reverse<geometry::point_order<GeometryOut>::value>::value
 >
 struct union_insert_reversed
 {
@@ -98,7 +102,6 @@
         return union_insert
             <
                 Geometry2, Geometry1,
-                Reverse2, Reverse1, ReverseOut,
                 OutputIterator, GeometryOut,
                 Strategy
             >::apply(g2, g1, out, strategy);
@@ -131,18 +134,12 @@
             dispatch::union_insert_reversed
             <
                 Geometry1, Geometry2,
-                overlay::do_reverse<geometry::point_order<Geometry1>::value>::value,
-                overlay::do_reverse<geometry::point_order<Geometry2>::value>::value,
-                overlay::do_reverse<geometry::point_order<GeometryOut>::value>::value,
                 OutputIterator, GeometryOut,
                 Strategy
             >,
             dispatch::union_insert
             <
                 Geometry1, Geometry2,
-                overlay::do_reverse<geometry::point_order<Geometry1>::value>::value,
-                overlay::do_reverse<geometry::point_order<Geometry2>::value>::value,
-                overlay::do_reverse<geometry::point_order<GeometryOut>::value>::value,
                 OutputIterator, GeometryOut,
                 Strategy
             >