import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / libs / geometry / test / util / tuples.cpp

diff --git a/ceph/src/boost/libs/geometry/test/util/tuples.cpp b/ceph/src/boost/libs/geometry/test/util/tuples.cpp
index 19583fb38e79562d739239a66d1c2486a1094b2d..510200b4d1272b7103f3199407e79b99e24b5809 100644 (file)
--- a/ceph/src/boost/libs/geometry/test/util/tuples.cpp
+++ b/ceph/src/boost/libs/geometry/test/util/tuples.cpp
@@ -1,7 +1,7 @@
 // Boost.Geometry
 // Unit Test
 
-// Copyright (c) 2019 Oracle and/or its affiliates.
+// Copyright (c) 2019-2020 Oracle and/or its affiliates.
 
 // Contributed and/or modified by Adam Wulkiewicz, on behalf of Oracle
 
@@ -20,59 +20,55 @@ namespace bm = boost::mpl;
 
 template <typename T>
 struct is_double
-    : boost::is_same<T, double>
+    : std::is_same<T, double>
 {};
 
 template <typename T>
 struct is_float
-    : boost::is_same<T, float>
+    : std::is_same<T, float>
 {};
 
 
 template <typename Tuple>
 struct is_boost_tuple
-    : boost::integral_constant<bool, false>
+    : std::integral_constant<bool, false>
 {};
 
-template <class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9>
-struct is_boost_tuple<boost::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> >
-    : boost::integral_constant<bool, true>
+template <typename ...Ts>
+struct is_boost_tuple<boost::tuple<Ts...> >
+    : std::integral_constant<bool, true>
 {};
 
 template <typename Tuple>
 struct is_boost_tuples_cons
-    : boost::integral_constant<bool, false>
+    : std::integral_constant<bool, false>
 {};
 
 template <typename HT, typename TT>
 struct is_boost_tuples_cons<boost::tuples::cons<HT, TT> >
-    : boost::integral_constant<bool, true>
+    : std::integral_constant<bool, true>
 {};
 
 template <typename Tuple>
 struct is_std_pair
-    : boost::integral_constant<bool, false>
+    : std::integral_constant<bool, false>
 {};
 
 template <typename F, typename S>
 struct is_std_pair<std::pair<F, S> >
-    : boost::integral_constant<bool, true>
+    : std::integral_constant<bool, true>
 {};
 
-#if !defined(BOOST_NO_CXX11_HDR_TUPLE) && !defined(BOOST_NO_VARIADIC_TEMPLATES)
-
 template <typename Tuple>
 struct is_std_tuple
-    : boost::integral_constant<bool, false>
+    : std::integral_constant<bool, false>
 {};
 
 template <typename ...Ts>
 struct is_std_tuple<std::tuple<Ts...> >
-    : boost::integral_constant<bool, true>
+    : std::integral_constant<bool, true>
 {};
 
-#endif
-
 template <typename Tuple>
 void test_all()
 {
@@ -82,13 +78,13 @@ void test_all()
     BOOST_CHECK_EQUAL((bgt::get<0>(tup_id)), 1);
     BOOST_CHECK_EQUAL((bgt::get<1>(tup_id)), 2.0);
 
-    BOOST_CHECK_EQUAL(int(bgt::size<tuple_id>::value), 2);
+    BOOST_CHECK_EQUAL((bgt::size<tuple_id>::value), 2u);
 
-    BOOST_CHECK_EQUAL((bgt::find_index_if<tuple_id, is_double>::value), 1);
-    BOOST_CHECK((boost::is_same<typename bgt::find_if<tuple_id, is_double>::type, double>::value));
+    BOOST_CHECK_EQUAL((bgt::find_index_if<tuple_id, is_double>::value), 1u);
+    BOOST_CHECK((std::is_same<typename bgt::find_if<tuple_id, is_double>::type, double>::value));
 
-    BOOST_CHECK_EQUAL((bgt::find_index_if<tuple_id, is_float>::value), 2);
-    BOOST_CHECK((boost::is_same<typename bgt::find_if<tuple_id, is_float>::type, boost::tuples::null_type>::value));
+    BOOST_CHECK_EQUAL((bgt::find_index_if<tuple_id, is_float>::value), 2u);
+    BOOST_CHECK((std::is_same<typename bgt::find_if<tuple_id, is_float>::type, bg::tuples::detail::null_type>::value));
 
     typedef typename bgt::push_back<tuple_id, float>::type tuple_idf;
     tuple_idf tup_idf = bgt::push_back<tuple_id, float>::apply(tup_id, 3.0f);
@@ -97,45 +93,28 @@ void test_all()
     BOOST_CHECK_EQUAL((bgt::get<1>(tup_idf)), 2.0);
     BOOST_CHECK_EQUAL((bgt::get<2>(tup_idf)), 3.0f);
 
-    BOOST_CHECK_EQUAL(int(bgt::size<tuple_idf>::value), 3);
-
-    BOOST_CHECK_EQUAL((bgt::find_index_if<tuple_idf, is_float>::value), 2);
-    BOOST_CHECK((boost::is_same<typename bgt::find_if<tuple_idf, is_float>::type, float>::value));
+    BOOST_CHECK_EQUAL((bgt::size<tuple_idf>::value), 3u);
 
-#if !defined(BOOST_NO_CXX11_HDR_TUPLE) && !defined(BOOST_NO_VARIADIC_TEMPLATES)
+    BOOST_CHECK_EQUAL((bgt::find_index_if<tuple_idf, is_float>::value), 2u);
+    BOOST_CHECK((std::is_same<typename bgt::find_if<tuple_idf, is_float>::type, float>::value));
 
     BOOST_CHECK((
         (is_boost_tuple<tuple_id>::value && is_boost_tuples_cons<tuple_idf>::value)
      || (!is_boost_tuple<tuple_id>::value && is_std_tuple<tuple_idf>::value)
         ));
 
-#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
-
     tup_idf = bgt::push_back<tuple_id, float>::apply(std::move(tup_id), 3.0f);
 
     BOOST_CHECK_EQUAL((bgt::get<0>(tup_idf)), 1);
     BOOST_CHECK_EQUAL((bgt::get<1>(tup_idf)), 2.0);
     BOOST_CHECK_EQUAL((bgt::get<2>(tup_idf)), 3.0f);
-
-#endif
-
-#else
-
-    BOOST_CHECK((is_boost_tuples_cons<tuple_idf>::type, float>::value));
-
-#endif
 }
 
 int test_main(int, char* [])
 {
-    test_all<boost::tuple<int, double> >();
-    test_all<std::pair<int, double> >();
-
-#if !defined(BOOST_NO_CXX11_HDR_TUPLE) && !defined(BOOST_NO_VARIADIC_TEMPLATES)
-
     test_all<std::tuple<int, double> >();
+    test_all<std::pair<int, double> >();
+    test_all<boost::tuple<int, double> >();
 
-#endif
-    
     return 0;
 }