diff options
Diffstat (limited to 'Build/source/libs/harfbuzz/harfbuzz-src/src/hb-open-type.hh')
-rw-r--r-- | Build/source/libs/harfbuzz/harfbuzz-src/src/hb-open-type.hh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-open-type.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-open-type.hh index de2d25638a3..e235a97c320 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-open-type.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-open-type.hh @@ -59,11 +59,11 @@ struct IntType typedef Type type; typedef hb_conditional<hb_is_signed (Type), signed, unsigned> wide_type; - IntType<Type, Size>& operator = (wide_type i) { v = i; return *this; } + IntType& operator = (wide_type i) { v = i; return *this; } operator wide_type () const { return v; } - bool operator == (const IntType<Type,Size> &o) const { return (Type) v == (Type) o.v; } - bool operator != (const IntType<Type,Size> &o) const { return !(*this == o); } - HB_INTERNAL static int cmp (const IntType<Type,Size> *a, const IntType<Type,Size> *b) + bool operator == (const IntType &o) const { return (Type) v == (Type) o.v; } + bool operator != (const IntType &o) const { return !(*this == o); } + HB_INTERNAL static int cmp (const IntType *a, const IntType *b) { return b->cmp (*a); } template <typename Type2> int cmp (Type2 a) const @@ -146,7 +146,7 @@ struct LONGDATETIME * system, feature, or baseline */ struct Tag : HBUINT32 { - Tag& operator = (uint32_t i) { HBUINT32::operator= (i); return *this; } + Tag& operator = (hb_tag_t i) { HBUINT32::operator= (i); return *this; } /* What the char* converters return is NOT nul-terminated. Print using "%.4s" */ operator const char* () const { return reinterpret_cast<const char *> (&this->v); } operator char* () { return reinterpret_cast<char *> (&this->v); } |