update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / libs / histogram / test / axis_regular_test.cpp

diff --git a/ceph/src/boost/libs/histogram/test/axis_regular_test.cpp b/ceph/src/boost/libs/histogram/test/axis_regular_test.cpp
index 5d3e111cdfc3ab8fe9cb52c9b45b2461e47a7c74..8b7c8837f9b9fa3c26dcdd5055f74a27af51f6a3 100644 (file)
--- a/ceph/src/boost/libs/histogram/test/axis_regular_test.cpp
+++ b/ceph/src/boost/libs/histogram/test/axis_regular_test.cpp
@@ -197,28 +197,26 @@ int main() {
 
   // with growth
   {
+    using pii_t = std::pair<axis::index_type, axis::index_type>;
     axis::regular<double, def, def, axis::option::growth_t> a{1, 0, 1};
     BOOST_TEST_EQ(a.size(), 1);
-    BOOST_TEST_EQ(a.update(0), std::make_pair(0, 0));
+    BOOST_TEST_EQ(a.update(0), pii_t(0, 0));
     BOOST_TEST_EQ(a.size(), 1);
-    BOOST_TEST_EQ(a.update(1), std::make_pair(1, -1));
+    BOOST_TEST_EQ(a.update(1), pii_t(1, -1));
     BOOST_TEST_EQ(a.size(), 2);
     BOOST_TEST_EQ(a.value(0), 0);
     BOOST_TEST_EQ(a.value(2), 2);
-    BOOST_TEST_EQ(a.update(-1), std::make_pair(0, 1));
+    BOOST_TEST_EQ(a.update(-1), pii_t(0, 1));
     BOOST_TEST_EQ(a.size(), 3);
     BOOST_TEST_EQ(a.value(0), -1);
     BOOST_TEST_EQ(a.value(3), 2);
-    BOOST_TEST_EQ(a.update(-10), std::make_pair(0, 9));
+    BOOST_TEST_EQ(a.update(-10), pii_t(0, 9));
     BOOST_TEST_EQ(a.size(), 12);
     BOOST_TEST_EQ(a.value(0), -10);
     BOOST_TEST_EQ(a.value(12), 2);
-    BOOST_TEST_EQ(a.update(std::numeric_limits<double>::infinity()),
-                  std::make_pair(a.size(), 0));
-    BOOST_TEST_EQ(a.update(std::numeric_limits<double>::quiet_NaN()),
-                  std::make_pair(a.size(), 0));
-    BOOST_TEST_EQ(a.update(-std::numeric_limits<double>::infinity()),
-                  std::make_pair(-1, 0));
+    BOOST_TEST_EQ(a.update(std::numeric_limits<double>::infinity()), pii_t(a.size(), 0));
+    BOOST_TEST_EQ(a.update(std::numeric_limits<double>::quiet_NaN()), pii_t(a.size(), 0));
+    BOOST_TEST_EQ(a.update(-std::numeric_limits<double>::infinity()), pii_t(-1, 0));
   }
 
   // iterators