From: Behdad Esfahbod Date: Mon, 7 Jan 2019 22:24:23 +0000 (-0500) Subject: [iter] Handhold hb_is_iterator() type deduction X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed4336680d3fc080f99c7dd67db48c55bcd7a020;p=platform%2Fupstream%2FlibHarfBuzzSharp.git [iter] Handhold hb_is_iterator() type deduction by partial-instantiating on Iter. --- diff --git a/src/hb-iter.hh b/src/hb-iter.hh index 7b975e6..5c02a27 100644 --- a/src/hb-iter.hh +++ b/src/hb-iter.hh @@ -161,15 +161,19 @@ struct hb_is_iterable { enum { value = _hb_is_iterable::value }; } /* hb_is_iterator() / hb_is_sorted_iterator() */ -template char _hb_is_iterator (...) { return 0; }; -template int _hb_is_iterator (hb_iter_t *) { return 0; }; -template int _hb_is_iterator (hb_iter_t *) { return 0; }; -template int _hb_is_iterator (hb_iter_t *) { return 0; }; -template int _hb_is_iterator (hb_iter_t *) { return 0; }; -static_assert (sizeof (char) != sizeof (int), ""); +template +struct _hb_is_iterator +{ + char operator () (...) { return 0; }; + template int operator () (hb_iter_t *) { return 0; }; + template int operator () (hb_iter_t *) { return 0; }; + template int operator () (hb_iter_t *) { return 0; }; + template int operator () (hb_iter_t *) { return 0; }; + static_assert (sizeof (char) != sizeof (int), ""); +}; template struct hb_is_iterator { enum { - value = sizeof (int) == sizeof (_hb_is_iterator (hb_declval ())) }; }; + value = sizeof (int) == sizeof (hb_declval<_hb_is_iterator> () (hb_declval ())) }; }; #define hb_is_iterator(Iter, Item) hb_is_iterator::value #define hb_is_sorted_iterator(Iter, Item) \