update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / boost / libs / units / test / test_default_conversion.cpp

diff --git a/ceph/src/boost/libs/units/test/test_default_conversion.cpp b/ceph/src/boost/libs/units/test/test_default_conversion.cpp
index 734a9431ca102678620a6222744286087dfe2153..f05aac699412fe0c61149e258ea672be6d836e5d 100644 (file)
--- a/ceph/src/boost/libs/units/test/test_default_conversion.cpp
+++ b/ceph/src/boost/libs/units/test/test_default_conversion.cpp
@@ -54,24 +54,24 @@ BOOST_UNITS_DEFAULT_CONVERSION(unit6_tag, make_unit<unit3_tag>::type);
 BOOST_UNITS_DEFAULT_CONVERSION(unit7_tag, make_unit<unit1_tag>::type);
 
 int test_main(int, char*[]) {
-    double value1 = boost::units::conversion_factor(unit3_tag::unit_type(), unit1_tag::unit_type());
+    BOOST_CONSTEXPR_OR_CONST double value1 = boost::units::conversion_factor(unit3_tag::unit_type(), unit1_tag::unit_type());
     BOOST_CHECK(std::abs(value1 - 1.0/6.0) < .0000000001);
-    double value2 = boost::units::conversion_factor(unit5_tag::unit_type() / unit4_tag::unit_type(), unit1_tag::unit_type());
+    BOOST_CONSTEXPR_OR_CONST double value2 = boost::units::conversion_factor(unit5_tag::unit_type() / unit4_tag::unit_type(), unit1_tag::unit_type());
     BOOST_CHECK(std::abs(value2 - 5.0/6.0) < .0000000001);
     typedef boost::units::scaled_base_unit<unit5_tag, boost::units::scale<2, boost::units::static_rational<1> > > scaled_unit5_tag;
-    double value3 = boost::units::conversion_factor(scaled_unit5_tag::unit_type() / unit4_tag::unit_type(), unit1_tag::unit_type());
+    BOOST_CONSTEXPR_OR_CONST double value3 = boost::units::conversion_factor(scaled_unit5_tag::unit_type() / unit4_tag::unit_type(), unit1_tag::unit_type());
     BOOST_CHECK(std::abs(value3 - 10.0/6.0) < .0000000001);
 
     // check homogeneous unit conversions
-    double value4 = boost::units::conversion_factor(make_unit<unit3_tag>::type(), make_unit<unit1_tag>::type());
+    BOOST_CONSTEXPR_OR_CONST double value4 = boost::units::conversion_factor(make_unit<unit3_tag>::type(), make_unit<unit1_tag>::type());
     BOOST_CHECK(std::abs(value4 - 1.0/6.0) < .0000000001);
-    double value5 = boost::units::conversion_factor(unit3_tag::unit_type(), make_unit<unit1_tag>::type());
+    BOOST_CONSTEXPR_OR_CONST double value5 = boost::units::conversion_factor(unit3_tag::unit_type(), make_unit<unit1_tag>::type());
     BOOST_CHECK(std::abs(value5 - 1.0/6.0) < .0000000001);
-    double value6 = boost::units::conversion_factor(make_unit<unit3_tag>::type(), unit1_tag::unit_type());
+    BOOST_CONSTEXPR_OR_CONST double value6 = boost::units::conversion_factor(make_unit<unit3_tag>::type(), unit1_tag::unit_type());
     BOOST_CHECK(std::abs(value6 - 1.0/6.0) < .0000000001);
 
     // check chained homogeneous conversions
-    double value7 = boost::units::conversion_factor(unit6_tag::unit_type(), unit7_tag::unit_type());
+    BOOST_CONSTEXPR_OR_CONST double value7 = boost::units::conversion_factor(unit6_tag::unit_type(), unit7_tag::unit_type());
     BOOST_CHECK(std::abs(value7 - 5.0/42.0) < .0000000001);
 
     return(0);