From 36073ede5b52bd1231622cbacd1bee6b82696d81 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Fri, 27 Jun 2014 14:48:54 -0400
Subject: [PATCH] Minor: Reorder template parameter order

---
 src/hb-open-type-private.hh | 14 +++++++-------
 src/hb-ot-cmap-table.hh     |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index d3e2bee44..f6081f07a 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -745,7 +745,7 @@ struct LongOffsetTo : OffsetTo<Type, LongOffset> {};
  * Array Types
  */
 
-template <typename LenType, typename Type>
+template <typename Type, typename LenType>
 struct GenericArrayOf
 {
   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. */
 template <typename Type>
-struct ArrayOf : GenericArrayOf<USHORT, Type> {};
+struct ArrayOf : GenericArrayOf<Type, USHORT> {};
 
 /* An array with a ULONG number of elements. */
 template <typename Type>
-struct LongArrayOf : GenericArrayOf<ULONG, Type> {};
+struct LongArrayOf : GenericArrayOf<Type, ULONG> {};
 
 /* Array of Offset's */
 template <typename Type>
@@ -951,8 +951,8 @@ struct HeadlessArrayOf
 
 
 /* An array with sorted elements.  Supports binary searching. */
-template <typename LenType, typename Type>
-struct GenericSortedArrayOf : GenericArrayOf<LenType, Type>
+template <typename Type, typename LenType>
+struct GenericSortedArrayOf : GenericArrayOf<Type, LenType>
 {
   template <typename SearchType>
   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. */
 template <typename Type>
-struct SortedArrayOf : GenericSortedArrayOf<USHORT, Type> {};
+struct SortedArrayOf : GenericSortedArrayOf<Type, USHORT> {};
 
 /* A sorted array with a ULONG number of elements. */
 template <typename Type>
-struct LongSortedArrayOf : GenericSortedArrayOf<ULONG, Type> {};
+struct LongSortedArrayOf : GenericSortedArrayOf<Type, ULONG> {};
 
 
 } /* namespace OT */
diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh
index b182b53bf..a50dca68e 100644
--- a/src/hb-ot-cmap-table.hh
+++ b/src/hb-ot-cmap-table.hh
@@ -229,7 +229,7 @@ struct CmapSubtableTrimmed
   UINT		length;		/* Byte length of this subtable. */
   UINT		language;	/* Ignore. */
   UINT		startCharCode;	/* First character code covered. */
-  GenericArrayOf<UINT, GlyphID>
+  GenericArrayOf<GlyphID, UINT>
 		glyphIdArray;	/* Array of glyph index values for character
 				 * codes in the range. */
   public: