[HarfBuzz] harfbuzz: Branch 'master'

[Behdad Esfahbod]

 src/hb-dsalgs.hh    |    4 +---
 src/hb-open-type.hh |    2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

New commits:
commit d0163afb7bed83935c6a54d57a0e7366caeba0b3
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Nov 3 21:38:24 2018 -0400

    Revert "Add operator char * to the naked array types as well"
    
    This reverts commit db889c182ee5f54127285bfaab5bc94dafe46bda.
    
    Was resulting in ambigious overloads...

diff --git a/src/hb-dsalgs.hh b/src/hb-dsalgs.hh
index fafac1f7..f2bff063 100644
--- a/src/hb-dsalgs.hh
+++ b/src/hb-dsalgs.hh
@@ -553,10 +553,8 @@ struct hb_array_t
 
   inline unsigned int get_size (void) const { return len * sizeof (Type); }
 
-  template <typename T> inline operator T * (void) { return arrayZ; }
+  template <typename T> inline operator  T * (void) { return arrayZ; }
   template <typename T> inline operator const T * (void) const { return arrayZ; }
-  inline operator char * (void) { return (char *) arrayZ; }
-  inline operator const char * (void) const { return (const char *) arrayZ; }
 
   inline Type * operator & (void) { return arrayZ; }
   inline const Type * operator & (void) const { return arrayZ; }
diff --git a/src/hb-open-type.hh b/src/hb-open-type.hh
index e1dc8aab..0f6efdc6 100644
--- a/src/hb-open-type.hh
+++ b/src/hb-open-type.hh
@@ -342,8 +342,6 @@ struct UnsizedArrayOf
 
   template <typename T> inline operator T * (void) { return arrayZ; }
   template <typename T> inline operator const T * (void) const { return arrayZ; }
-  inline operator char * (void) { return (char *) arrayZ; }
-  inline operator const char * (void) const { return (const char *) arrayZ; }
 
   inline unsigned int get_size (unsigned int len) const
   { return len * Type::static_size; }