From 6681aefa22b1b9f847372cbc5ffbe71b7a85d0ea Mon Sep 17 00:00:00 2001
From: Menelaos Karavelas <menelaos.karavelas@gmail.com>
Date: Tue, 8 Jul 2014 12:32:00 +0300
Subject: [PATCH] [algorithms][comparable distance] make comparable distance
 algorithm variant-aware

---
 .../detail/comparable_distance/interface.hpp   | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/include/boost/geometry/algorithms/detail/comparable_distance/interface.hpp b/include/boost/geometry/algorithms/detail/comparable_distance/interface.hpp
index 01d4c4d10..62a42ca05 100644
--- a/include/boost/geometry/algorithms/detail/comparable_distance/interface.hpp
+++ b/include/boost/geometry/algorithms/detail/comparable_distance/interface.hpp
@@ -19,11 +19,16 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_COMPARABLE_DISTANCE_INTERFACE_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_COMPARABLE_DISTANCE_INTERFACE_HPP
 
-#include <boost/geometry/strategies/default_comparable_distance_result.hpp>
+#include <boost/geometry/geometries/concepts/check.hpp>
+
 #include <boost/geometry/strategies/comparable_distance_result.hpp>
+#include <boost/geometry/strategies/default_comparable_distance_result.hpp>
+#include <boost/geometry/strategies/default_comparable_strategy.hpp>
+#include <boost/geometry/strategies/distance.hpp>
 
 #include <boost/geometry/algorithms/detail/distance/interface.hpp>
 
+
 namespace boost { namespace geometry
 {
 
@@ -87,16 +92,7 @@ comparable_distance(Geometry1 const& geometry1, Geometry2 const& geometry2)
     concept::check<Geometry1 const>();
     concept::check<Geometry2 const>();
 
-    // Define the default-distance-strategy
-    typedef typename strategy::distance::services::comparable_type
-        <
-            typename detail::distance::default_strategy
-                <
-                    Geometry1, Geometry2
-                >::type
-        >::type default_comparable_strategy_type;
-
-    return distance(geometry1, geometry2, default_comparable_strategy_type());
+    return distance(geometry1, geometry2, default_comparable_strategy());
 }