| Index: third_party/harfbuzz-ng/src/hb-private.hh
|
| diff --git a/third_party/harfbuzz-ng/src/hb-private.hh b/third_party/harfbuzz-ng/src/hb-private.hh
|
| index 4b72260ed5cb4a510dde9320e25a4ed237326487..344c71b058e5a1be93773612dbd23cb7caffc143 100644
|
| --- a/third_party/harfbuzz-ng/src/hb-private.hh
|
| +++ b/third_party/harfbuzz-ng/src/hb-private.hh
|
| @@ -219,7 +219,7 @@ _hb_popcount32 (uint32_t mask)
|
| return __builtin_popcount (mask);
|
| #else
|
| /* "HACKMEM 169" */
|
| - register uint32_t y;
|
| + uint32_t y;
|
| y = (mask >> 1) &033333333333;
|
| y = mask - y - ((y >>1) & 033333333333);
|
| return (((y + (y >> 3)) & 030707070707) % 077);
|
| @@ -233,7 +233,7 @@ _hb_bit_storage (unsigned int number)
|
| #if defined(__GNUC__) && (__GNUC__ >= 4) && defined(__OPTIMIZE__)
|
| return likely (number) ? (sizeof (unsigned int) * 8 - __builtin_clz (number)) : 0;
|
| #else
|
| - register unsigned int n_bits = 0;
|
| + unsigned int n_bits = 0;
|
| while (number) {
|
| n_bits++;
|
| number >>= 1;
|
| @@ -249,7 +249,7 @@ _hb_ctz (unsigned int number)
|
| #if defined(__GNUC__) && (__GNUC__ >= 4) && defined(__OPTIMIZE__)
|
| return likely (number) ? __builtin_ctz (number) : 0;
|
| #else
|
| - register unsigned int n_bits = 0;
|
| + unsigned int n_bits = 0;
|
| if (unlikely (!number)) return 0;
|
| while (!(number & 1)) {
|
| n_bits++;
|
| @@ -808,6 +808,12 @@ hb_in_range (T u, T lo, T hi)
|
| }
|
|
|
| template <typename T> static inline bool
|
| +hb_in_ranges (T u, T lo1, T hi1, T lo2, T hi2)
|
| +{
|
| + return hb_in_range (u, lo1, hi1) || hb_in_range (u, lo2, hi2);
|
| +}
|
| +
|
| +template <typename T> static inline bool
|
| hb_in_ranges (T u, T lo1, T hi1, T lo2, T hi2, T lo3, T hi3)
|
| {
|
| return hb_in_range (u, lo1, hi1) || hb_in_range (u, lo2, hi2) || hb_in_range (u, lo3, hi3);
|
|
|