Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From f50e7bc9fed323c5705c0ed992c03e80eeec1dd6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jonathan Wakely <jwakely@redhat.com> |
| 3 | Date: Mon, 14 Sep 2015 15:05:24 +0100 |
| 4 | Subject: [PATCH] Do not qualify <fenv.h> names that might be macros. |
| 5 | |
| 6 | The patch was imported from the boost-test git repository |
| 7 | (https://github.com/boostorg/test) as of commit id |
| 8 | f50e7bc9fed323c5705c0ed992c03e80eeec1dd6. |
| 9 | |
| 10 | Upstream-Status: Accepted [commit f50e7bc9fed in develop branch] |
| 11 | |
| 12 | Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de> |
| 13 | --- |
| 14 | include/boost/test/impl/execution_monitor.ipp | 8 ++++---- |
| 15 | 1 file changed, 4 insertions(+), 4 deletions(-) |
| 16 | |
| 17 | diff --git a/include/boost/test/impl/execution_monitor.ipp b/include/boost/test/impl/execution_monitor.ipp |
| 18 | index b3e873e..a7bdce2 100644 |
| 19 | --- a/include/boost/test/impl/execution_monitor.ipp |
| 20 | +++ b/include/boost/test/impl/execution_monitor.ipp |
| 21 | @@ -1380,8 +1380,8 @@ enable( unsigned mask ) |
| 22 | |
| 23 | return ~old_cw & BOOST_FPE_ALL; |
| 24 | #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H) |
| 25 | - ::feclearexcept(BOOST_FPE_ALL); |
| 26 | - int res = ::feenableexcept( mask ); |
| 27 | + feclearexcept(BOOST_FPE_ALL); |
| 28 | + int res = feenableexcept( mask ); |
| 29 | return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res; |
| 30 | #else |
| 31 | /* Not Implemented */ |
| 32 | @@ -1417,8 +1417,8 @@ disable( unsigned mask ) |
| 33 | |
| 34 | return ~old_cw & BOOST_FPE_ALL; |
| 35 | #elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H) |
| 36 | - ::feclearexcept(BOOST_FPE_ALL); |
| 37 | - int res = ::fedisableexcept( mask ); |
| 38 | + feclearexcept(BOOST_FPE_ALL); |
| 39 | + int res = fedisableexcept( mask ); |
| 40 | return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res; |
| 41 | #else |
| 42 | /* Not Implemented */ |
| 43 | -- |
| 44 | 1.9.1 |
| 45 | |