diff options
author | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:44:24 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-05-03 10:44:24 +0200 |
commit | b5c2535eb0da4ad2b65e79df288a3674f3118717 (patch) | |
tree | 964bd1dfaa9c769878f8195db6d2bce03ef4e5c7 /src/3rdparty/pcre2/src/pcre2_extuni.c | |
parent | 3f25bcd5b7ec0d8a17a3a236099b9049b32b7755 (diff) | |
parent | 6c0ced4b7a77b089b434ab5eb9f430717f26d687 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
src/3rdparty/pcre2/qt_attribution.json
Change-Id: Ibae941cb12662f27bd6962ee02bc235971c59a15
Diffstat (limited to 'src/3rdparty/pcre2/src/pcre2_extuni.c')
-rw-r--r-- | src/3rdparty/pcre2/src/pcre2_extuni.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/pcre2/src/pcre2_extuni.c b/src/3rdparty/pcre2/src/pcre2_extuni.c index 237211abf7..5a719e9cb4 100644 --- a/src/3rdparty/pcre2/src/pcre2_extuni.c +++ b/src/3rdparty/pcre2/src/pcre2_extuni.c @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016-2018 University of Cambridge + New API code Copyright (c) 2016-2019 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -100,7 +100,7 @@ while (eptr < end_subject) int len = 1; if (!utf) c = *eptr; else { GETCHARLEN(c, eptr, len); } rgb = UCD_GRAPHBREAK(c); - if ((PRIV(ucp_gbtable)[lgb] & (1 << rgb)) == 0) break; + if ((PRIV(ucp_gbtable)[lgb] & (1u << rgb)) == 0) break; /* Not breaking between Regional Indicators is allowed only if there are an even number of preceding RIs. */ |