mirror of
https://github.com/boostorg/regex.git
synced 2025-07-17 06:12:10 +02:00
regex: tentatively fixed regression on Win2000, suppressed some more warnings, and tweeked Rogue Wave library detection and configuration.
[SVN r9157]
This commit is contained in:
@ -544,6 +544,9 @@ struct message_data<wchar_t>
|
||||
std::string error_strings[boost::REG_E_UNKNOWN+1];
|
||||
|
||||
message_data(const std::locale& l, const std::string& regex_message_catalogue);
|
||||
private:
|
||||
message_data(const message_data&);
|
||||
message_data& operator=(const message_data&);
|
||||
};
|
||||
|
||||
message_data<wchar_t>::message_data(const std::locale& l, const std::string& regex_message_catalogue)
|
||||
|
@ -651,12 +651,12 @@ bool BOOST_RE_CALL w32_regex_traits<wchar_t>::do_iswclass(wchar_t c, jm_uintfast
|
||||
if(c < 256)
|
||||
return BOOST_RE_MAKE_BOOL(re_detail::wide_unicode_classes[c] & f);
|
||||
WORD mask;
|
||||
if(isPlatformNT && GetStringTypeW(CT_CTYPE1, &c, 1, &mask))
|
||||
return BOOST_RE_MAKE_BOOL(mask & f);
|
||||
else if(f & char_class_unicode)
|
||||
if(f & char_class_unicode)
|
||||
return true;
|
||||
else if((f & char_class_graph) == char_class_graph)
|
||||
return true;
|
||||
return true; // all wide characters are considered "graphics"
|
||||
else if(isPlatformNT && GetStringTypeW(CT_CTYPE1, &c, 1, &mask))
|
||||
return BOOST_RE_MAKE_BOOL(mask & f);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user