From 980e9a06d40ea70af4d67498c2043d244a85ed99 Mon Sep 17 00:00:00 2001 From: Tobias Schmidl Date: Wed, 3 Feb 2016 07:49:29 +0100 Subject: libboost: version bump 1.59.0 -> 1.60.0 Signed-off-by: Tobias Schmidl Signed-off-by: Michael Olbrich --- ...qualify-fenv.h-names-that-might-be-macros.patch | 37 ---------------------- patches/boost_1_59_0/series | 4 --- ...qualify-fenv.h-names-that-might-be-macros.patch | 37 ++++++++++++++++++++++ patches/boost_1_60_0/series | 4 +++ 4 files changed, 41 insertions(+), 41 deletions(-) delete mode 100644 patches/boost_1_59_0/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch delete mode 100644 patches/boost_1_59_0/series create mode 100644 patches/boost_1_60_0/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch create mode 100644 patches/boost_1_60_0/series (limited to 'patches') diff --git a/patches/boost_1_59_0/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch b/patches/boost_1_59_0/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch deleted file mode 100644 index ff07face7..000000000 --- a/patches/boost_1_59_0/0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Jonathan Wakely -Date: Mon, 14 Sep 2015 15:05:24 +0100 -Subject: [PATCH] Do not qualify names that might be macros - -Original Patch from Fedora. - -Signed-off-by: Michael Olbrich ---- - 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 */ diff --git a/patches/boost_1_59_0/series b/patches/boost_1_59_0/series deleted file mode 100644 index 528326e5d..000000000 --- a/patches/boost_1_59_0/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch -# 20f8615f27865288216e9a577fa6db93 - git-ptx-patches magic 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 +Date: Mon, 14 Sep 2015 15:05:24 +0100 +Subject: [PATCH] Do not qualify names that might be macros + +Original Patch from Fedora. + +Signed-off-by: Michael Olbrich +--- + 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 */ diff --git a/patches/boost_1_60_0/series b/patches/boost_1_60_0/series new file mode 100644 index 000000000..528326e5d --- /dev/null +++ b/patches/boost_1_60_0/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-Do-not-qualify-fenv.h-names-that-might-be-macros.patch +# 20f8615f27865288216e9a577fa6db93 - git-ptx-patches magic -- cgit v1.2.3