Subject: [Boost-commit] svn:boost r70474 - in trunk/boost/test: . impl
From: john_at_[hidden]
Date: 2011-03-23 08:24:20
Author: johnmaddock
Date: 2011-03-23 08:24:19 EDT (Wed, 23 Mar 2011)
New Revision: 70474
URL: http://svn.boost.org/trac/boost/changeset/70474
Log:
check BOOST_NO_FENV_H before making use of it.
Text files modified:
trunk/boost/test/execution_monitor.hpp | 4 ++--
trunk/boost/test/impl/execution_monitor.ipp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
Modified: trunk/boost/test/execution_monitor.hpp
==============================================================================
--- trunk/boost/test/execution_monitor.hpp (original)
+++ trunk/boost/test/execution_monitor.hpp 2011-03-23 08:24:19 EDT (Wed, 23 Mar 2011)
@@ -77,7 +77,7 @@
#else // based on ISO C standard
-#if !defined(__CYGWIN__)
+#if !defined(BOOST_NO_FENV_H)
#include <boost/detail/fenv.hpp>
#endif
@@ -352,7 +352,7 @@
BOOST_FPE_UNDERFLOW = EM_UNDERFLOW|EM_DENORMAL,
BOOST_FPE_ALL = MCW_EM,
-#elif defined(__CYGWIN__) || defined(BOOST_CLANG)
+#elif defined(BOOST_NO_FENV_H) || defined(BOOST_CLANG)
BOOST_FPE_ALL = 1,
#else
BOOST_FPE_DIVBYZERO = FE_DIVBYZERO,
Modified: trunk/boost/test/impl/execution_monitor.ipp
==============================================================================
--- trunk/boost/test/impl/execution_monitor.ipp (original)
+++ trunk/boost/test/impl/execution_monitor.ipp 2011-03-23 08:24:19 EDT (Wed, 23 Mar 2011)
@@ -1337,7 +1337,7 @@
#endif
return ~old_cw & BOOST_FPE_ALL;
-#elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG)
+#elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H)
::feclearexcept(BOOST_FPE_ALL);
int res = ::feenableexcept( mask );
return res == -1 ? BOOST_FPE_INV : (unsigned)res;
@@ -1372,7 +1372,7 @@
#endif
return ~old_cw & BOOST_FPE_ALL;
-#elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG)
+#elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H)
::feclearexcept(BOOST_FPE_ALL);
int res = ::fedisableexcept( mask );
return res == -1 ? BOOST_FPE_INV : (unsigned)res;