From f78f837ef17591144d6b22ae3cc71c49458253ff Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 8 Jan 2019 16:38:08 -0800 Subject: [PATCH] [iter] Use aliasing using for types Fix ambiguity of hb_sorted_array_t::item_t with gcc. No idea if that's a gcc bug or what spec requires, but using aliasing using seems to fix it. It probably breaks our non-C++11 bots, in which case I have to condition the change. Testing. --- src/hb-iter.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hb-iter.hh b/src/hb-iter.hh index 79c8cfa..2784f68 100644 --- a/src/hb-iter.hh +++ b/src/hb-iter.hh @@ -94,8 +94,8 @@ struct hb_iter_t }; #define HB_ITER_USING(Name) \ - using typename Name::iter_t; \ - using typename Name::item_t; \ + using iter_t = typename Name::iter_t; \ + using item_t = typename Name::item_t; \ using Name::item_size; \ using Name::is_iterator; \ using Name::iter; \ -- 2.7.4