import quincy beta 17.1.0

[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 8b7c8837f9b9fa3c26dcdd5055f74a27af51f6a3..2fece7f2a07353781db236d8cfd9f1e210061c63 100644 (file)
--- a/ceph/src/boost/libs/histogram/test/axis_regular_test.cpp
+++ b/ceph/src/boost/libs/histogram/test/axis_regular_test.cpp
@@ -49,9 +49,10 @@ int main() {
   {
     axis::regular<> a{4, -2, 2, "foo"};
     BOOST_TEST_EQ(a.metadata(), "foo");
-    BOOST_TEST_EQ(static_cast<const axis::regular<>&>(a).metadata(), "foo");
-    a.metadata() = "bar";
-    BOOST_TEST_EQ(static_cast<const axis::regular<>&>(a).metadata(), "bar");
+    const auto& cref = a;
+    BOOST_TEST_EQ(cref.metadata(), "foo");
+    cref.metadata() = "bar"; // this is allowed
+    BOOST_TEST_EQ(cref.metadata(), "bar");
     BOOST_TEST_EQ(a.value(0), -2);
     BOOST_TEST_EQ(a.value(1), -1);
     BOOST_TEST_EQ(a.value(2), 0);
@@ -116,7 +117,9 @@ int main() {
 
     BOOST_TEST_THROWS((axis::regular<double, tr::log>{2, -1, 0}), std::invalid_argument);
 
-    BOOST_TEST_EQ(str(a), "regular_log(2, 1, 100, options=underflow | overflow)");
+    BOOST_TEST_CSTR_EQ(
+        str(a).c_str(),
+        "regular(transform::log{}, 2, 1, 100, options=underflow | overflow)");
   }
 
   // with sqrt transform
@@ -138,7 +141,8 @@ int main() {
     BOOST_TEST_EQ(a.index(100), 2);
     BOOST_TEST_EQ(a.index(std::numeric_limits<double>::infinity()), 2);
 
-    BOOST_TEST_EQ(str(a), "regular_sqrt(2, 0, 4, options=underflow | overflow)");
+    BOOST_TEST_EQ(str(a),
+                  "regular(transform::sqrt{}, 2, 0, 4, options=underflow | overflow)");
   }
 
   // with pow transform
@@ -161,7 +165,7 @@ int main() {
     BOOST_TEST_EQ(a.index(std::numeric_limits<double>::infinity()), 2);
 
     BOOST_TEST_EQ(str(a),
-                  "regular_pow(2, 0, 4, options=underflow | overflow, power=0.5)");
+                  "regular(transform::pow{0.5}, 2, 0, 4, options=underflow | overflow)");
   }
 
   // with step