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:
John Maddock
2001-02-12 12:45:25 +00:00
parent ff022f31cf
commit 973b12c5c8
3 changed files with 22 additions and 8 deletions

View File

@ -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;
}