| Index: third_party/harfbuzz-ng/src/hb-ot-map-private.hh
|
| diff --git a/third_party/harfbuzz-ng/src/hb-ot-map-private.hh b/third_party/harfbuzz-ng/src/hb-ot-map-private.hh
|
| index 0e718a6f1f5f7060bd0a2f7a3f4203ec4a985494..86b7e9fafea46c29b7e21c91684380aec3695701 100644
|
| --- a/third_party/harfbuzz-ng/src/hb-ot-map-private.hh
|
| +++ b/third_party/harfbuzz-ng/src/hb-ot-map-private.hh
|
| @@ -153,26 +153,26 @@ struct hb_ot_map_t
|
| };
|
|
|
| enum hb_ot_map_feature_flags_t {
|
| - F_NONE = 0x0000,
|
| - F_GLOBAL = 0x0001,
|
| - F_HAS_FALLBACK = 0x0002,
|
| - F_MANUAL_ZWJ = 0x0004
|
| + F_NONE = 0x0000u,
|
| + F_GLOBAL = 0x0001u,
|
| + F_HAS_FALLBACK = 0x0002u,
|
| + F_MANUAL_ZWJ = 0x0004u
|
| };
|
| /* Macro version for where const is desired. */
|
| #define F_COMBINE(l,r) (hb_ot_map_feature_flags_t ((unsigned int) (l) | (unsigned int) (r)))
|
| -inline hb_ot_map_feature_flags_t
|
| +static inline hb_ot_map_feature_flags_t
|
| operator | (hb_ot_map_feature_flags_t l, hb_ot_map_feature_flags_t r)
|
| { return hb_ot_map_feature_flags_t ((unsigned int) l | (unsigned int) r); }
|
| -inline hb_ot_map_feature_flags_t
|
| +static inline hb_ot_map_feature_flags_t
|
| operator & (hb_ot_map_feature_flags_t l, hb_ot_map_feature_flags_t r)
|
| { return hb_ot_map_feature_flags_t ((unsigned int) l & (unsigned int) r); }
|
| -inline hb_ot_map_feature_flags_t
|
| +static inline hb_ot_map_feature_flags_t
|
| operator ~ (hb_ot_map_feature_flags_t r)
|
| { return hb_ot_map_feature_flags_t (~(unsigned int) r); }
|
| -inline hb_ot_map_feature_flags_t&
|
| +static inline hb_ot_map_feature_flags_t&
|
| operator |= (hb_ot_map_feature_flags_t &l, hb_ot_map_feature_flags_t r)
|
| { l = l | r; return l; }
|
| -inline hb_ot_map_feature_flags_t&
|
| +static inline hb_ot_map_feature_flags_t&
|
| operator &= (hb_ot_map_feature_flags_t& l, hb_ot_map_feature_flags_t r)
|
| { l = l & r; return l; }
|
|
|
|
|