| 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 f9538af18310e3f7aff2d69ea5720c1fe6ba8f09..6f62c77de0babc50244b065a138ae9061cfe8ada 100644
|
| --- a/third_party/harfbuzz-ng/src/hb-ot-map-private.hh
|
| +++ b/third_party/harfbuzz-ng/src/hb-ot-map-private.hh
|
| @@ -159,23 +159,9 @@ enum hb_ot_map_feature_flags_t {
|
| F_MANUAL_ZWJ = 0x0004u, /* Don't skip over ZWJ when matching. */
|
| F_GLOBAL_SEARCH = 0x0008u /* If feature not found in LangSys, look for it in global feature list and pick one. */
|
| };
|
| +HB_MARK_AS_FLAG_T (hb_ot_map_feature_flags_t);
|
| /* Macro version for where const is desired. */
|
| #define F_COMBINE(l,r) (hb_ot_map_feature_flags_t ((unsigned int) (l) | (unsigned int) (r)))
|
| -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); }
|
| -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); }
|
| -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); }
|
| -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; }
|
| -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; }
|
|
|
|
|
| struct hb_ot_map_builder_t
|
|
|