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

Merge regex changes from Trunk.

Browse Source 
[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
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/regex/config.hpp
View File

@ -222,7 +222,7 @@
****************************************************************************/
#if defined(BOOST_MSVC) && (BOOST_MSVC >= 1200) && defined(_MSC_EXTENSIONS)
#if defined(_DEBUG) || defined(__MSVC_RUNTIME_CHECKS) || defined(_MANAGED)
#if defined(_DEBUG) || defined(__MSVC_RUNTIME_CHECKS) || defined(_MANAGED) || defined(BOOST_REGEX_NO_FASTCALL)
# define BOOST_REGEX_CALL __cdecl
#else
# define BOOST_REGEX_CALL __fastcall

3
include/boost/regex/user.hpp
View File

@ -88,3 +88,6 @@
// define this if you want to enable support for Unicode via ICU.
// #define BOOST_HAS_ICU
// define this if you want regex to use __cdecl calling convensions, even when __fastcall is available:
// #define BOOST_REGEX_NO_FASTCALL

4
include/boost/regex/v4/basic_regex_parser.hpp
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);