import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / geometry / algorithms / dispatch / distance.hpp

diff --git a/ceph/src/boost/boost/geometry/algorithms/dispatch/distance.hpp b/ceph/src/boost/boost/geometry/algorithms/dispatch/distance.hpp
index cae3ebd0c99c68588e147f790bcae4202861e157..b12fc0ce9dd1df03936a7b4bab689d4b7fe52108 100644 (file)
--- a/ceph/src/boost/boost/geometry/algorithms/dispatch/distance.hpp
+++ b/ceph/src/boost/boost/geometry/algorithms/dispatch/distance.hpp
@@ -5,10 +5,11 @@
 // Copyright (c) 2009-2014 Mateusz Loskot, London, UK.
 // Copyright (c) 2013-2014 Adam Wulkiewicz, Lodz, Poland.
 
-// This file was modified by Oracle on 2014.
-// Modifications copyright (c) 2014, Oracle and/or its affiliates.
+// This file was modified by Oracle on 2014, 2018.
+// Modifications copyright (c) 2014-2018, 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
 
 // Parts of Boost.Geometry are redesigned from Geodan's Geographic Library
 // (geolib/GGL), copyright (c) 1995-2010 Geodan, Amsterdam, the Netherlands.
@@ -25,8 +26,9 @@
 #include <boost/geometry/core/tag.hpp>
 #include <boost/geometry/core/tag_cast.hpp>
 #include <boost/geometry/core/tags.hpp>
-#include <boost/geometry/strategies/distance.hpp>
+#include <boost/geometry/algorithms/detail/distance/default_strategies.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
+#include <boost/geometry/strategies/distance.hpp>
 
 
 namespace boost { namespace geometry