1 files changed, 10 insertions, 140 deletions
diff --git a/boost/geometry/multi/algorithms/distance.hpp b/boost/geometry/multi/algorithms/distance.hpp
index 8acb3f9006..4946b6f3e1 100644
--- a/boost/geometry/multi/algorithms/distance.hpp
+++ b/boost/geometry/multi/algorithms/distance.hpp
@@ -1,8 +1,13 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
-// Copyright (c) 2008-2012 Bruno Lalande, Paris, France.
-// Copyright (c) 2009-2012 Mateusz Loskot, London, UK.
+// Copyright (c) 2007-2014 Barend Gehrels, Amsterdam, the Netherlands.
+// Copyright (c) 2008-2014 Bruno Lalande, Paris, France.
+// Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
+
+// This file was modified by Oracle on 2014.
+// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -14,144 +19,9 @@
 #ifndef BOOST_GEOMETRY_MULTI_ALGORITHMS_DISTANCE_HPP
 #define BOOST_GEOMETRY_MULTI_ALGORITHMS_DISTANCE_HPP
 
-
-#include <boost/numeric/conversion/bounds.hpp>
-#include <boost/range.hpp>
-
-#include <boost/geometry/multi/core/tags.hpp>
-#include <boost/geometry/multi/core/geometry_id.hpp>
-#include <boost/geometry/multi/core/point_type.hpp>
+// this file is intentionally empty (with the exception of the #include below)
+// it is used for backward compatinility and may be removed in the future
 
 #include <boost/geometry/algorithms/distance.hpp>
-#include <boost/geometry/multi/algorithms/num_points.hpp>
-#include <boost/geometry/util/select_coordinate_type.hpp>
-
-
-namespace boost { namespace geometry
-{
-
-#ifndef DOXYGEN_NO_DETAIL
-namespace detail { namespace distance
-{
-
-
-template<typename Geometry, typename MultiGeometry, typename Strategy>
-struct distance_single_to_multi
-    : private dispatch::distance
-      <
-          Geometry,
-          typename range_value<MultiGeometry>::type,
-          Strategy
-      >
-{
-    typedef typename strategy::distance::services::return_type<Strategy>::type return_type;
-
-    static inline return_type apply(Geometry const& geometry,
-                MultiGeometry const& multi,
-                Strategy const& strategy)
-    {
-        return_type mindist = return_type();
-        bool first = true;
-
-        for(typename range_iterator<MultiGeometry const>::type it = boost::begin(multi);
-                it != boost::end(multi);
-                ++it, first = false)
-        {
-            return_type dist = dispatch::distance
-                <
-                    Geometry,
-                    typename range_value<MultiGeometry>::type,
-                    Strategy
-                >::apply(geometry, *it, strategy);
-
-            if (first || dist < mindist)
-            {
-                mindist = dist;
-            }
-        }
-
-        return mindist;
-    }
-};
-
-template<typename Multi1, typename Multi2, typename Strategy>
-struct distance_multi_to_multi
-    : private distance_single_to_multi
-      <
-          typename range_value<Multi1>::type,
-          Multi2,
-          Strategy
-      >
-{
-    typedef typename strategy::distance::services::return_type<Strategy>::type return_type;
-
-    static inline return_type apply(Multi1 const& multi1,
-                Multi2 const& multi2, Strategy const& strategy)
-    {
-        return_type mindist = return_type();
-        bool first = true;
-
-        for(typename range_iterator<Multi1 const>::type it = boost::begin(multi1);
-                it != boost::end(multi1);
-                ++it, first = false)
-        {
-            return_type dist = distance_single_to_multi
-                <
-                    typename range_value<Multi1>::type,
-                    Multi2,
-                    Strategy
-                >::apply(*it, multi2, strategy);
-            if (first || dist < mindist)
-            {
-                mindist = dist;
-            }
-        }
-
-        return mindist;
-    }
-};
-
-
-}} // namespace detail::distance
-#endif
-
-
-#ifndef DOXYGEN_NO_DISPATCH
-namespace dispatch
-{
-
-template
-<
-    typename G1,
-    typename G2,
-    typename Strategy,
-    typename SingleGeometryTag
->
-struct distance
-<
-    G1, G2, Strategy,
-    SingleGeometryTag, multi_tag, strategy_tag_distance_point_point,
-    false
->
-    : detail::distance::distance_single_to_multi<G1, G2, Strategy>
-{};
-
-template <typename G1, typename G2, typename Strategy>
-struct distance
-<
-    G1, G2, Strategy,
-    multi_tag, multi_tag, strategy_tag_distance_point_point,
-    false
->
-    : detail::distance::distance_multi_to_multi<G1, G2, Strategy>
-{};
-
-} // namespace dispatch
-#endif
-
-
-
-}} // namespace boost::geometry
-
 
 #endif // BOOST_GEOMETRY_MULTI_ALGORITHMS_DISTANCE_HPP