Subject: [Boost-commit] svn:boost r80240 - in trunk/boost/geometry/algorithms: . detail/overlay
From: bruno.lalande_at_[hidden]
Date: 2012-08-26 17:36:05
Author: bruno.lalande
Date: 2012-08-26 17:36:04 EDT (Sun, 26 Aug 2012)
New Revision: 80240
URL: http://svn.boost.org/trac/boost/changeset/80240
Log:
Moved Strategy template param from class to function level in dispatch::union.
Text files modified:
trunk/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp | 4 ++--
trunk/boost/geometry/algorithms/detail/overlay/overlay.hpp | 4 ++--
trunk/boost/geometry/algorithms/union.hpp | 16 +++++-----------
3 files changed, 9 insertions(+), 15 deletions(-)
Modified: trunk/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp (original)
+++ trunk/boost/geometry/algorithms/detail/overlay/intersection_insert.hpp 2012-08-26 17:36:04 EDT (Sun, 26 Aug 2012)
@@ -263,7 +263,7 @@
OverlayType,
Strategy
> : detail::overlay::overlay
- <Geometry1, Geometry2, Reverse1, Reverse2, ReverseOut, OutputIterator, GeometryOut, OverlayType, Strategy>
+ <Geometry1, Geometry2, Reverse1, Reverse2, ReverseOut, OutputIterator, GeometryOut, OverlayType>
{};
@@ -288,7 +288,7 @@
OverlayType,
Strategy
> : detail::overlay::overlay
- <Geometry, Box, Reverse1, Reverse2, ReverseOut, OutputIterator, GeometryOut, OverlayType, Strategy>
+ <Geometry, Box, Reverse1, Reverse2, ReverseOut, OutputIterator, GeometryOut, OverlayType>
{};
Modified: trunk/boost/geometry/algorithms/detail/overlay/overlay.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/detail/overlay/overlay.hpp (original)
+++ trunk/boost/geometry/algorithms/detail/overlay/overlay.hpp 2012-08-26 17:36:04 EDT (Sun, 26 Aug 2012)
@@ -135,11 +135,11 @@
typename Geometry1, typename Geometry2,
bool Reverse1, bool Reverse2, bool ReverseOut,
typename OutputIterator, typename GeometryOut,
- overlay_type Direction,
- typename Strategy
+ overlay_type Direction
>
struct overlay
{
+ template <typename Strategy>
static inline OutputIterator apply(
Geometry1 const& geometry1, Geometry2 const& geometry2,
OutputIterator out,
Modified: trunk/boost/geometry/algorithms/union.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/union.hpp (original)
+++ trunk/boost/geometry/algorithms/union.hpp 2012-08-26 17:36:04 EDT (Sun, 26 Aug 2012)
@@ -31,7 +31,6 @@
typename Geometry1, typename Geometry2,
typename OutputIterator,
typename GeometryOut,
- typename Strategy,
typename TagIn1 = typename tag<Geometry1>::type,
typename TagIn2 = typename tag<Geometry2>::type,
typename TagOut = typename tag<GeometryOut>::type,
@@ -60,7 +59,6 @@
typename Geometry1, typename Geometry2,
typename OutputIterator,
typename GeometryOut,
- typename Strategy,
typename TagIn1, typename TagIn2, typename TagOut,
bool Reverse1, bool Reverse2, bool ReverseOut
>
@@ -68,13 +66,13 @@
<
Geometry1, Geometry2,
OutputIterator, GeometryOut,
- Strategy,
TagIn1, TagIn2, TagOut,
true, true, true,
Reverse1, Reverse2, ReverseOut,
true
- >: union_insert<Geometry2, Geometry1, OutputIterator, GeometryOut, Strategy>
+ >: union_insert<Geometry2, Geometry1, OutputIterator, GeometryOut>
{
+ template <typename Strategy>
static inline OutputIterator apply(Geometry1 const& g1,
Geometry2 const& g2, OutputIterator out,
Strategy const& strategy)
@@ -82,8 +80,7 @@
return union_insert
<
Geometry2, Geometry1,
- OutputIterator, GeometryOut,
- Strategy
+ OutputIterator, GeometryOut
>::apply(g2, g1, out, strategy);
}
};
@@ -94,7 +91,6 @@
typename Geometry1, typename Geometry2,
typename OutputIterator,
typename GeometryOut,
- typename Strategy,
typename TagIn1, typename TagIn2, typename TagOut,
bool Reverse1, bool Reverse2, bool ReverseOut
>
@@ -102,13 +98,12 @@
<
Geometry1, Geometry2,
OutputIterator, GeometryOut,
- Strategy,
TagIn1, TagIn2, TagOut,
true, true, true,
Reverse1, Reverse2, ReverseOut,
false
> : detail::overlay::overlay
- <Geometry1, Geometry2, Reverse1, Reverse2, ReverseOut, OutputIterator, GeometryOut, overlay_union, Strategy>
+ <Geometry1, Geometry2, Reverse1, Reverse2, ReverseOut, OutputIterator, GeometryOut, overlay_union>
{};
@@ -134,8 +129,7 @@
return dispatch::union_insert
<
Geometry1, Geometry2,
- OutputIterator, GeometryOut,
- Strategy
+ OutputIterator, GeometryOut
>::apply(geometry1, geometry2, out, strategy);
}