Change "id" to "idx" to be Objective C++ compatible.

Fixes #2306.
Fixes #4132.
Fixes #4191.

[SVN r61789]
This commit is contained in:
John Maddock
2010-05-05 17:40:07 +00:00
parent 87d5fd1421
commit fa96f4edf1
9 changed files with 104 additions and 103 deletions

View File

@ -336,7 +336,7 @@ struct recursion_info
{
typedef typename Results::value_type value_type;
typedef typename value_type::iterator iterator;
int id;
int idx;
const re_syntax_base* preturn_address;
Results results;
repeater_count<iterator>* repeater_stack;
@ -522,7 +522,7 @@ private:
void push_repeater_count(int i, repeater_count<BidiIterator>** s);
void push_single_repeat(std::size_t c, const re_repeat* r, BidiIterator last_position, int state_id);
void push_non_greedy_repeat(const re_syntax_base* ps);
void push_recursion(int id, const re_syntax_base* p, results_type* presults);
void push_recursion(int idx, const re_syntax_base* p, results_type* presults);
void push_recursion_pop();
// pointer to base of stack: