import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / test / execution_monitor.hpp

diff --git a/ceph/src/boost/boost/test/execution_monitor.hpp b/ceph/src/boost/boost/test/execution_monitor.hpp
index ed06ef254e6f86d83049dc71966822313348d28c..25e0129edd61c7ea4e56468e8a56a4dd91e407ae 100644 (file)
--- a/ceph/src/boost/boost/test/execution_monitor.hpp
+++ b/ceph/src/boost/boost/test/execution_monitor.hpp
@@ -111,7 +111,8 @@ namespace boost {
 ///
 /// @section DesignRationale Design Rationale
 ///
-/// The Execution Monitor design assumes that it can be used when no (or almost no) memory available. Also the Execution Monitor is intended to be portable to as many platforms as possible.
+/// The Execution Monitor design assumes that it can be used when no (or almost no) memory available. Also the Execution Monitor
+/// is intended to be portable to as many platforms as possible.
 ///
 /// @section UserGuide User's guide
 /// The Execution Monitor is designed to solve the problem of executing potentially dangerous function that may result in any number of error conditions,
@@ -237,7 +238,7 @@ protected:
 /// this class never allocates any memory and assumes that strings it refers to are either some constants or live in a some kind of persistent (preallocated) memory.
 // ************************************************************************** //
 
-class BOOST_TEST_DECL execution_exception {
+class BOOST_SYMBOL_VISIBLE execution_exception {
     typedef boost::unit_test::const_string const_string;
 public:
     /// These values are sometimes used as program return codes.
@@ -337,9 +338,9 @@ public:
 
     ///  Specifies the seconds that elapse before a timer_error occurs.
     ///
-    /// The @em p_timeout property is an integer timeout (in seconds) for monitored function execution. Use this parameter to monitor code with possible deadlocks
-    /// or indefinite loops. This feature is only available for some operating systems (not yet Microsoft Windows).
-    unit_test::readwrite_property<unsigned>  p_timeout;
+    /// The @em p_timeout property is an integer timeout (in microseconds) for monitored function execution. Use this parameter to monitor code with possible deadlocks
+    /// or infinite loops. This feature is only available for some operating systems (not yet Microsoft Windows).
+    unit_test::readwrite_property<unsigned long int>  p_timeout;
 
     ///  Should monitor use alternative stack for the signal catching.
     ///
@@ -515,8 +516,12 @@ enum masks {
     BOOST_FPE_ALL       = MCW_EM,
 
 #elif !defined(BOOST_TEST_FPE_SUPPORT_WITH_GLIBC_EXTENSIONS__)/* *** */
+    BOOST_FPE_DIVBYZERO = BOOST_FPE_OFF,
+    BOOST_FPE_INEXACT   = BOOST_FPE_OFF,
+    BOOST_FPE_INVALID   = BOOST_FPE_OFF,
+    BOOST_FPE_OVERFLOW  = BOOST_FPE_OFF,
+    BOOST_FPE_UNDERFLOW = BOOST_FPE_OFF,
     BOOST_FPE_ALL       = BOOST_FPE_OFF,
-
 #else /* *** */
 
 #if defined(FE_DIVBYZERO)