From be100c31fcf7f82c789eaf84013e06fcc7dcc0ae Mon Sep 17 00:00:00 2001 From: Stephan Bergmann 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 --- 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/include/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp +++ b/include/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp @@ -282,12 +282,12 @@ struct grammar_definition #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE) typedef impl::grammar_helper_base helper_base_t; typedef grammar_helper_list helper_list_t; - typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; helper_list_t& helpers = grammartract_helper_list::do_(self); # if defined(BOOST_INTEL_CXX_VERSION) + typedef typename helper_list_t::vector_t::reverse_iterator iterator_t; for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i) (*i)->undefine(self); # 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/include/boost/spirit/home/classic/core/primitives/primitives.hpp +++ b/include/boost/spirit/home/classic/core/primitives/primitives.hpp @@ -47,7 +47,6 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN typename parser_result::type parse(ScannerT const& scan) const { - typedef typename parser_result::type result_t; typedef typename ScannerT::value_t value_t; typedef typename ScannerT::iterator_t iterator_t; 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/include/boost/spirit/home/classic/error_handling/exceptions.hpp +++ b/include/boost/spirit/home/classic/error_handling/exceptions.hpp @@ -140,7 +140,6 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN parse(ScannerT const& scan) const { typedef typename parser_result::type result_t; - typedef typename ScannerT::iterator_t iterator_t; result_t hit = this->subject().parse(scan); 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/include/boost/spirit/home/classic/utility/functor_parser.hpp +++ b/include/boost/spirit/home/classic/utility/functor_parser.hpp @@ -49,8 +49,6 @@ BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN typename parser_result::type parse(ScannerT const& scan) const { - typedef typename parser_result::type result_t; - typedef typename ScannerT::value_t value_t; typedef typename ScannerT::iterator_t iterator_t; iterator_t const s(scan.first); -- 1.8.3.1