提交 d0163afb 编写于 作者: B Behdad Esfahbod

Revert "Add operator char * to the naked array types as well"

This reverts commit db889c18.

Was resulting in ambigious overloads...
上级 c8f94a1c
......@@ -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; }
......
......@@ -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; }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册