Merge regex changes from Trunk.

[SVN r76192]
This commit is contained in:
John Maddock
2011-12-26 18:28:30 +00:00
parent e0fe0863ad
commit 090520dbb4
47 changed files with 1551 additions and 1524 deletions

View File

@ -200,9 +200,9 @@ void basic_regex_parser<charT, traits>::fail(regex_constants::error_type error_c
if(error_code != regex_constants::error_empty)
{
if((start_pos != 0) || (end_pos != (m_end - m_base)))
message += " The error occured while parsing the regular expression fragment: '";
message += " The error occurred while parsing the regular expression fragment: '";
else
message += " The error occured while parsing the regular expression: '";
message += " The error occurred while parsing the regular expression: '";
if(start_pos != end_pos)
{
message += std::string(m_base + start_pos, m_base + position);