From be100c31fcf7f82c789eaf84013e06fcc7dcc0ae Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Sun, 13 Apr 2014 23:23:46 +0200
Subject: [PATCH 2/2] spirit: fix GCC 4.8 -Wunused-local-typedefs warnings
Signed-off-by: Michael Stahl <mstahl@redhat.com>
---
include/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp | 2 +-
include/boost/spirit/home/classic/core/primitives/primitives.hpp | 1 -
include/boost/spirit/home/classic/error_handling/exceptions.hpp | 1 -
include/boost/spirit/home/classic/utility/functor_parser.hpp | 2 --
4 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/include/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp b/include/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
index b26f534..b00e2b4 100644
a
|
b
|
struct grammar_definition
|
282 | 282 | #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) |
283 | 283 | typedef impl::grammar_helper_base<GrammarT> helper_base_t; |
284 | 284 | typedef grammar_helper_list<GrammarT> helper_list_t; |
285 | | typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; |
286 | 285 | |
287 | 286 | helper_list_t& helpers = |
288 | 287 | grammartract_helper_list::do_(self); |
289 | 288 | |
290 | 289 | # if defined(BOOST_INTEL_CXX_VERSION) |
| 290 | typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; |
291 | 291 | for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i) |
292 | 292 | (*i)->undefine(self); |
293 | 293 | # else |
diff --git a/include/boost/spirit/home/classic/core/primitives/primitives.hpp b/include/boost/spirit/home/classic/core/primitives/primitives.hpp
index d89585b..cd87c3d 100644
a
|
b
|
BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
|
47 | 47 | typename parser_result<self_t, ScannerT>::type |
48 | 48 | parse(ScannerT const& scan) const |
49 | 49 | { |
50 | | typedef typename parser_result<self_t, ScannerT>::type result_t; |
51 | 50 | typedef typename ScannerT::value_t value_t; |
52 | 51 | typedef typename ScannerT::iterator_t iterator_t; |
53 | 52 | |
diff --git a/include/boost/spirit/home/classic/error_handling/exceptions.hpp b/include/boost/spirit/home/classic/error_handling/exceptions.hpp
index 4d7cb76..11dd45b 100644
a
|
b
|
BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
|
140 | 140 | parse(ScannerT const& scan) const |
141 | 141 | { |
142 | 142 | typedef typename parser_result<ParserT, ScannerT>::type result_t; |
143 | | typedef typename ScannerT::iterator_t iterator_t; |
144 | 143 | |
145 | 144 | result_t hit = this->subject().parse(scan); |
146 | 145 | if (!hit) |
diff --git a/include/boost/spirit/home/classic/utility/functor_parser.hpp b/include/boost/spirit/home/classic/utility/functor_parser.hpp
index ac53751..e991eaf 100644
a
|
b
|
BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
|
49 | 49 | typename parser_result<self_t, ScannerT>::type |
50 | 50 | parse(ScannerT const& scan) const |
51 | 51 | { |
52 | | typedef typename parser_result<self_t, ScannerT>::type result_t; |
53 | | typedef typename ScannerT::value_t value_t; |
54 | 52 | typedef typename ScannerT::iterator_t iterator_t; |
55 | 53 | |
56 | 54 | iterator_t const s(scan.first); |