walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[iter] Rename hb_is_[sorted_]iterator() -> hb_is_[sorted_]iterator_of()

This commit is contained in:
Behdad Esfahbod 2019-01-08 12:42:15 -08:00
parent a6c013b1bf
commit 445364d80a
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/hb-iter.hh
View File

@ -162,7 +162,7 @@ struct hb_is_iterable { enum { value = _hb_is_iterable<T, hb_true_t>::value }; }
/* hb_is_iterator() / hb_is_sorted_iterator() */ /* hb_is_iterator() / hb_is_sorted_iterator() */
template <typename Iter> template <typename Iter>
struct _hb_is_iterator struct _hb_is_iterator_of
{ {
char operator () (...) { return 0; }; char operator () (...) { return 0; };
template<typename Item> int operator () (hb_iter_t<Iter, Item> *) { return 0; }; template<typename Item> int operator () (hb_iter_t<Iter, Item> *) { return 0; };
@ -172,13 +172,16 @@ struct _hb_is_iterator
static_assert (sizeof (char) != sizeof (int), ""); static_assert (sizeof (char) != sizeof (int), "");
}; };
template<typename Iter, typename Item> template<typename Iter, typename Item>
struct hb_is_iterator { enum { struct hb_is_iterator_of { enum {
value = sizeof (int) == sizeof (hb_declval (_hb_is_iterator<Iter>) (hb_declval (Iter*))) }; }; value = sizeof (int) == sizeof (hb_declval (_hb_is_iterator_of<Iter>) (hb_declval (Iter*))) }; };
#define hb_is_iterator(Iter, Item) hb_is_iterator<Iter, Item>::value #define hb_is_iterator_of(Iter, Item) hb_is_iterator_of<Iter, Item>::value
#define hb_is_iterator(Iter) hb_is_iterator_of (Iter, typename Iter::item_t)
#define hb_is_sorted_iterator(Iter, Item) \ #define hb_is_sorted_iterator_of(Iter, Item) \
hb_is_iterator (Iter, Item) && \ hb_is_iterator_of (Iter, Item) && \
Iter::is_sorted_iterator Iter::is_sorted_iterator
#define hb_is_sorted_iterator(Iter) \
hb_is_sorted_iterator_of (Iter, typename Iter::item_t)
/* /*
* Algorithms operating on iterators or iteratables. * Algorithms operating on iterators or iteratables.

4
src/hb-open-type.hh
View File

@ -554,7 +554,7 @@ struct ArrayOf
return_trace (true); return_trace (true);
} }
template <typename Iterator> template <typename Iterator>
hb_enable_if_t (hb_is_iterator (Iterator, const Type), hb_enable_if_t (hb_is_iterator_of (Iterator, const Type),
bool) serialize (hb_serialize_context_t *c, bool) serialize (hb_serialize_context_t *c,
Iterator items) Iterator items)
{ {
@ -822,7 +822,7 @@ struct SortedArrayOf : ArrayOf<Type, LenType>
return_trace (ret); return_trace (ret);
} }
template <typename Iterator> template <typename Iterator>
hb_enable_if_t (hb_is_sorted_iterator (Iterator, const Type), hb_enable_if_t (hb_is_sorted_iterator_of (Iterator, const Type),
bool) serialize (hb_serialize_context_t *c, bool) serialize (hb_serialize_context_t *c,
Iterator items) Iterator items)
{ {

6
src/hb-ot-layout-common.hh
View File

@ -827,7 +827,7 @@ struct CoverageFormat1
} }
template <typename Iterator> template <typename Iterator>
hb_enable_if_t (hb_is_sorted_iterator (Iterator, const GlyphID), hb_enable_if_t (hb_is_sorted_iterator_of (Iterator, const GlyphID),
bool) serialize (hb_serialize_context_t *c, bool) serialize (hb_serialize_context_t *c,
Iterator glyphs) Iterator glyphs)
{ {
@ -896,7 +896,7 @@ struct CoverageFormat2
} }
template <typename Iterator> template <typename Iterator>
hb_enable_if_t (hb_is_sorted_iterator (Iterator, const GlyphID), hb_enable_if_t (hb_is_sorted_iterator_of (Iterator, const GlyphID),
bool) serialize (hb_serialize_context_t *c, bool) serialize (hb_serialize_context_t *c,
Iterator glyphs) Iterator glyphs)
{ {
@ -1047,7 +1047,7 @@ struct Coverage
} }
template <typename Iterator> template <typename Iterator>
hb_enable_if_t (hb_is_sorted_iterator (Iterator, const GlyphID), hb_enable_if_t (hb_is_sorted_iterator_of (Iterator, const GlyphID),
bool) serialize (hb_serialize_context_t *c, bool) serialize (hb_serialize_context_t *c,
Iterator glyphs) Iterator glyphs)
{ {

2
src/test-iter.cc
View File

@ -66,7 +66,7 @@ struct some_array_t
template <typename Iter> static template <typename Iter> static
hb_enable_if_t (hb_is_iterator (Iter, typename Iter::item_t), hb_enable_if_t (hb_is_iterator (Iter),
void) void)
test_iterator (Iter it) test_iterator (Iter it)
{ {