diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-02-01 15:30:32 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-02-01 15:30:32 +0100 |
| commit | ee5b0e6c9772c905061bf599491ff3d79f62d5ac (patch) | |
| tree | 69cf3c6aa8a4e8ef32c3ee9dbc949cec140f156f | |
| parent | d34d792230251f8d27008522c4e63fb61db32773 (diff) | |
boost: restore auto_ptr patch for boost::spirit
Change-Id: If70658c568e746ab8923f8e6a5ad3407bd5e94a0
| -rw-r--r-- | external/boost/UnpackedTarball_boost.mk | 1 | ||||
| -rw-r--r-- | external/boost/boost.wdeprecated-auto_ptr.patch.0 | 46 |
2 files changed, 47 insertions, 0 deletions
diff --git a/external/boost/UnpackedTarball_boost.mk b/external/boost/UnpackedTarball_boost.mk index 8e4f58054bfe..10ea672c2634 100644 --- a/external/boost/UnpackedTarball_boost.mk +++ b/external/boost/UnpackedTarball_boost.mk @@ -82,6 +82,7 @@ boost_patches += gcc6-warnings.patch.0 # https://github.com/boostorg/math/commit/74ff2db959c5fa75bec770c41ed2951a740fe936 boost_patches += boost_1_60_0.quadmath.patch boost_patches += boost_1_60_0.undef.warning.patch +boost_patches += boost.wdeprecated-auto_ptr.patch.0 boost_patches += boost_1_60_0.android.undef.warning.patch $(eval $(call gb_UnpackedTarball_UnpackedTarball,boost)) diff --git a/external/boost/boost.wdeprecated-auto_ptr.patch.0 b/external/boost/boost.wdeprecated-auto_ptr.patch.0 new file mode 100644 index 000000000000..cf5842929697 --- /dev/null +++ b/external/boost/boost.wdeprecated-auto_ptr.patch.0 @@ -0,0 +1,46 @@ +--- boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp.orig2 2015-12-15 18:24:31.318854561 +0100 ++++ boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2015-12-15 18:26:19.804853629 +0100 +@@ -11,6 +11,11 @@ + #if !defined BOOST_SPIRIT_GRAMMAR_IPP + #define BOOST_SPIRIT_GRAMMAR_IPP + ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) || defined(__clang__) ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ + #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) + #include <boost/spirit/home/classic/core/non_terminal/impl/object_with_id.ipp> + #include <algorithm> +@@ -368,4 +373,8 @@ + + }} // namespace boost::spirit + ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) || defined(__clang__) ++# pragma GCC diagnostic pop ++#endif ++ + #endif +--- boost/spirit/home/classic/symbols/impl/tst.ipp.orig 2015-12-15 19:08:48.978831726 +0100 ++++ boost/spirit/home/classic/symbols/impl/tst.ipp 2015-12-15 19:09:35.064831330 +0100 +@@ -9,6 +9,11 @@ + #ifndef BOOST_SPIRIT_TST_IPP + #define BOOST_SPIRIT_TST_IPP + ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) || defined(__clang__) ++# pragma GCC diagnostic push ++# pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ + /////////////////////////////////////////////////////////////////////////////// + #include <memory> // for std::auto_ptr + #include <boost/spirit/home/classic/core/assert.hpp> +@@ -278,4 +283,8 @@ + + }} // namespace boost::spirit + ++#if defined(__GNUC__) && ((__GNUC__*100 + __GNUC_MINOR__) >= 406) || defined(__clang__) ++# pragma GCC diagnostic pop ++#endif ++ + #endif |