Skip to content

Commit

Permalink
Do not qualify <fenv.h> names that might be macros.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jwakely @raffienficiaud
jwakely authored and raffienficiaud committed Nov 22, 2015
1 parent 72bc2c1 commit f50e7bc
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions include/boost/test/impl/execution_monitor.ipp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1380,8 +1380,8 @@ enable( unsigned mask )

return ~old_cw & BOOST_FPE_ALL;
#elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H)
::feclearexcept(BOOST_FPE_ALL);
int res = ::feenableexcept( mask );
feclearexcept(BOOST_FPE_ALL);
int res = feenableexcept( mask );
return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res;
#else
/* Not Implemented */
Expand Down Expand Up @@ -1417,8 +1417,8 @@ disable( unsigned mask )

return ~old_cw & BOOST_FPE_ALL;
#elif defined(__GLIBC__) && defined(__USE_GNU) && !defined(BOOST_CLANG) && !defined(BOOST_NO_FENV_H)
::feclearexcept(BOOST_FPE_ALL);
int res = ::fedisableexcept( mask );
feclearexcept(BOOST_FPE_ALL);
int res = fedisableexcept( mask );
return res == -1 ? (unsigned)BOOST_FPE_INV : (unsigned)res;
#else
/* Not Implemented */
Expand Down

2 comments on commit f50e7bc

@pyther
Copy link

@pyther pyther commented on f50e7bc Jan 17, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to apply this patch to get boost 1.60.0 on ppc64le to pass its tests. Is there a reason why this has not been merged into master?

@raffienficiaud
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We had other issues for 1.60 that were higher priority. This patch is on develop already. The regression dashboard was dead, but now it looks good again. The patch should be part of 1.61.

Please sign in to comment.