diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-10-17 01:15:08 +0200 |
|---|---|---|
| committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2013-10-17 10:39:39 +0000 |
| commit | 174e24ffff2f76da94df3bdefa5416c5f2256b78 (patch) | |
| tree | b580a19675daff3882ed415cb36711a17ced94cc /external/boost/boost.6142.warnings.patch.1 | |
| parent | fdo#70393: move apache-commons to a subdir of external (diff) | |
| download | core-174e24ffff2f76da94df3bdefa5416c5f2256b78.tar.gz core-174e24ffff2f76da94df3bdefa5416c5f2256b78.zip | |
fdo#70393: move boost to a subdir of external
Change-Id: Ib6aa36e296dfc1237463c4257f7ea1bd1fe72a1b
Reviewed-on: https://gerrit.libreoffice.org/6282
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'external/boost/boost.6142.warnings.patch.1')
| -rw-r--r-- | external/boost/boost.6142.warnings.patch.1 | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/external/boost/boost.6142.warnings.patch.1 b/external/boost/boost.6142.warnings.patch.1 new file mode 100644 index 000000000000..b38efd90d16e --- /dev/null +++ b/external/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) |