a706590e8e
follow-up to 9d837f19d1 "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 <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
17 lines
411 B
Diff
17 lines
411 B
Diff
--- 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
|
|
+
|
|
// Always define to zero, if it's used it'll be defined my MPL:
|
|
#define BOOST_MPL_CFG_GCC_WORKAROUND_GUARD 0
|
|
|