From 461c2b20044359b80df8217a7565c7b8a60a1f0b Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Fri, 18 Jul 2014 03:13:19 +0300 Subject: Update bundled HarfBuzz-NG copy to 0.9.32 - Unicode 7.0 support - New shapers - Multiple improvements in Arabic, Indic, and Hebrew shapers - Build fixes, optimizations, etc. Change-Id: I0ba14b619c3e6fb35cddd9d65e694af41197d6ae Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/3rdparty/harfbuzz-ng/src/hb-ot-map-private.hh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/3rdparty/harfbuzz-ng/src/hb-ot-map-private.hh') diff --git a/src/3rdparty/harfbuzz-ng/src/hb-ot-map-private.hh b/src/3rdparty/harfbuzz-ng/src/hb-ot-map-private.hh index 0e718a6f1f..86b7e9fafe 100644 --- a/src/3rdparty/harfbuzz-ng/src/hb-ot-map-private.hh +++ b/src/3rdparty/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; } -- cgit v1.2.3