From cc6c644ff2af5f6669b6ec100ff13e904872b21c Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Mon, 25 May 2009 03:10:06 -0400
Subject: [PATCH] [HB] More cleanup

---
 src/hb-ot-layout-common-private.h | 4 ++--
 src/hb-ot-layout-open-private.h   | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/hb-ot-layout-common-private.h b/src/hb-ot-layout-common-private.h
index 3c379a31a..142a42042 100644
--- a/src/hb-ot-layout-common-private.h
+++ b/src/hb-ot-layout-common-private.h
@@ -82,7 +82,7 @@ struct LangSys
   inline const unsigned int get_feature_index (unsigned int i) const { return featureIndex[i]; }
   inline unsigned int get_feature_count (void) const { return featureIndex.len; }
 
-  inline const bool has_required_feature (void) const { return reqFeatureIndex != 0xffff; }
+  inline bool has_required_feature (void) const { return reqFeatureIndex != 0xffff; }
   inline int get_required_feature_index (void) const
   {
     if (reqFeatureIndex == 0xffff)
@@ -114,7 +114,7 @@ struct Script
   // LONGTERMTODO bsearch
   DEFINE_TAG_FIND_INTERFACE (LangSys, lang_sys);	/* find_lang_sys_index (), get_lang_sys_by_tag (tag) */
 
-  inline const bool has_default_lang_sys (void) const { return defaultLangSys != 0; }
+  inline bool has_default_lang_sys (void) const { return defaultLangSys != 0; }
   inline const LangSys& get_default_lang_sys (void) const { return this+defaultLangSys; }
 
   private:
diff --git a/src/hb-ot-layout-open-private.h b/src/hb-ot-layout-open-private.h
index 1d091c4dc..5f02c650a 100644
--- a/src/hb-ot-layout-open-private.h
+++ b/src/hb-ot-layout-open-private.h
@@ -108,17 +108,17 @@
   inline const Tag& get_##name##_tag (unsigned int i) const { return (this+name##List).get_tag (i); }
 
 #define DEFINE_TAG_FIND_INTERFACE(Type, name) \
-  inline bool find_##name##_index (hb_tag_t tag, unsigned int *name##_index) const { \
+  inline bool find_##name##_index (hb_tag_t tag, unsigned int *index) const { \
     const Tag t = tag; \
     for (unsigned int i = 0; i < get_##name##_count (); i++) \
     { \
       if (t == get_##name##_tag (i)) \
       { \
-        if (name##_index) *name##_index = i; \
+        if (index) *index = i; \
         return true; \
       } \
     } \
-    if (name##_index) *name##_index = NO_INDEX; \
+    if (index) *index = NO_INDEX; \
     return false; \
   } \
   inline const Type& get_##name##_by_tag (hb_tag_t tag) const \
@@ -150,10 +150,11 @@ struct Null
 
 /* Specializaiton for arbitrary-content arbitrary-sized Null objects. */
 #define DEFINE_NULL_DATA(Type, size, data) \
+static const char _Null##Type[size] = data; \
 template <> \
 struct Null <Type> \
 { \
-  static inline const Type &get () { static const char bytes[size] = data; return (const Type&) *bytes; /* XXX */ } \
+  static inline const Type &get () { return (const Type&) *_Null##Type; } \
 }
 
 /* Accessor macro. */