diff --git a/include/boost/geometry/algorithms/covered_by.hpp b/include/boost/geometry/algorithms/covered_by.hpp index 4df4faa2b..a8b32c988 100644 --- a/include/boost/geometry/algorithms/covered_by.hpp +++ b/include/boost/geometry/algorithms/covered_by.hpp @@ -35,7 +35,6 @@ template < typename Geometry1, typename Geometry2, - typename Strategy, typename Tag1 = typename tag::type, typename Tag2 = typename tag::type > @@ -49,18 +48,20 @@ struct covered_by }; -template -struct covered_by +template +struct covered_by { + template static inline bool apply(Point const& point, Box const& box, Strategy const& strategy) { return strategy.apply(point, box); } }; -template -struct covered_by +template +struct covered_by { + template static inline bool apply(Box1 const& box1, Box2 const& box2, Strategy const& strategy) { assert_dimension_equal(); @@ -70,9 +71,10 @@ struct covered_by -template -struct covered_by +template +struct covered_by { + template static inline bool apply(Point const& point, Ring const& ring, Strategy const& ) { return detail::within::point_in_ring @@ -86,9 +88,10 @@ struct covered_by } }; -template -struct covered_by +template +struct covered_by { + template static inline bool apply(Point const& point, Polygon const& polygon, Strategy const& strategy) { return detail::within::point_in_polygon @@ -152,8 +155,7 @@ inline bool covered_by(Geometry1 const& geometry1, Geometry2 const& geometry2) return dispatch::covered_by < Geometry1, - Geometry2, - strategy_type + Geometry2 >::apply(geometry1, geometry2, strategy_type()); } @@ -192,8 +194,7 @@ inline bool covered_by(Geometry1 const& geometry1, Geometry2 const& geometry2, return dispatch::covered_by < Geometry1, - Geometry2, - Strategy + Geometry2 >::apply(geometry1, geometry2, strategy); } diff --git a/include/boost/geometry/multi/algorithms/covered_by.hpp b/include/boost/geometry/multi/algorithms/covered_by.hpp index 8d2f3034f..36360566d 100644 --- a/include/boost/geometry/multi/algorithms/covered_by.hpp +++ b/include/boost/geometry/multi/algorithms/covered_by.hpp @@ -29,9 +29,10 @@ namespace boost { namespace geometry namespace dispatch { -template -struct covered_by +template +struct covered_by { + template static inline bool apply(Point const& point, MultiPolygon const& multi_polygon, Strategy const& strategy) {