diff -ru boost_1_40_0.orig/boost/spirit/home/classic/error_handling/exceptions.hpp boost_1_40_0/boost/spirit/home/classic/error_handling/exceptions.hpp
old
|
new
|
|
126 | 126 | typedef unary<ParserT, parser<self_t> > base_t; |
127 | 127 | typedef unary_parser_category parser_category_t; |
128 | 128 | |
129 | | assertive_parser(ParserT const& parser, ErrorDescrT descriptor) |
130 | | : base_t(parser), descriptor(descriptor) {} |
| 129 | assertive_parser(ParserT const& parser, ErrorDescrT descriptor_) |
| 130 | : base_t(parser), descriptor(descriptor_) {} |
131 | 131 | |
132 | 132 | template <typename ScannerT> |
133 | 133 | struct result |
… |
… |
|
222 | 222 | |
223 | 223 | error_status( |
224 | 224 | result_t result_ = fail, |
225 | | std::ptrdiff_t length = -1, |
| 225 | std::ptrdiff_t length_ = -1, |
226 | 226 | T const& value_ = T()) |
227 | | : result(result_), length(length), value(value_) {} |
| 227 | : result(result_), length(length_), value(value_) {} |
228 | 228 | |
229 | 229 | result_t result; |
230 | 230 | std::ptrdiff_t length; |
diff -ru boost_1_40_0.orig/boost/spirit/home/classic/utility/functor_parser.hpp boost_1_40_0/boost/spirit/home/classic/utility/functor_parser.hpp
old
|
new
|
|
54 | 54 | typedef typename ScannerT::iterator_t iterator_t; |
55 | 55 | |
56 | 56 | iterator_t const s(scan.first); |
57 | | functor_result_t result; |
58 | | std::ptrdiff_t len = functor(scan, result); |
| 57 | functor_result_t functor_result; |
| 58 | std::ptrdiff_t len = functor(scan, functor_result); |
59 | 59 | |
60 | 60 | if (len < 0) |
61 | 61 | return scan.no_match(); |
62 | 62 | else |
63 | | return scan.create_match(std::size_t(len), result, s, scan.first); |
| 63 | return scan.create_match(std::size_t(len), functor_result, s, scan.first); |
64 | 64 | } |
65 | 65 | }; |
66 | 66 | |
diff -ru boost_1_40_0.orig/boost/spirit/home/classic/utility/loops.hpp boost_1_40_0/boost/spirit/home/classic/utility/loops.hpp
old
|
new
|
|
47 | 47 | typedef fixed_loop<ParserT, ExactT> self_t; |
48 | 48 | typedef unary<ParserT, parser<self_t> > base_t; |
49 | 49 | |
50 | | fixed_loop (ParserT const & subject, ExactT const & exact) |
51 | | : base_t(subject), m_exact(exact) {} |
| 50 | fixed_loop (ParserT const & subject_, ExactT const & exact) |
| 51 | : base_t(subject_), m_exact(exact) {} |
52 | 52 | |
53 | 53 | template <typename ScannerT> |
54 | 54 | typename parser_result <self_t, ScannerT>::type |
… |
… |
|
112 | 112 | typedef finite_loop <ParserT, MinT, MaxT> self_t; |
113 | 113 | typedef unary<ParserT, parser<self_t> > base_t; |
114 | 114 | |
115 | | finite_loop (ParserT const & subject, MinT const & min, MaxT const & max) |
116 | | : base_t(subject), m_min(min), m_max(max) {} |
| 115 | finite_loop (ParserT const & subject_, MinT const & min, MaxT const & max) |
| 116 | : base_t(subject_), m_min(min), m_max(max) {} |
117 | 117 | |
118 | 118 | template <typename ScannerT> |
119 | 119 | typename parser_result <self_t, ScannerT>::type |
… |
… |
|
196 | 196 | typedef unary<ParserT, parser<self_t> > base_t; |
197 | 197 | |
198 | 198 | infinite_loop ( |
199 | | ParserT const& subject, |
| 199 | ParserT const& subject_, |
200 | 200 | MinT const& min, |
201 | 201 | more_t const& |
202 | 202 | ) |
203 | | : base_t(subject), m_min(min) {} |
| 203 | : base_t(subject_), m_min(min) {} |
204 | 204 | |
205 | 205 | template <typename ScannerT> |
206 | 206 | typename parser_result <self_t, ScannerT>::type |
… |
… |
|
253 | 253 | |
254 | 254 | template <typename ParserT> |
255 | 255 | fixed_loop <ParserT, ExactT> |
256 | | operator[](parser <ParserT> const & subject) const |
| 256 | operator[](parser <ParserT> const & subject_) const |
257 | 257 | { |
258 | | return fixed_loop <ParserT, ExactT> (subject.derived (), m_exact); |
| 258 | return fixed_loop <ParserT, ExactT> (subject_.derived (), m_exact); |
259 | 259 | } |
260 | 260 | |
261 | 261 | ExactT m_exact; |
… |
… |
|
283 | 283 | |
284 | 284 | template <typename ParserT> |
285 | 285 | typename impl::loop_traits<ParserT, MinT, MaxT>::type |
286 | | operator[](parser <ParserT> const & subject) const |
| 286 | operator[](parser <ParserT> const & subject_) const |
287 | 287 | { |
288 | 288 | typedef typename impl::loop_traits<ParserT, MinT, MaxT>::type ret_t; |
289 | 289 | return ret_t( |
290 | | subject.derived(), |
| 290 | subject_.derived(), |
291 | 291 | m_min, |
292 | 292 | m_max); |
293 | 293 | } |