diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-04-13 18:01:59 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-04-14 17:42:25 +0200 |
| commit | 3413e03c077ff9bf8f412e57be4bd5336d01a7af (patch) | |
| tree | f0c42db24761747c53c2edc8c5c24978e280e876 /external/boost | |
| parent | fc690336a0c7cb3e3a3c3dbbf2c9342d3e17095b (diff) | |
boost: move one unrelated hunk that isn't in the submitted patch out of
boost.6369.warnings.patch
Change-Id: I7a36f6242d92cb46aac80a46ac69ba488ca4e4c5
Diffstat (limited to 'external/boost')
| -rw-r--r-- | external/boost/boost.6369.warnings.patch | 18 | ||||
| -rw-r--r-- | external/boost/boost.spirit.Wshadow.warnings.patch | 17 |
2 files changed, 17 insertions, 18 deletions
diff --git a/external/boost/boost.6369.warnings.patch b/external/boost/boost.6369.warnings.patch index 81a5eac655a5..545f9c09c8c4 100644 --- a/external/boost/boost.6369.warnings.patch +++ b/external/boost/boost.6369.warnings.patch @@ -303,21 +303,3 @@ std::locale l = std::locale(is.getloc(), f); is.imbue(l); f->get(sit, str_end, is, td); ---- misc/boost_1_44_0/boost/spirit/home/classic/debug/impl/parser_names.ipp 2012-04-10 21:23:48.599238472 +0100 -+++ misc/build/boost_1_44_0/boost/spirit/home/classic/debug/impl/parser_names.ipp 2012-04-10 21:24:02.752394878 +0100 -@@ -395,13 +395,13 @@ - } - - bool register_node(void const *r, char const *name_to_register, -- bool trace_node) -+ bool trace_node_) - { - if (infos.find(r) != infos.end()) - return false; - - return infos.insert(rule_infos::value_type(r, -- rule_info(std::string(name_to_register), trace_node)) -+ rule_info(std::string(name_to_register), trace_node_)) - ).second; - } - diff --git a/external/boost/boost.spirit.Wshadow.warnings.patch b/external/boost/boost.spirit.Wshadow.warnings.patch index 2ac13b67059e..3b4807715679 100644 --- a/external/boost/boost.spirit.Wshadow.warnings.patch +++ b/external/boost/boost.spirit.Wshadow.warnings.patch @@ -38,3 +38,20 @@ } typename DefT::embed_t rhs; +--- misc/boost_1_44_0/boost/spirit/home/classic/debug/impl/parser_names.ipp 2012-04-10 21:23:48.599238472 +0100 ++++ misc/build/boost_1_44_0/boost/spirit/home/classic/debug/impl/parser_names.ipp 2012-04-10 21:24:02.752394878 +0100 +@@ -395,13 +395,13 @@ + } + + bool register_node(void const *r, char const *name_to_register, +- bool trace_node) ++ bool trace_node_) + { + if (infos.find(r) != infos.end()) + return false; + + return infos.insert(rule_infos::value_type(r, +- rule_info(std::string(name_to_register), trace_node)) ++ rule_info(std::string(name_to_register), trace_node_)) + ).second; + } |