external/boost/boost_1_60_0.undef.warning.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
New commits: commit a706590e8e7cd048e3117bc9a5ff7677fd5ab490 Author: Stephan Bergmann <[email protected]> Date: Tue Sep 19 09:00:52 2017 +0200 Better update of external/boost/boost_1_60_0.undef.warning.patch follow-up to 9d837f19d1bf4cfbdee528e027f5b72d9b1da73d "Upgrade to Boost 1.65.1", in accordance with <https://github.com/boostorg/config/commit/ 2dfd1a95bab49afcc374aadb1491d8fde189db74> "Move workaround.hpp out of detail (used by more than Config)" Change-Id: I666911ef89e94b4ab717c23394b76dd0662dd9ef Reviewed-on: https://gerrit.libreoffice.org/42443 Tested-by: Jenkins <[email protected]> Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/external/boost/boost_1_60_0.undef.warning.patch b/external/boost/boost_1_60_0.undef.warning.patch index face1bbc4a3e..79441d6cc1fc 100644 --- a/external/boost/boost_1_60_0.undef.warning.patch +++ b/external/boost/boost_1_60_0.undef.warning.patch @@ -1,16 +1,16 @@ -diff -ur boost.orig/boost/detail/workaround.hpp boost/boost/detail/workaround.hpp ---- a/b/boost.orig/boost/detail/workaround.hpp 2015-12-13 13:49:42.000000000 +0100 -+++ a/b/boost/boost/detail/workaround.hpp 2016-01-29 15:07:43.427781248 +0100 -@@ -5,6 +5,12 @@ - #ifndef WORKAROUND_DWA2002126_HPP - #define WORKAROUND_DWA2002126_HPP - +--- a/b/boost/boost/config/workaround.hpp ++++ a/b/boost/boost/config/workaround.hpp +@@ -237,6 +237,13 @@ + #else + #define BOOST_INTEL_WORKAROUND_GUARD 0 + #endif ++ +#ifndef BOOST_GCC_VERSION +#define BOOST_GCC_VERSION_WORKAROUND_GUARD 1 +#else +#define BOOST_GCC_VERSION_WORKAROUND_GUARD 0 +#endif + - #include <boost/config/workaround.hpp> + // Always define to zero, if it's used it'll be defined my MPL: + #define BOOST_MPL_CFG_GCC_WORKAROUND_GUARD 0 - #endif // WORKAROUND_DWA2002126_HPP _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
