Ticket #2514: regex.diff.txt

File regex.diff.txt, 1.9 KB (added by rbock@…, 14 years ago)

The changes I applied (diff generated by local svn)

Line 
1Index: u32regex_token_iterator.hpp
2===================================================================
3--- u32regex_token_iterator.hpp (revision 43)
4+++ u32regex_token_iterator.hpp (working copy)
5@@ -283,7 +283,7 @@
6 }
7 #endif
8 #ifndef U_WCHAR_IS_UTF16
9-inline u32regex_token_iterator<const UChar*> make_u32regex_token_iterator(const UChar* p, const u32regex& e, int submatch = 0, regex_constants::match_flag_type m = regex_constants::match_default)
10+inline u32regex_token_iterator<const UChar*> make_u32regex_token_iterator(const UChar* p, const u32regex& e, int /*submatch = 0*/, regex_constants::match_flag_type m = regex_constants::match_default)
11 {
12 return u32regex_token_iterator<const UChar*>(p, p+u_strlen(p), e, m);
13 }
14@@ -345,7 +345,7 @@
15 }
16 #endif
17 #ifndef U_WCHAR_IS_UTF16
18-inline u32regex_token_iterator<const UChar*> make_u32regex_token_iterator(const UChar* p, const u32regex& e, const std::vector<int>& submatch, regex_constants::match_flag_type m = regex_constants::match_default)
19+inline u32regex_token_iterator<const UChar*> make_u32regex_token_iterator(const UChar* p, const u32regex& e, const std::vector<int>& /*submatch*/, regex_constants::match_flag_type m = regex_constants::match_default)
20 {
21 return u32regex_token_iterator<const UChar*>(p, p+u_strlen(p), e, m);
22 }
23Index: perl_matcher.hpp
24===================================================================
25--- perl_matcher.hpp (revision 43)
26+++ perl_matcher.hpp (working copy)
27@@ -45,6 +45,10 @@
28 {
29 return ((c < static_cast<charT>(0)) ? true : ((c >= static_cast<charT>(1 << CHAR_BIT)) ? true : map[c] & mask));
30 }
31+inline bool can_start(unsigned int c, const unsigned char* map, unsigned char mask)
32+{
33+ return (((c >= static_cast<unsigned int>(1 << CHAR_BIT)) ? true : map[c] & mask));
34+}
35 inline bool can_start(char c, const unsigned char* map, unsigned char mask)
36 {
37 return map[(unsigned char)c] & mask;