boost/geometry
2
0
Fork 0
mirror of https://github.com/boostorg/geometry.git synced 2026-02-10 23:42:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #27 from mkaravel/feature/distance-for-merge

Browse Source 
[distance] fix unused variable warnings
This commit is contained in:
Barend Gehrels
2014-05-14 14:36:15 +02:00
parent 71be9ab855 277dcdba59
commit b01fd69d06
5 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/geometry/algorithms/detail/distance/backward_compatibility.hpp
View File

@@ -110,7 +110,7 @@ struct distance
static inline typename return_type<Strategy, Point, typename point_type<Linestring>::type>::type
apply(Point const& point,
Linestring const& linestring,
Strategy const& strategy)
Strategy const&)
{
typedef typename detail::distance::default_ps_strategy
<
@@ -143,7 +143,7 @@ struct distance
static inline return_type apply(Point const& point,
Ring const& ring,
Strategy const& strategy)
Strategy const&)
{
typedef typename detail::distance::default_ps_strategy
<
@@ -181,7 +181,7 @@ struct distance
static inline return_type apply(Point const& point,
Polygon const& polygon,
Strategy const& strategy)
Strategy const&)
{
typedef typename detail::distance::default_ps_strategy
<

1
include/boost/geometry/algorithms/detail/distance/box_to_box.hpp
View File

@@ -43,6 +43,7 @@ struct distance
>::type
apply(Box1 const& box1, Box2 const& box2, Strategy const& strategy)
{
boost::ignore_unused_variable_warning(strategy);
return strategy.apply(box1, box2);
}
};

4
include/boost/geometry/algorithms/detail/distance/point_to_geometry.hpp
View File

@@ -390,10 +390,11 @@ struct distance
Segment const& segment,
Strategy const& strategy)
{
typename point_type<Segment>::type p[2];
geometry::detail::assign_point_from_index<0>(segment, p[0]);
geometry::detail::assign_point_from_index<1>(segment, p[1]);
boost::ignore_unused_variable_warning(strategy);
return strategy.apply(point, p[0], p[1]);
}
};
@@ -413,6 +414,7 @@ struct distance
>::type
apply(Point const& point, Box const& box, Strategy const& strategy)
{
boost::ignore_unused_variable_warning(strategy);
return strategy.apply(point, box);
}
};

3
include/boost/geometry/algorithms/detail/distance/range_to_segment_or_box.hpp
View File

@@ -106,6 +106,7 @@ private:
SegmentPoints const& segment_points,
ComparableStrategy const& strategy)
{
boost::ignore_unused_variable_warning(strategy);
return strategy.apply(point, segment_points[0], segment_points[1]);
}
};
@@ -126,6 +127,8 @@ private:
BoxPoints const& box_points,
ComparableStrategy const& strategy)
{
boost::ignore_unused_variable_warning(strategy);
comparable_return_type cd_min =
strategy.apply(point, box_points[0], box_points[3]);

6
include/boost/geometry/algorithms/detail/distance/segment_to_box.hpp
View File

@@ -81,6 +81,9 @@ private:
{
typedef cast_to_result<ReturnType> cast;
boost::ignore_unused_variable_warning(pp_strategy);
boost::ignore_unused_variable_warning(ps_strategy);
// assert that the segment has non-negative slope
BOOST_ASSERT( (math::equals(geometry::get<0>(p0),
geometry::get<0>(p1))
@@ -217,6 +220,9 @@ private:
{
typedef cast_to_result<ReturnType> cast;
boost::ignore_unused_variable_warning(pp_strategy);
boost::ignore_unused_variable_warning(ps_strategy);
// assert that the segment has negative slope
BOOST_ASSERT
( geometry::get<0>(p0) < geometry::get<0>(p1)