From 4d3cf2adb669c345cc43832d11689271995e160a Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 13 May 2019 17:25:07 -0700 Subject: [PATCH] [iter] Fix zip iterator sortedness classification logic --- src/hb-iter.hh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/hb-iter.hh b/src/hb-iter.hh index a1fe90420..906d54e33 100644 --- a/src/hb-iter.hh +++ b/src/hb-iter.hh @@ -521,13 +521,8 @@ struct hb_zip_iter_t : A::is_random_access_iterator && B::is_random_access_iterator; static constexpr hb_sortedness_t is_sorted_iterator = - (A::is_sorted_iterator == hb_sortedness_t::NOT_SORTED || - B::is_sorted_iterator == hb_sortedness_t::NOT_SORTED) ? - hb_sortedness_t::NOT_SORTED : - (A::is_sorted_iterator == hb_sortedness_t::STRICTLY_SORTED || - B::is_sorted_iterator == hb_sortedness_t::STRICTLY_SORTED) ? - hb_sortedness_t::STRICTLY_SORTED : - hb_sortedness_t::SORTED; + A::is_sorted_iterator == hb_sortedness_t::SORTED ? + B::is_sorted_iterator : A::is_sorted_iterator; __item_t__ __item__ () const { return __item_t__ (*a, *b); } __item_t__ __item_at__ (unsigned i) const { return __item_t__ (a[i], b[i]); }