[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-dsalgs.hh    |    2 +-
 src/hb-open-type.hh |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8c78ced95b639730efd0edc521e4e81ad50af501
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Oct 22 21:49:42 2018 -0700

    Unbreak builds

diff --git a/src/hb-dsalgs.hh b/src/hb-dsalgs.hh
index 11a05506..7e846161 100644
--- a/src/hb-dsalgs.hh
+++ b/src/hb-dsalgs.hh
@@ -537,7 +537,7 @@ struct hb_array_t
   T *arrayZ;
   unsigned int len;
 };
-template <typename T>
+template <typename T> static inline
 hb_array_t<T> hb_array (T *array, unsigned int len) { return hb_array_t<T> (array, len); }
 
 struct hb_bytes_t
diff --git a/src/hb-open-type.hh b/src/hb-open-type.hh
index a76b111e..2b1b432b 100644
--- a/src/hb-open-type.hh
+++ b/src/hb-open-type.hh
@@ -386,10 +386,10 @@ struct UnsizedArrayOf
   DEFINE_SIZE_ARRAY (0, arrayZ);
 };
 } /* namespace OT */
-template <typename T>
+template <typename T> static inline
 hb_array_t<T> hb_array (OT::UnsizedArrayOf<T> &array, unsigned int len)
 { return hb_array (array.arrayZ, len); }
-template <typename T>
+template <typename T> static inline
 hb_array_t<const T> hb_array (const OT::UnsizedArrayOf<T> &array, unsigned int len)
 { return hb_array (array.arrayZ, len); }
 namespace OT {