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