From 70136a78cb9eda244767f8e8a3d30d0f3c569d01 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 24 Sep 2018 18:03:34 -0400 Subject: [PATCH] Remove F_COMBINE Now I wonder if any bots will be unhappy we calling | in static const initializations... Or would that cost runtime init? Our tests don't detect any.. --- src/hb-ot-map.hh | 2 -- src/hb-ot-shape-complex-arabic.cc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/hb-ot-map.hh b/src/hb-ot-map.hh index f719cc6..b6942ca 100644 --- a/src/hb-ot-map.hh +++ b/src/hb-ot-map.hh @@ -177,8 +177,6 @@ enum hb_ot_map_feature_flags_t F_RANDOM = 0x0020u /* Randomly select a glyph from an AlternateSubstFormat1 subtable. */ }; 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))) struct hb_ot_map_feature_t { diff --git a/src/hb-ot-shape-complex-arabic.cc b/src/hb-ot-shape-complex-arabic.cc index fff3b31..375fa1d 100644 --- a/src/hb-ot-shape-complex-arabic.cc +++ b/src/hb-ot-shape-complex-arabic.cc @@ -217,7 +217,7 @@ collect_features_arabic (hb_ot_shape_planner_t *plan) map->add_gsub_pause (nullptr); } - map->add_feature (HB_TAG('r','l','i','g'), F_GLOBAL|F_HAS_FALLBACK); + map->add_feature (HB_TAG('r','l','i','g'), F_GLOBAL | F_HAS_FALLBACK); if (plan->props.script == HB_SCRIPT_ARABIC) map->add_gsub_pause (arabic_fallback_shape); -- 2.7.4