update ceph source to reef 18.1.2

[ceph.git] / ceph / src / boost / boost / math / special_functions / nonfinite_num_facets.hpp

diff --git a/ceph/src/boost/boost/math/special_functions/nonfinite_num_facets.hpp b/ceph/src/boost/boost/math/special_functions/nonfinite_num_facets.hpp
index cd1eba932073551482be64f1d579540ff452c319..4ff702b3084dc5f6f81a9325bce9e50ccaf5a08f 100644 (file)
--- a/ceph/src/boost/boost/math/special_functions/nonfinite_num_facets.hpp
+++ b/ceph/src/boost/boost/math/special_functions/nonfinite_num_facets.hpp
@@ -22,10 +22,7 @@
 #include <ios>
 #include <limits>
 #include <locale>
-
-#include <boost/version.hpp>
-#include <boost/throw_exception.hpp>
-
+#include <boost/math/tools/throw_exception.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
 #include <boost/math/special_functions/sign.hpp>
 
@@ -104,7 +101,7 @@ namespace boost {
         case FP_INFINITE:
           if(flags_ & trap_infinity)
           {
-            BOOST_THROW_EXCEPTION(std::ios_base::failure("Infinity"));
+            BOOST_MATH_THROW_EXCEPTION(std::ios_base::failure("Infinity"));
           }
           else if((boost::math::signbit)(val))
           { // negative infinity.
@@ -123,7 +120,7 @@ namespace boost {
         case FP_NAN:
           if(flags_ & trap_nan)
           {
-            BOOST_THROW_EXCEPTION(std::ios_base::failure("NaN"));
+            BOOST_MATH_THROW_EXCEPTION(std::ios_base::failure("NaN"));
           }
           else if((boost::math::signbit)(val))
           { // negative so "-nan".
@@ -417,7 +414,7 @@ namespace boost {
         switch(peek_char(it, end, ct)) {
         case 'q':
         case 's':
-          if(flags_ && legacy)
+          if(flags_ & legacy)
             ++it;
           break;  // "nanq", "nans"