From 25aec0265c1a1030c7d6453e85b2463589c8688a Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 18 Jun 2020 16:58:01 -0700
Subject: [PATCH] [dispatch] Default return type to hb_empty_t

---
 src/hb-dispatch.hh           | 2 +-
 src/hb-ot-layout-common.hh   | 2 +-
 src/hb-ot-layout-gsubgpos.hh | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/hb-dispatch.hh b/src/hb-dispatch.hh
index 37b6a8eb8..b00267fec 100644
--- a/src/hb-dispatch.hh
+++ b/src/hb-dispatch.hh
@@ -35,7 +35,7 @@
  * Dispatch
  */
 
-template <typename Context, typename Return, unsigned int MaxDebugDepth=0>
+template <typename Context, typename Return=hb_empty_t, unsigned int MaxDebugDepth=0>
 struct hb_dispatch_context_t
 {
   private:
diff --git a/src/hb-ot-layout-common.hh b/src/hb-ot-layout-common.hh
index b66b63866..3cd3c6ce3 100644
--- a/src/hb-ot-layout-common.hh
+++ b/src/hb-ot-layout-common.hh
@@ -151,7 +151,7 @@ struct hb_subset_layout_context_t :
 };
 
 struct hb_collect_variation_indices_context_t :
-       hb_dispatch_context_t<hb_collect_variation_indices_context_t, hb_empty_t>
+       hb_dispatch_context_t<hb_collect_variation_indices_context_t>
 {
   template <typename T>
   return_t dispatch (const T &obj) { obj.collect_variation_indices (this); return hb_empty_t (); }
diff --git a/src/hb-ot-layout-gsubgpos.hh b/src/hb-ot-layout-gsubgpos.hh
index d296cc66f..2a477d657 100644
--- a/src/hb-ot-layout-gsubgpos.hh
+++ b/src/hb-ot-layout-gsubgpos.hh
@@ -58,7 +58,7 @@ struct hb_intersects_context_t :
 };
 
 struct hb_closure_context_t :
-       hb_dispatch_context_t<hb_closure_context_t, hb_empty_t>
+       hb_dispatch_context_t<hb_closure_context_t>
 {
   typedef return_t (*recurse_func_t) (hb_closure_context_t *c, unsigned int lookup_index);
   template <typename T>
@@ -132,7 +132,7 @@ struct hb_closure_context_t :
 };
 
 struct hb_closure_lookups_context_t :
-       hb_dispatch_context_t<hb_closure_lookups_context_t, hb_empty_t>
+       hb_dispatch_context_t<hb_closure_lookups_context_t>
 {
   typedef return_t (*recurse_func_t) (hb_closure_lookups_context_t *c, unsigned lookup_index);
   template <typename T>
@@ -224,7 +224,7 @@ struct hb_would_apply_context_t :
 };
 
 struct hb_collect_glyphs_context_t :
-       hb_dispatch_context_t<hb_collect_glyphs_context_t, hb_empty_t>
+       hb_dispatch_context_t<hb_collect_glyphs_context_t>
 {
   typedef return_t (*recurse_func_t) (hb_collect_glyphs_context_t *c, unsigned int lookup_index);
   template <typename T>
@@ -694,7 +694,7 @@ struct hb_ot_apply_context_t :
 
 
 struct hb_get_subtables_context_t :
-       hb_dispatch_context_t<hb_get_subtables_context_t, hb_empty_t>
+       hb_dispatch_context_t<hb_get_subtables_context_t>
 {
   template <typename Type>
   static inline bool apply_to (const void *obj, OT::hb_ot_apply_context_t *c)