walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make operator [] take signed int 

The built-in operator takes signed int.  So, match it, such that
the built-in is never a better or equally-good match to our operator.
Fixes "ambiguous overload" errors from gcc 4.2 and VS 2008.

See https://github.com/harfbuzz/harfbuzz/issues/1374
This commit is contained in:
Behdad Esfahbod 2018-11-30 19:57:12 -05:00
parent fedd8e6c17
commit dfad19ad5a
3 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hb-dsalgs.hh
View File

@ -571,8 +571,9 @@ struct hb_array_t
inline hb_array_t (const hb_array_t &o) : arrayZ (o.arrayZ), len (o.len) {} inline hb_array_t (const hb_array_t &o) : arrayZ (o.arrayZ), len (o.len) {}
inline hb_array_t (Type *array_, unsigned int len_) : arrayZ (array_), len (len_) {} inline hb_array_t (Type *array_, unsigned int len_) : arrayZ (array_), len (len_) {}
inline Type& operator [] (unsigned int i) const inline Type& operator [] (int i_) const
{ {
unsigned int i = (unsigned int) i_;
if (unlikely (i >= len)) return Null(Type); if (unlikely (i >= len)) return Null(Type);
return arrayZ[i]; return arrayZ[i];
} }

42
src/hb-open-type.hh
View File

@ -351,14 +351,16 @@ struct UnsizedArrayOf
HB_NO_CREATE_COPY_ASSIGN_TEMPLATE (UnsizedArrayOf, Type); HB_NO_CREATE_COPY_ASSIGN_TEMPLATE (UnsizedArrayOf, Type);
inline const Type& operator [] (unsigned int i) const inline const Type& operator [] (int i_) const
{ {
unsigned int i = (unsigned int) i_;
const Type *p = &arrayZ[i]; const Type *p = &arrayZ[i];
if (unlikely (p < arrayZ)) return Null (Type); /* Overflowed. */ if (unlikely (p < arrayZ)) return Null (Type); /* Overflowed. */
return *p; return *p;
} }
inline Type& operator [] (unsigned int i) inline Type& operator [] (int i_)
{ {
unsigned int i = (unsigned int) i_;
Type *p = &arrayZ[i]; Type *p = &arrayZ[i];
if (unlikely (p < arrayZ)) return Crap (Type); /* Overflowed. */ if (unlikely (p < arrayZ)) return Crap (Type); /* Overflowed. */
return *p; return *p;
@ -441,14 +443,16 @@ struct UnsizedOffsetArrayOf : UnsizedArrayOf<OffsetTo<Type, OffsetType, has_null
template <typename Type, typename OffsetType, bool has_null=true> template <typename Type, typename OffsetType, bool has_null=true>
struct UnsizedOffsetListOf : UnsizedOffsetArrayOf<Type, OffsetType, has_null> struct UnsizedOffsetListOf : UnsizedOffsetArrayOf<Type, OffsetType, has_null>
{ {
inline const Type& operator [] (unsigned int i) const inline const Type& operator [] (int i_) const
{ {
unsigned int i = (unsigned int) i_;
const OffsetTo<Type, OffsetType, has_null> *p = &this->arrayZ[i]; const OffsetTo<Type, OffsetType, has_null> *p = &this->arrayZ[i];
if (unlikely (p < this->arrayZ)) return Null (Type); /* Overflowed. */ if (unlikely (p < this->arrayZ)) return Null (Type); /* Overflowed. */
return this+*p; return this+*p;
} }
inline Type& operator [] (unsigned int i) inline Type& operator [] (int i_)
{ {
unsigned int i = (unsigned int) i_;
const OffsetTo<Type, OffsetType, has_null> *p = &this->arrayZ[i]; const OffsetTo<Type, OffsetType, has_null> *p = &this->arrayZ[i];
if (unlikely (p < this->arrayZ)) return Crap (Type); /* Overflowed. */ if (unlikely (p < this->arrayZ)) return Crap (Type); /* Overflowed. */
return this+*p; return this+*p;
@ -501,13 +505,15 @@ struct ArrayOf
HB_NO_CREATE_COPY_ASSIGN_TEMPLATE2 (ArrayOf, Type, LenType); HB_NO_CREATE_COPY_ASSIGN_TEMPLATE2 (ArrayOf, Type, LenType);
inline const Type& operator [] (unsigned int i) const inline const Type& operator [] (int i_) const
{ {
unsigned int i = (unsigned int) i_;
if (unlikely (i >= len)) return Null (Type); if (unlikely (i >= len)) return Null (Type);
return arrayZ[i]; return arrayZ[i];
} }
inline Type& operator [] (unsigned int i) inline Type& operator [] (int i_)
{ {
unsigned int i = (unsigned int) i_;
if (unlikely (i >= len)) return Crap (Type); if (unlikely (i >= len)) return Crap (Type);
return arrayZ[i]; return arrayZ[i];
} }
@ -625,13 +631,15 @@ struct LOffsetLArrayOf : ArrayOf<OffsetTo<Type, HBUINT32>, HBUINT32> {};
template <typename Type> template <typename Type>
struct OffsetListOf : OffsetArrayOf<Type> struct OffsetListOf : OffsetArrayOf<Type>
{ {
inline const Type& operator [] (unsigned int i) const inline const Type& operator [] (int i_) const
{ {
unsigned int i = (unsigned int) i_;
if (unlikely (i >= this->len)) return Null (Type); if (unlikely (i >= this->len)) return Null (Type);
return this+this->arrayZ[i]; return this+this->arrayZ[i];
} }
inline const Type& operator [] (unsigned int i) inline const Type& operator [] (int i_)
{ {
unsigned int i = (unsigned int) i_;
if (unlikely (i >= this->len)) return Crap (Type); if (unlikely (i >= this->len)) return Crap (Type);
return this+this->arrayZ[i]; return this+this->arrayZ[i];
} }
@ -668,13 +676,15 @@ struct HeadlessArrayOf
HB_NO_CREATE_COPY_ASSIGN_TEMPLATE2 (HeadlessArrayOf, Type, LenType); HB_NO_CREATE_COPY_ASSIGN_TEMPLATE2 (HeadlessArrayOf, Type, LenType);
inline const Type& operator [] (unsigned int i) const inline const Type& operator [] (int i_) const
{ {
unsigned int i = (unsigned int) i_;
if (unlikely (i >= lenP1 || !i)) return Null (Type); if (unlikely (i >= lenP1 || !i)) return Null (Type);
return arrayZ[i-1]; return arrayZ[i-1];
} }
inline Type& operator [] (unsigned int i) inline Type& operator [] (int i_)
{ {
unsigned int i = (unsigned int) i_;
if (unlikely (i >= lenP1 || !i)) return Crap (Type); if (unlikely (i >= lenP1 || !i)) return Crap (Type);
return arrayZ[i-1]; return arrayZ[i-1];
} }
@ -734,13 +744,15 @@ struct ArrayOfM1
{ {
HB_NO_CREATE_COPY_ASSIGN_TEMPLATE2 (ArrayOfM1, Type, LenType); HB_NO_CREATE_COPY_ASSIGN_TEMPLATE2 (ArrayOfM1, Type, LenType);
inline const Type& operator [] (unsigned int i) const inline const Type& operator [] (int i_) const
{ {
unsigned int i = (unsigned int) i_;
if (unlikely (i > lenM1)) return Null (Type); if (unlikely (i > lenM1)) return Null (Type);
return arrayZ[i]; return arrayZ[i];
} }
inline Type& operator [] (unsigned int i) inline Type& operator [] (int i_)
{ {
unsigned int i = (unsigned int) i_;
if (unlikely (i > lenM1)) return Crap (Type); if (unlikely (i > lenM1)) return Crap (Type);
return arrayZ[i]; return arrayZ[i];
} }
@ -890,13 +902,15 @@ struct VarSizedBinSearchArrayOf
return true; return true;
} }
inline const Type& operator [] (unsigned int i) const inline const Type& operator [] (int i_) const
{ {
unsigned int i = (unsigned int) i_;
if (unlikely (i >= get_length ())) return Null (Type); if (unlikely (i >= get_length ())) return Null (Type);
return StructAtOffset<Type> (&bytesZ, i * header.unitSize); return StructAtOffset<Type> (&bytesZ, i * header.unitSize);
} }
inline Type& operator [] (unsigned int i) inline Type& operator [] (int i_)
{ {
unsigned int i = (unsigned int) i_;
if (unlikely (i >= get_length ())) return Crap (Type); if (unlikely (i >= get_length ())) return Crap (Type);
return StructAtOffset<Type> (&bytesZ, i * header.unitSize); return StructAtOffset<Type> (&bytesZ, i * header.unitSize);
} }

6
src/hb-vector.hh
View File

@ -78,14 +78,16 @@ struct hb_vector_t
inline const Type * arrayZ (void) const inline const Type * arrayZ (void) const
{ return arrayZ_ ? arrayZ_ : static_array; } { return arrayZ_ ? arrayZ_ : static_array; }
inline Type& operator [] (unsigned int i) inline Type& operator [] (int i_)
{ {
unsigned int i = (unsigned int) i_;
if (unlikely (i >= len)) if (unlikely (i >= len))
return Crap (Type); return Crap (Type);
return arrayZ()[i]; return arrayZ()[i];
} }
inline const Type& operator [] (unsigned int i) const inline const Type& operator [] (int i_) const
{ {
unsigned int i = (unsigned int) i_;
if (unlikely (i >= len)) if (unlikely (i >= len))
return Null(Type); return Null(Type);
return arrayZ()[i]; return arrayZ()[i];