diff -urp boost_1_54_0-orig/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp boost_1_54_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp

--- boost_1_54_0-orig/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp	2013-07-23 00:47:37.497850668 +0200

+++ boost_1_54_0/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp	2013-07-23 00:50:40.662960713 +0200

@@ -307,7 +307,6 @@ struct grammar_definition

 #if !defined(BOOST_SPIRIT_SINGLE_GRAMMAR_INSTANCE)

         typedef impl::grammar_helper_base<GrammarT> helper_base_t;

         typedef grammar_helper_list<GrammarT> helper_list_t;

-        typedef typename helper_list_t::vector_t::reverse_iterator iterator_t;

         helper_list_t&  helpers =

 # if !defined(__GNUC__) || (__GNUC__ > 2)

diff -urp boost_1_54_0-orig/boost/spirit/home/classic/tree/parse_tree.hpp boost_1_54_0/boost/spirit/home/classic/tree/parse_tree.hpp

--- boost_1_54_0-orig/boost/spirit/home/classic/tree/parse_tree.hpp	2013-07-23 00:47:37.407850122 +0200

+++ boost_1_54_0/boost/spirit/home/classic/tree/parse_tree.hpp	2013-07-23 00:50:40.674960786 +0200

@@ -76,7 +76,6 @@ struct pt_tree_policy :

     template<typename MatchAT, typename MatchBT>

     static void concat(MatchAT& a, MatchBT const& b)

     {

-        typedef typename match_t::attr_t attr_t;

         BOOST_SPIRIT_ASSERT(a && b);

         std::copy(b.trees.begin(), b.trees.end(),