[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-atomic.hh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d2542cd28c70b2ba7ab28c0fe5459a1b4a873478
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Thu Sep 27 17:23:24 2018 -0400

    More atomic fixup

diff --git a/src/hb-atomic.hh b/src/hb-atomic.hh
index 6f9d6ec2..e1ecad4a 100644
--- a/src/hb-atomic.hh
+++ b/src/hb-atomic.hh
@@ -289,7 +289,7 @@ struct hb_atomic_ptr_t
 
   inline void init (T* v_ = nullptr) { set_relaxed (v_); }
   inline void set_relaxed (T* v_) const { hb_atomic_ptr_impl_set_relaxed (&v, v_); }
-  inline T *get_relaxed (void) const { return hb_atomic_ptr_impl_get_relaxed (&v); }
+  inline T *get_relaxed (void) const { return (T *) hb_atomic_ptr_impl_get_relaxed (&v); }
   inline T *get (void) const { return (T *) hb_atomic_ptr_impl_get ((void **) &v); }
   inline bool cmpexch (const T *old, T *new_) const{ return hb_atomic_ptr_impl_cmpexch (&v, old, new_); }