commit 2cb08458f674301cde9d962c13911035a251f7c5
author Behdad Esfahbod <behdad@behdad.org> Wed Apr 21 22:37:31 2010 -0400
committer Behdad Esfahbod <behdad@behdad.org> Wed Apr 21 22:37:31 2010 -0400
tree 29bcb43d6a2d0673695e9477f60f067b56457dee
parent 2e2f43edf2f49f4047e28b1ce2ea95938536de9c

Rename const_array() to array() (overloaded)

src/hb-open-type-private.hh

diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index 2176e38..2a9fe00 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -513,7 +513,7 @@
 template <typename LenType, typename Type>
 struct GenericArrayOf
 {
-  const Type *const_array(void) const { return &StructAfter<Type> (len); }
+  const Type *array(void) const { return &StructAfter<Type> (len); }
   Type *array(void) { return &StructAfter<Type> (len); }
 
   const Type *const_sub_array (unsigned int start_offset, unsigned int *pcount /* IN/OUT */) const
@@ -525,13 +525,13 @@
       count -= start_offset;
     count = MIN (count, *pcount);
     *pcount = count;
-    return const_array() + start_offset;
+    return array() + start_offset;
   }
 
   inline const Type& operator [] (unsigned int i) const
   {
     if (HB_UNLIKELY (i >= len)) return Null(Type);
-    return const_array()[i];
+    return array()[i];
   }
   inline unsigned int get_size () const
   { return len.get_size () + len * Type::get_size (); }
@@ -612,7 +612,7 @@
   inline const Type& operator [] (unsigned int i) const
   {
     if (HB_UNLIKELY (i >= this->len)) return Null(Type);
-    return this+this->const_array()[i];
+    return this+this->array()[i];
   }
 
   inline bool sanitize (SANITIZE_ARG_DEF) {
@@ -631,13 +631,13 @@
 template <typename Type>
 struct HeadlessArrayOf
 {
-  const Type *const_array(void) const { return &StructAfter<Type> (len); }
+  const Type *array(void) const { return &StructAfter<Type> (len); }
   Type *array(void) { return &StructAfter<Type> (len); }
 
   inline const Type& operator [] (unsigned int i) const
   {
     if (HB_UNLIKELY (i >= len || !i)) return Null(Type);
-    return const_array()[i-1];
+    return array()[i-1];
   }
   inline unsigned int get_size () const
   { return len.get_size () + (len ? len - 1 : 0) * Type::get_size (); }