update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / libs / math / example / handle_test_result.hpp

diff --git a/ceph/src/boost/libs/math/example/handle_test_result.hpp b/ceph/src/boost/libs/math/example/handle_test_result.hpp
index cb1432a58c5346104ad218b563c80ee807206354..88a908c48ff46dd7fea64c6477770ac4e509b4a1 100644 (file)
--- a/ceph/src/boost/libs/math/example/handle_test_result.hpp
+++ b/ceph/src/boost/libs/math/example/handle_test_result.hpp
@@ -14,7 +14,7 @@
 #include <iostream>
 #include <iomanip>
 
-#if defined(BOOST_INTEL)
+#if defined(__INTEL_COMPILER)
 #  pragma warning(disable:239)
 #  pragma warning(disable:264)
 #endif
@@ -25,7 +25,7 @@
 //
 void expected_results();
 
-typedef std::pair<boost::regex, std::pair<boost::uintmax_t, boost::uintmax_t> > expected_data_type;
+typedef std::pair<boost::regex, std::pair<std::uintmax_t, std::uintmax_t> > expected_data_type;
 typedef std::list<expected_data_type> list_type;
 
 inline list_type& 
@@ -42,8 +42,8 @@ inline void add_expected_result(
    const char* type_name,
    const char* test_name,
    const char* group_name, 
-   boost::uintmax_t max_peek_error, 
-   boost::uintmax_t max_mean_error)
+   std::uintmax_t max_peek_error, 
+   std::uintmax_t max_mean_error)
 {
    std::string re("(?:");
    re += compiler;
@@ -89,10 +89,10 @@ inline std::string build_test_name(const char* type_name, const char* test_name,
    return result;
 }
 
-inline const std::pair<boost::uintmax_t, boost::uintmax_t>&
+inline const std::pair<std::uintmax_t, std::uintmax_t>&
    get_max_errors(const char* type_name, const char* test_name, const char* group_name)
 {
-   static const std::pair<boost::uintmax_t, boost::uintmax_t> defaults(1, 1);
+   static const std::pair<std::uintmax_t, std::uintmax_t> defaults(1, 1);
    std::string name = build_test_name(type_name, test_name, group_name);
    list_type& l = get_expected_data();
    list_type::const_iterator a(l.begin()), b(l.end());
@@ -118,7 +118,7 @@ void handle_test_result(const boost::math::tools::test_result<T>& result,
                        const char* test_name, 
                        const char* group_name)
 {
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(push)
 #pragma warning(disable:4127)
 #endif
@@ -165,7 +165,7 @@ void handle_test_result(const boost::math::tools::test_result<T>& result,
    //
    // Now verify that the results are within our expected bounds:
    //
-   std::pair<boost::uintmax_t, boost::uintmax_t> const& bounds = get_max_errors(type_name, test_name, group_name);
+   std::pair<std::uintmax_t, std::uintmax_t> const& bounds = get_max_errors(type_name, test_name, group_name);
    if(bounds.first < max_error_found)
    {
       std::cerr << "Peak error greater than expected value of " << bounds.first << std::endl;
@@ -177,7 +177,7 @@ void handle_test_result(const boost::math::tools::test_result<T>& result,
       BOOST_CHECK(bounds.second >= mean_error_found);
    }
    std::cout << std::endl;
-#ifdef BOOST_MSVC
+#ifdef _MSC_VER
 #pragma warning(pop)
 #endif
 }