summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-12-15 20:16:15 +0100
committerMichael Stahl <mstahl@redhat.com>2015-12-15 20:18:46 +0100
commitd8fb3ed5fa47afa1f3e31d4211bfe0a477641c94 (patch)
treeaf93a2ba6970af64d7375509cbd0169a91446550 /external
parent159e78791ba40d76ba0d8af6abbd7d629eb6dd85 (diff)
boost: suppress auto_ptr deprecation warnings in boost::spirit
Apparently GCC 5.3.1 has turned these annoyances into actual warnings that convert to errors with -Werror. Change-Id: Ib1567b3fc2cf33a0f6cffac116a06d73912b84df
Diffstat (limited to 'external')
-rw-r--r--external/boost/boost.wdeprecated-auto_ptr.patch.046
1 files changed, 46 insertions, 0 deletions
diff --git a/external/boost/boost.wdeprecated-auto_ptr.patch.0 b/external/boost/boost.wdeprecated-auto_ptr.patch.0
index 860840dd061f..b02af6ddb915 100644
--- a/external/boost/boost.wdeprecated-auto_ptr.patch.0
+++ b/external/boost/boost.wdeprecated-auto_ptr.patch.0
@@ -189,3 +189,49 @@ diff -ru boost.orig/boost/smart_ptr/shared_ptr.hpp boost/boost/smart_ptr/shared_
+#endif
+
#endif // #ifndef BOOST_SMART_PTR_SHARED_PTR_HPP_INCLUDED
+--- 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