diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-01 13:40:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-01 13:47:35 +0200 |
| commit | 2b4ee9bc454b812d92deb2201e23b485ccb64796 (patch) | |
| tree | a346e02fca8ec1d8c09011a72ce46c301a4ada8b /boost | |
| parent | b5809ea88bb35997331597f00005ef05450c4aed (diff) | |
boost: add patch for -Wundef warnings from ticket 6142
Change-Id: I6bd1b84c491ed05292b253e6df48176ac3ea9053
Diffstat (limited to 'boost')
| -rw-r--r-- | boost/UnpackedTarball_boost.mk | 2 | ||||
| -rw-r--r-- | boost/boost.6142.warnings.patch.1 | 38 |
2 files changed, 40 insertions, 0 deletions
diff --git a/boost/UnpackedTarball_boost.mk b/boost/UnpackedTarball_boost.mk index fde6fa6174da..298768210cf8 100644 --- a/boost/UnpackedTarball_boost.mk +++ b/boost/UnpackedTarball_boost.mk @@ -32,6 +32,8 @@ boost_patches += boost.4510.warnings.patch boost_patches += boost.6940.glibc.patch #https://svn.boost.org/trac/boost/ticket/7774 boost_patches += boost.7774.warnings.patch.1 +#https://svn.boost.org/trac/boost/ticket/6142 +boost_patches += boost.6142.warnings.patch.1 boost_patches += boost.windows.patch boost_patches += boost.vc2012.patch diff --git a/boost/boost.6142.warnings.patch.1 b/boost/boost.6142.warnings.patch.1 new file mode 100644 index 000000000000..b38efd90d16e --- /dev/null +++ b/boost/boost.6142.warnings.patch.1 @@ -0,0 +1,38 @@ +--- a/boost/mpl/has_xxx.hpp.orig 2011-11-18 13:45:00.000000000 +0100 ++++ b/boost/mpl/has_xxx.hpp 2011-11-18 13:47:19.000000000 +0100 +@@ -341,7 +341,7 @@ + ) \ + /**/ + +-# if !BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION ++# if !defined(BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION) || !BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION + # define BOOST_MPL_HAS_MEMBER_REJECT(args, member_macro) \ + template< typename V > \ + static boost::mpl::aux::no_tag \ +@@ -354,7 +354,7 @@ + /**/ + # endif + +-# if !BOOST_MPL_HAS_XXX_NO_WRAPPED_TYPES ++# if !defined(BOOST_MPL_HAS_XXX_NO_WRAPPED_TYPES) || !BOOST_MPL_HAS_XXX_NO_WRAPPED_TYPES + # define BOOST_MPL_HAS_MEMBER_MULTI_ACCEPT(z, n, args) \ + template< typename V > \ + static boost::mpl::aux::yes_tag \ +@@ -383,7 +383,7 @@ + /**/ + # endif + +-# if !BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION ++# if !defined(BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION) || !BOOST_MPL_HAS_XXX_NO_EXPLICIT_TEST_FUNCTION + # define BOOST_MPL_HAS_MEMBER_TEST(args) \ + sizeof(BOOST_MPL_HAS_MEMBER_INTROSPECTION_TEST_NAME(args)< U >(0)) \ + == sizeof(boost::mpl::aux::yes_tag) \ +@@ -456,7 +456,7 @@ + ) \ + /**/ + +-# if BOOST_MPL_HAS_XXX_NEEDS_TEMPLATE_SFINAE ++# if defined(BOOST_MPL_HAS_XXX_NEEDS_TEMPLATE_SFINAE) && BOOST_MPL_HAS_XXX_NEEDS_TEMPLATE_SFINAE + + # if !defined(BOOST_MPL_HAS_XXX_NEEDS_NAMESPACE_LEVEL_SUBSTITUTE) + # if BOOST_WORKAROUND(BOOST_MSVC, <= 1400) |