Minor: Reorder template parameter order

This commit is contained in:
Behdad Esfahbod 2014-06-27 14:48:54 -04:00
parent 0394ec1bfb
commit 36073ede5b
2 changed files with 8 additions and 8 deletions

View File

@ -745,7 +745,7 @@ struct LongOffsetTo : OffsetTo<Type, LongOffset> {};
* Array Types * Array Types
*/ */
template <typename LenType, typename Type> template <typename Type, typename LenType>
struct GenericArrayOf struct GenericArrayOf
{ {
const Type *sub_array (unsigned int start_offset, unsigned int *pcount /* IN/OUT */) const const Type *sub_array (unsigned int start_offset, unsigned int *pcount /* IN/OUT */) const
@ -854,11 +854,11 @@ struct GenericArrayOf
/* An array with a USHORT number of elements. */ /* An array with a USHORT number of elements. */
template <typename Type> template <typename Type>
struct ArrayOf : GenericArrayOf<USHORT, Type> {}; struct ArrayOf : GenericArrayOf<Type, USHORT> {};
/* An array with a ULONG number of elements. */ /* An array with a ULONG number of elements. */
template <typename Type> template <typename Type>
struct LongArrayOf : GenericArrayOf<ULONG, Type> {}; struct LongArrayOf : GenericArrayOf<Type, ULONG> {};
/* Array of Offset's */ /* Array of Offset's */
template <typename Type> template <typename Type>
@ -951,8 +951,8 @@ struct HeadlessArrayOf
/* An array with sorted elements. Supports binary searching. */ /* An array with sorted elements. Supports binary searching. */
template <typename LenType, typename Type> template <typename Type, typename LenType>
struct GenericSortedArrayOf : GenericArrayOf<LenType, Type> struct GenericSortedArrayOf : GenericArrayOf<Type, LenType>
{ {
template <typename SearchType> template <typename SearchType>
inline int bsearch (const SearchType &x) const inline int bsearch (const SearchType &x) const
@ -976,11 +976,11 @@ struct GenericSortedArrayOf : GenericArrayOf<LenType, Type>
/* A sorted array with a USHORT number of elements. */ /* A sorted array with a USHORT number of elements. */
template <typename Type> template <typename Type>
struct SortedArrayOf : GenericSortedArrayOf<USHORT, Type> {}; struct SortedArrayOf : GenericSortedArrayOf<Type, USHORT> {};
/* A sorted array with a ULONG number of elements. */ /* A sorted array with a ULONG number of elements. */
template <typename Type> template <typename Type>
struct LongSortedArrayOf : GenericSortedArrayOf<ULONG, Type> {}; struct LongSortedArrayOf : GenericSortedArrayOf<Type, ULONG> {};
} /* namespace OT */ } /* namespace OT */

View File

@ -229,7 +229,7 @@ struct CmapSubtableTrimmed
UINT length; /* Byte length of this subtable. */ UINT length; /* Byte length of this subtable. */
UINT language; /* Ignore. */ UINT language; /* Ignore. */
UINT startCharCode; /* First character code covered. */ UINT startCharCode; /* First character code covered. */
GenericArrayOf<UINT, GlyphID> GenericArrayOf<GlyphID, UINT>
glyphIdArray; /* Array of glyph index values for character glyphIdArray; /* Array of glyph index values for character
* codes in the range. */ * codes in the range. */
public: public: