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

[meta] hb_void_t -> hb_empty_t

This commit is contained in:
Behdad Esfahbod 2019-05-10 20:43:26 -07:00
parent 149c3db8a2
commit 7df3ecfb40
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hb-debug.hh
View File

@ -249,8 +249,8 @@ struct hb_printer_t<bool> {
}; };
template <> template <>
struct hb_printer_t<hb_void_t> { struct hb_printer_t<hb_empty_t> {
const char *print (hb_void_t) { return ""; } const char *print (hb_empty_t) { return ""; }
}; };
@ -266,7 +266,7 @@ static inline void _hb_warn_no_return (bool returned)
} }
} }
template <> template <>
/*static*/ inline void _hb_warn_no_return<hb_void_t> (bool returned HB_UNUSED) /*static*/ inline void _hb_warn_no_return<hb_empty_t> (bool returned HB_UNUSED)
{} {}
template <int max_level, typename ret_t> template <int max_level, typename ret_t>

2
src/hb-meta.hh
View File

@ -35,7 +35,7 @@
*/ */
/* Void! For when we need a expression-type of void. */ /* Void! For when we need a expression-type of void. */
struct hb_void_t {}; struct hb_empty_t {};
/* Void meta-function ala std::void_t /* Void meta-function ala std::void_t
* https://en.cppreference.com/w/cpp/types/void_t */ * https://en.cppreference.com/w/cpp/types/void_t */

2
src/hb-ot-layout-gsub-table.hh
View File

@ -1319,7 +1319,7 @@ struct SubstLookup : Lookup
HB_INTERNAL static hb_closure_context_t::return_t dispatch_closure_recurse_func (hb_closure_context_t *c, unsigned int lookup_index) HB_INTERNAL static hb_closure_context_t::return_t dispatch_closure_recurse_func (hb_closure_context_t *c, unsigned int lookup_index)
{ {
if (!c->should_visit_lookup (lookup_index)) if (!c->should_visit_lookup (lookup_index))
return hb_void_t (); return hb_empty_t ();
hb_closure_context_t::return_t ret = dispatch_recurse_func (c, lookup_index); hb_closure_context_t::return_t ret = dispatch_recurse_func (c, lookup_index);

18
src/hb-ot-layout-gsubgpos.hh
View File

@ -59,13 +59,13 @@ struct hb_intersects_context_t :
}; };
struct hb_closure_context_t : struct hb_closure_context_t :
hb_dispatch_context_t<hb_closure_context_t, hb_void_t, 0> hb_dispatch_context_t<hb_closure_context_t, hb_empty_t, 0>
{ {
const char *get_name () { return "CLOSURE"; } const char *get_name () { return "CLOSURE"; }
typedef return_t (*recurse_func_t) (hb_closure_context_t *c, unsigned int lookup_index); typedef return_t (*recurse_func_t) (hb_closure_context_t *c, unsigned int lookup_index);
template <typename T> template <typename T>
return_t dispatch (const T &obj) { obj.closure (this); return hb_void_t (); } return_t dispatch (const T &obj) { obj.closure (this); return hb_empty_t (); }
static return_t default_return_value () { return hb_void_t (); } static return_t default_return_value () { return hb_empty_t (); }
void recurse (unsigned int lookup_index) void recurse (unsigned int lookup_index)
{ {
if (unlikely (nesting_level_left == 0 || !recurse_func)) if (unlikely (nesting_level_left == 0 || !recurse_func))
@ -151,13 +151,13 @@ struct hb_would_apply_context_t :
struct hb_collect_glyphs_context_t : struct hb_collect_glyphs_context_t :
hb_dispatch_context_t<hb_collect_glyphs_context_t, hb_void_t, 0> hb_dispatch_context_t<hb_collect_glyphs_context_t, hb_empty_t, 0>
{ {
const char *get_name () { return "COLLECT_GLYPHS"; } const char *get_name () { return "COLLECT_GLYPHS"; }
typedef return_t (*recurse_func_t) (hb_collect_glyphs_context_t *c, unsigned int lookup_index); typedef return_t (*recurse_func_t) (hb_collect_glyphs_context_t *c, unsigned int lookup_index);
template <typename T> template <typename T>
return_t dispatch (const T &obj) { obj.collect_glyphs (this); return hb_void_t (); } return_t dispatch (const T &obj) { obj.collect_glyphs (this); return hb_empty_t (); }
static return_t default_return_value () { return hb_void_t (); } static return_t default_return_value () { return hb_empty_t (); }
void recurse (unsigned int lookup_index) void recurse (unsigned int lookup_index)
{ {
if (unlikely (nesting_level_left == 0 || !recurse_func)) if (unlikely (nesting_level_left == 0 || !recurse_func))
@ -610,7 +610,7 @@ struct hb_ot_apply_context_t :
struct hb_get_subtables_context_t : struct hb_get_subtables_context_t :
hb_dispatch_context_t<hb_get_subtables_context_t, hb_void_t, HB_DEBUG_APPLY> hb_dispatch_context_t<hb_get_subtables_context_t, hb_empty_t, HB_DEBUG_APPLY>
{ {
template <typename Type> template <typename Type>
HB_INTERNAL static bool apply_to (const void *obj, OT::hb_ot_apply_context_t *c) HB_INTERNAL static bool apply_to (const void *obj, OT::hb_ot_apply_context_t *c)
@ -652,9 +652,9 @@ struct hb_get_subtables_context_t :
{ {
hb_applicable_t *entry = array.push(); hb_applicable_t *entry = array.push();
entry->init (obj, apply_to<T>); entry->init (obj, apply_to<T>);
return hb_void_t (); return hb_empty_t ();
} }
static return_t default_return_value () { return hb_void_t (); } static return_t default_return_value () { return hb_empty_t (); }
hb_get_subtables_context_t (array_t &array_) : hb_get_subtables_context_t (array_t &array_) :
array (array_), array (array_),