diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-05 14:36:32 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-10 15:38:30 +0100 |
| commit | f05b935882198ccf7d81675736e3aeb089c5113a (patch) | |
| tree | 4ea0ca838d9ef1b15cf17ddb3928efb427c7e5a1 /JavaScriptCore/pcre | |
| parent | 60fbdcc62bced8db2cb1fd233cc4d1e4ea17db1b (diff) | |
| download | external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.zip external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.gz external_webkit-f05b935882198ccf7d81675736e3aeb089c5113a.tar.bz2 | |
Merge WebKit at r74534: Initial merge by git.
Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
Diffstat (limited to 'JavaScriptCore/pcre')
| -rw-r--r-- | JavaScriptCore/pcre/pcre_ucp_searchfuncs.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/JavaScriptCore/pcre/pcre_ucp_searchfuncs.cpp b/JavaScriptCore/pcre/pcre_ucp_searchfuncs.cpp index 5592865..d2052b2 100644 --- a/JavaScriptCore/pcre/pcre_ucp_searchfuncs.cpp +++ b/JavaScriptCore/pcre/pcre_ucp_searchfuncs.cpp @@ -95,5 +95,5 @@ int jsc_pcre_ucp_othercase(unsigned c) int offset = ucp_table[mid].f1 & f1_casemask; if (offset & f1_caseneg) offset |= f1_caseneg; - return !offset ? -1 : c + offset; + return !offset ? -1 : static_cast<int>(c + offset); } |