import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / geometry / algorithms / detail / relate / relate_impl.hpp

diff --git a/ceph/src/boost/boost/geometry/algorithms/detail/relate/relate_impl.hpp b/ceph/src/boost/boost/geometry/algorithms/detail/relate/relate_impl.hpp
index ae963c4b036a8452af7a4e96161ed9dc6de6a104..52d3f6e0f8423b5b7816fa166964870f9d20d2dc 100644 (file)
--- a/ceph/src/boost/boost/geometry/algorithms/detail/relate/relate_impl.hpp
+++ b/ceph/src/boost/boost/geometry/algorithms/detail/relate/relate_impl.hpp
@@ -2,8 +2,8 @@
 
 // Copyright (c) 2007-2012 Barend Gehrels, Amsterdam, the Netherlands.
 
-// This file was modified by Oracle on 2013, 2014, 2015, 2019.
-// Modifications copyright (c) 2013-2019 Oracle and/or its affiliates.
+// This file was modified by Oracle on 2013-2020.
+// Modifications copyright (c) 2013-2020 Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -14,9 +14,7 @@
 #ifndef BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_RELATE_IMPL_HPP
 #define BOOST_GEOMETRY_ALGORITHMS_DETAIL_RELATE_RELATE_IMPL_HPP
 
-#include <boost/mpl/if.hpp>
-#include <boost/mpl/or.hpp>
-#include <boost/type_traits/is_base_of.hpp>
+#include <type_traits>
 
 #include <boost/geometry/algorithms/detail/relate/interface.hpp>
 #include <boost/geometry/algorithms/not_implemented.hpp>
@@ -36,9 +34,9 @@ template
     typename Geometry2
 >
 struct relate_impl_base
-    : boost::mpl::if_c
+    : std::conditional_t
         <
-            boost::is_base_of
+            std::is_base_of
                 <
                     nyi::not_implemented_tag,
                     dispatch::relate<Geometry1, Geometry2>
@@ -49,7 +47,7 @@ struct relate_impl_base
                     typename geometry::tag<Geometry2>::type
                 >,
             implemented_tag
-        >::type
+        >
 {};
 
 template