summaryrefslogtreecommitdiffstats
path: root/patches/boost_1_60_0/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/boost_1_60_0/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch')
-rw-r--r--patches/boost_1_60_0/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/patches/boost_1_60_0/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch b/patches/boost_1_60_0/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch
new file mode 100644
index 000000000..ff07face7
--- /dev/null
+++ b/patches/boost_1_60_0/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch
@@ -0,0 +1,37 @@
+From: Jonathan Wakely <jwakely@redhat.com>
+Date: Mon, 14 Sep 2015 15:05:24 +0100
+Subject: [PATCH] Do not qualify <fenv.h> names that might be macros
+
+Original Patch from Fedora.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ boost/test/impl/execution_monitor.ipp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/boost/test/impl/execution_monitor.ipp b/boost/test/impl/execution_monitor.ipp
+index 9929f74b53c8..0ecb457bfd20 100644
+--- a/boost/test/impl/execution_monitor.ipp
++++ b/boost/test/impl/execution_monitor.ipp
+@@ -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 */
+@@ -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 */