From efd21367ab7df67acb1684be4fd875e509c9716a Mon Sep 17 00:00:00 2001 From: Menelaos Karavelas Date: Wed, 2 Jul 2014 23:30:20 +0300 Subject: [PATCH] [algorithms][comparable distance] change the return type of comparable_distance to comparable_distance_result<...>::type --- .../detail/comparable_distance/interface.hpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/include/boost/geometry/algorithms/detail/comparable_distance/interface.hpp b/include/boost/geometry/algorithms/detail/comparable_distance/interface.hpp index d009ba7ef..01d4c4d10 100644 --- a/include/boost/geometry/algorithms/detail/comparable_distance/interface.hpp +++ b/include/boost/geometry/algorithms/detail/comparable_distance/interface.hpp @@ -20,6 +20,7 @@ #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_COMPARABLE_DISTANCE_INTERFACE_HPP #include +#include #include @@ -46,15 +47,7 @@ namespace boost { namespace geometry \qbk{distinguish,with strategy} */ template -inline typename strategy::distance::services::return_type - < - typename strategy::distance::services::comparable_type - < - Strategy - >::type, - typename point_type::type, - typename point_type::type - >::type +inline typename comparable_distance_result::type comparable_distance(Geometry1 const& geometry1, Geometry2 const& geometry2, Strategy const& strategy) {