import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / geometry / geometries / pointing_segment.hpp

diff --git a/ceph/src/boost/boost/geometry/geometries/pointing_segment.hpp b/ceph/src/boost/boost/geometry/geometries/pointing_segment.hpp
index f865a8a8c10f16e616946eceac4b9e8182acd643..fd7f110d24f2151a51b7e81789be89cb01c374bc 100644 (file)
--- a/ceph/src/boost/boost/geometry/geometries/pointing_segment.hpp
+++ b/ceph/src/boost/boost/geometry/geometries/pointing_segment.hpp
@@ -1,8 +1,9 @@
 // Boost.Geometry (aka GGL, Generic Geometry Library)
 
-// Copyright (c) 2014, Oracle and/or its affiliates.
+// Copyright (c) 2014-2020, 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
 
 // Licensed under the Boost Software License version 1.0.
 // http://www.boost.org/users/license.html
@@ -11,11 +12,10 @@
 #define BOOST_GEOMETRY_GEOMETRIES_POINTING_SEGMENT_HPP
 
 #include <cstddef>
+#include <type_traits>
 
 #include <boost/concept/assert.hpp>
 #include <boost/core/addressof.hpp>
-#include <boost/mpl/if.hpp>
-#include <boost/type_traits/is_const.hpp>
 
 #include <boost/geometry/core/access.hpp>
 #include <boost/geometry/core/assert.hpp>
@@ -41,9 +41,9 @@ template <typename ConstOrNonConstPoint>
 class pointing_segment
 {
     BOOST_CONCEPT_ASSERT( (
-        typename boost::mpl::if_
+        typename std::conditional
             <
-                boost::is_const<ConstOrNonConstPoint>,
+                std::is_const<ConstOrNonConstPoint>::value,
                 concepts::Point<ConstOrNonConstPoint>,
                 concepts::ConstPoint<ConstOrNonConstPoint>
             >