mirror of
https://github.com/boostorg/regex.git
synced 2025-07-17 06:12:10 +02:00
Fix gcc -Wshadow warnings
[SVN r20857]
This commit is contained in:
@ -717,11 +717,11 @@ void BOOST_REGEX_CALL c_regex_traits<char>::transform_primary(std::string& out,
|
||||
out.erase((int)sort_delim);
|
||||
break;
|
||||
case re_detail::sort_delim:
|
||||
for(unsigned int i = 0; i < out.size(); ++i)
|
||||
for(unsigned int j = 0; j < out.size(); ++j)
|
||||
{
|
||||
if((out[i] == sort_delim) && (i+1 < out.size()))
|
||||
if((out[j] == sort_delim) && (j+1 < out.size()))
|
||||
{
|
||||
out.erase(i+1);
|
||||
out.erase(j+1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@ -115,7 +115,6 @@ template<class charT, class traits>
|
||||
typename parser_buf<charT, traits>::pos_type
|
||||
parser_buf<charT, traits>::seekoff(off_type off, ::std::ios_base::seekdir way, ::std::ios_base::openmode which)
|
||||
{
|
||||
typedef typename parser_buf<charT, traits>::pos_type pos_type;
|
||||
if(which & ::std::ios_base::out)
|
||||
return pos_type(off_type(-1));
|
||||
std::ptrdiff_t size = this->egptr() - this->eback();
|
||||
@ -612,8 +611,8 @@ message_data<wchar_t>::message_data(const std::locale& l, const std::string& reg
|
||||
cat = msgs.open(regex_message_catalogue, l);
|
||||
if(cat < 0)
|
||||
{
|
||||
std::string m("Unable to open message catalog: ");
|
||||
std::runtime_error err(m + regex_message_catalogue);
|
||||
std::string mess("Unable to open message catalog: ");
|
||||
std::runtime_error err(mess + regex_message_catalogue);
|
||||
boost::throw_exception(err);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user