[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-open-type-private.hh |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 784d1180de19fbf4948f08ee2124277cc06066dd
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Jan 11 11:58:13 2017 -0800

    Fix build with clang

diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index e0d5fae..8845e3e 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -1133,11 +1133,11 @@ struct hb_lazy_table_loader_t
   inline const T* get (void) const
   {
   retry:
-    const T *p = (T *) hb_atomic_ptr_get (&instance);
+    T *p = (T *) hb_atomic_ptr_get (&instance);
     if (unlikely (!p))
     {
       hb_blob_t *blob_ = OT::Sanitizer<T>::sanitize (face->reference_table (T::tableTag));
-      p = OT::Sanitizer<T>::lock_instance (blob_);
+      p = const_cast<T *>(OT::Sanitizer<T>::lock_instance (blob_));
       if (!hb_atomic_ptr_cmpexch (const_cast<T **>(&instance), NULL, p))
       {
 	hb_blob_destroy (blob_);