external/boost/boost.spirit.Wshadow.warnings.patch

   1 --- misc/boost_1_44_0/boost/spirit/home/classic/symbols/symbols.hpp     2008-06-22 17:05:38.000000000 +0200
   2 +++ misc/build/boost_1_44_0/boost/spirit/home/classic/symbols/symbols.hpp       2011-02-04 16:39:19.000000000 +0100
   3 @@ -102,13 +102,13 @@
   4      {
   5          typedef typename ScannerT::iterator_t iterator_t;
   6          iterator_t first = scan.first;
   7 -        typename SetT::search_info result = SetT::find(scan);
   8 +        typename SetT::search_info result_ = SetT::find(scan);
   9
  10 -        if (result.data)
  11 +        if (result_.data)
  12              return scan.
  13                  create_match(
  14 -                    result.length,
  15 -                    symbol_ref_t(*result.data),
  16 +                    result_.length,
  17 +                    symbol_ref_t(*result_.data),
  18                      first,
  19                      scan.first);
  20          else
  21 --- misc/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp   2011-02-08 09:24:50.817320629 +0000
  22 +++ misc/build/boost_1_44_0/boost/spirit/home/classic/core/non_terminal/subrule.hpp     2011-02-08 09:25:20.496639901 +0000
  23 @@ -210,7 +210,7 @@
  24              subrule_list<
  25                  subrule_parser<ID2, DefT2, ContextT2>,
  26                  nil_t> >
  27 -        operator,(subrule_parser<ID2, DefT2, ContextT2> const& rhs) const
  28 +        operator,(subrule_parser<ID2, DefT2, ContextT2> const& rhs_) const
  29          {
  30              return subrule_list<
  31                  self_t,
  32 @@ -220,7 +220,7 @@
  33                          *this,
  34                          subrule_list<
  35                              subrule_parser<ID2, DefT2, ContextT2>, nil_t>(
  36 -                                rhs, nil_t()));
  37 +                                rhs_, nil_t()));
  38          }
  39
  40          typename DefT::embed_t rhs;
  41 --- misc/boost_1_44_0/boost/spirit/home/classic/debug/impl/parser_names.ipp     2012-04-10 21:23:48.599238472 +0100
  42 +++ misc/build/boost_1_44_0/boost/spirit/home/classic/debug/impl/parser_names.ipp       2012-04-10 21:24:02.752394878 +0100
  43 @@ -395,13 +395,13 @@
  44              }
  45
  46              bool register_node(void const *r, char const *name_to_register,
  47 -                bool trace_node)
  48 +                bool trace_node_)
  49              {
  50                  if (infos.find(r) != infos.end())
  51                      return false;
  52
  53                  return infos.insert(rule_infos::value_type(r,
  54 -                    rule_info(std::string(name_to_register), trace_node))
  55 +                    rule_info(std::string(name_to_register), trace_node_))
  56                  ).second;
  57              }
  58
  59 --- a/a/boost/boost/spirit/home/classic/error_handling/exceptions.hpp   2013-05-17 15:57:23.722638823 +0200
  60 +++ a/a/boost/boost/spirit/home/classic/error_handling/exceptions.hpp   2013-05-17 15:26:32.319247352 +0200
  61 @@ -126,8 +126,8 @@
  62          typedef unary<ParserT, parser<self_t> >         base_t;
  63          typedef unary_parser_category                   parser_category_t;
  64
  65 -        assertive_parser(ParserT const& parser, ErrorDescrT descriptor_)
  66 -        : base_t(parser), descriptor(descriptor_) {}
  67 +        assertive_parser(ParserT const& parser_, ErrorDescrT descriptor_)
  68 +        : base_t(parser_), descriptor(descriptor_) {}
  69
  70          template <typename ScannerT>
  71          struct result