feedc0de/boost_regex
1
0
Fork 0
forked from boostorg/regex
Code Pull Requests Activity

Suppress gcc -Wshadow warnings.

Browse Source 
[SVN r33425]
This commit is contained in:
John Maddock
2006-03-21 18:35:17 +00:00
parent 1a732d8c6a
commit c1c2058d3d
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/boost/regex/v4/basic_regex_parser.hpp
View File

@ -94,10 +94,10 @@ basic_regex_parser<charT, traits>::basic_regex_parser(regex_data<charT, traits>*
}
template <class charT, class traits>
void basic_regex_parser<charT, traits>::parse(const charT* p1, const charT* p2, unsigned flags)
void basic_regex_parser<charT, traits>::parse(const charT* p1, const charT* p2, unsigned l_flags)
{
// pass flags on to base class:
this->init(flags);
// pass l_flags on to base class:
this->init(l_flags);
// set up pointers:
m_position = m_base = p1;
m_end = p2;
@ -108,7 +108,7 @@ void basic_regex_parser<charT, traits>::parse(const charT* p1, const charT* p2,
return;
}
// select which parser to use:
switch(flags & regbase::main_option_type)
switch(l_flags & regbase::main_option_type)
{
case regbase::perl_syntax_group:
m_parser_proc = &basic_regex_parser<charT, traits>::parse_extended;
@ -127,8 +127,8 @@ void basic_regex_parser<charT, traits>::parse(const charT* p1, const charT* p2,
// Unwind our alternatives:
//
unwind_alts(-1);
// reset flags as a global scope (?imsx) may have altered them:
this->flags(flags);
// reset l_flags as a global scope (?imsx) may have altered them:
this->flags(l_flags);
// if we haven't gobbled up all the characters then we must
// have had an unexpected ')' :
if(!result)
@ -1244,7 +1244,6 @@ void basic_regex_parser<charT, traits>::parse_set_literal(basic_char_set<charT,
template <class charT, class traits>
digraph<charT> basic_regex_parser<charT, traits>::get_next_set_literal(basic_char_set<charT, traits>& char_set)
{
typedef typename traits::string_type string_type;
digraph<charT> result;
switch(this->m_traits.syntax_type(*m_position))
{