update boost

linx64/include/boost/geometry/algorithms/dispatch/closest_points.hpp

@@ -0,0 +1,67 @@
+// Boost.Geometry
+
+// Copyright (c) 2021, Oracle and/or its affiliates.
+
+// Contributed and/or modified by Vissarion Fysikopoulos, on behalf of Oracle
+
+// Licensed under the Boost Software License version 1.0.
+// http://www.boost.org/users/license.html
+
+#ifndef BOOST_GEOMETRY_ALGORITHMS_DISPATCH_CLOSEST_POINTS_HPP
+#define BOOST_GEOMETRY_ALGORITHMS_DISPATCH_CLOSEST_POINTS_HPP
+
+
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
+#include <boost/geometry/core/reverse_dispatch.hpp>
+#include <boost/geometry/core/tag.hpp>
+#include <boost/geometry/core/tag_cast.hpp>
+#include <boost/geometry/core/tags.hpp>
+
+#include <boost/geometry/strategies/detail.hpp>
+#include <boost/geometry/strategies/closest_points/services.hpp>
+
+
+namespace boost { namespace geometry
+{
+
+
+#ifndef DOXYGEN_NO_DISPATCH
+namespace dispatch
+{
+
+
+template
+<
+    typename Geometry1, typename Geometry2,
+    typename Tag1 = typename tag_cast
+        <
+            typename tag<Geometry1>::type,
+            segment_tag,
+            box_tag,
+            linear_tag,
+            areal_tag
+        >::type,
+    typename Tag2 = typename tag_cast
+        <
+            typename tag<Geometry2>::type,
+            segment_tag,
+            box_tag,
+            linear_tag,
+            areal_tag
+        >::type,
+    bool Reverse = reverse_dispatch<Geometry1, Geometry2>::type::value
+>
+struct closest_points : not_implemented<Tag1, Tag2>
+{};
+
+
+
+} // namespace dispatch
+#endif // DOXYGEN_NO_DISPATCH
+
+
+}} // namespace boost::geometry
+
+
+#endif // BOOST_GEOMETRY_ALGORITHMS_DISPATCH_CLOSEST_POINTS_HPP

linx64/include/boost/geometry/algorithms/dispatch/distance.hpp

@@ -5,8 +5,8 @@
 // Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
 // Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2014, 2018.
-// Modifications copyright (c) 2014-2018, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2014-2021.
+// Modifications copyright (c) 2014-2021, Oracle and/or its affiliates.
 
 // Contributed and/or modified by Menelaos Karavelas, on behalf of Oracle
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
@@ -22,13 +22,16 @@
 #define BOOST_GEOMETRY_ALGORITHMS_DISPATCH_DISTANCE_HPP
 
 
+#include <boost/geometry/algorithms/not_implemented.hpp>
+
 #include <boost/geometry/core/reverse_dispatch.hpp>
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tag_cast.hpp>
 #include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/algorithms/detail/distance/default_strategies.hpp>
-#include <boost/geometry/algorithms/not_implemented.hpp>
+
+#include <boost/geometry/strategies/detail.hpp>
 #include <boost/geometry/strategies/distance.hpp>
+#include <boost/geometry/strategies/distance/services.hpp>
 
 
 namespace boost { namespace geometry
@@ -40,10 +43,58 @@ namespace dispatch
 {
 
 
+template
+<
+    typename Geometry1, typename Geometry2, typename Strategies,
+    bool IsUmbrella = strategies::detail::is_umbrella_strategy<Strategies>::value,
+    bool Reverse = reverse_dispatch<Geometry1, Geometry2>::value
+>
+struct distance_strategy_type
+{
+    typedef decltype(std::declval<Strategies>().distance(std::declval<Geometry1>(), std::declval<Geometry2>())) type;
+};
+
+// TODO: right now legacy single strategy can be passed here in some cases
+//       so for now dispatch also by IsUmbrella. Later this could be removed.
+template <typename Geometry1, typename Geometry2, typename Strategy, bool Reverse>
+struct distance_strategy_type<Geometry1, Geometry2, Strategy, false, Reverse>
+{
+    typedef Strategy type;
+};
+
+template <typename Geometry1, typename Geometry2, typename Strategies>
+struct distance_strategy_type<Geometry1, Geometry2, Strategies, true, true>
+    : distance_strategy_type<Geometry2, Geometry1, Strategies, true, false>
+{};
+
+
+template
+<
+    typename Geometry1, typename Geometry2, typename Strategies,
+    bool IsDynamicOrGC = util::is_dynamic_geometry<Geometry1>::value
+                      || util::is_dynamic_geometry<Geometry2>::value
+                      || util::is_geometry_collection<Geometry1>::value
+                      || util::is_geometry_collection<Geometry2>::value
+>
+struct distance_strategy_tag
+{
+    using type = void;
+};
+
+template <typename Geometry1, typename Geometry2, typename Strategies>
+struct distance_strategy_tag<Geometry1, Geometry2, Strategies, false>
+{
+    using type = typename strategy::distance::services::tag
+        <
+            typename distance_strategy_type<Geometry1, Geometry2, Strategies>::type
+        >::type;
+};
+
+
 template
 <
     typename Geometry1, typename Geometry2,
-    typename Strategy = typename detail::distance::default_strategy
+    typename Strategy = typename strategies::distance::services::default_strategy
         <
             Geometry1, Geometry2
         >::type,
@@ -63,13 +114,13 @@ template
             linear_tag,
             areal_tag
         >::type,
-    typename StrategyTag = typename strategy::distance::services::tag
+    typename StrategyTag = typename distance_strategy_tag
         <
-            Strategy
+            Geometry1, Geometry2, Strategy
         >::type,
-    bool Reverse = reverse_dispatch<Geometry1, Geometry2>::type::value
+    bool Reverse = reverse_dispatch<Geometry1, Geometry2>::value
 >
-struct distance: not_implemented<Tag1, Tag2>
+struct distance : not_implemented<Tag1, Tag2>
 {};