diff options
Diffstat (limited to 'external')
| -rw-r--r-- | external/boost/UnpackedTarball_boost.mk | 3 | ||||
| -rw-r--r-- | external/boost/boost.utility.Wundef.warnings.patch | 11 |
2 files changed, 0 insertions, 14 deletions
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index 96bf85583673..91a0e264a926 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -12,9 +12,6 @@ boost_patches := #https://svn.boost.org/trac/boost/ticket/6142 boost_patches += boost.6142.warnings.patch.1 -# https://svn.boost.org/trac/boost/ticket/9903 -boost_patches += boost.utility.Wundef.warnings.patch - boost_patches += boost.noiconv.patch boost_patches += boost.between.warning.patch boost_patches += boost.fallback.encoding.patch diff --git a/external/boost/boost.utility.Wundef.warnings.patch b/external/boost/boost.utility.Wundef.warnings.patch deleted file mode 100644 index 034709e26033..000000000000 --- a/external/boost/boost.utility.Wundef.warnings.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- foo/foo/foo/boost/utility/result_of.hpp -+++ foo/foo/foo/boost/utility/result_of.hpp -@@ -72,7 +72,7 @@ - // There doesn't seem to be any other way to turn this off such that the presence of - // the user-defined operator,() below doesn't cause spurious warning all over the place, - // so unconditionally turn it off. --#if BOOST_MSVC -+#if defined(BOOST_MSVC) && BOOST_MSVC - # pragma warning(disable: 4913) // user defined binary operator ',' exists but no overload could convert all operands, default built-in binary operator ',' used - #endif - |