commit 20b035dad41247076815a2bbb0346d63058b322f
author Behdad Esfahbod <behdad@behdad.org> Mon Aug 10 19:00:36 2009 -0400
committer Behdad Esfahbod <behdad@behdad.org> Mon Nov 02 14:40:36 2009 -0500
tree c5b099202e793d740ec5a2f2ba72277dce2423d0
parent a62f776d8e7e3e57d28ee71b34abab0a5b8471eb

[HB] Put C++ inline's back

Apparetly in C++, inline means a totally different thing.

src/hb-open-type-private.hh

diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index 7fd96a0..82e457b 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -424,21 +424,21 @@
     return CONST_CAST(Type, *CONST_CHARP(base), offset);
   }
 
-  bool sanitize (SANITIZE_ARG_DEF, const void *base) {
+  inline bool sanitize (SANITIZE_ARG_DEF, const void *base) {
     SANITIZE_DEBUG ();
     if (!SANITIZE_OBJ (*this)) return false;
     unsigned int offset = *this;
     if (HB_UNLIKELY (!offset)) return true;
     return SANITIZE (CAST(Type, *DECONST_CHARP(base), offset)) || NEUTER (DECONST_CAST(OffsetType,*this,0), 0);
   }
-  bool sanitize (SANITIZE_ARG_DEF, const void *base, const void *base2) {
+  inline bool sanitize (SANITIZE_ARG_DEF, const void *base, const void *base2) {
     SANITIZE_DEBUG ();
     if (!SANITIZE_OBJ (*this)) return false;
     unsigned int offset = *this;
     if (HB_UNLIKELY (!offset)) return true;
     return SANITIZE_BASE (CAST(Type, *DECONST_CHARP(base), offset), base2) || NEUTER (DECONST_CAST(OffsetType,*this,0), 0);
   }
-  bool sanitize (SANITIZE_ARG_DEF, const void *base, unsigned int user_data) {
+  inline bool sanitize (SANITIZE_ARG_DEF, const void *base, unsigned int user_data) {
     SANITIZE_DEBUG ();
     if (!SANITIZE_OBJ (*this)) return false;
     unsigned int offset = *this;
@@ -471,7 +471,7 @@
   inline unsigned int get_size () const
   { return sizeof (len) + len * sizeof (array[0]); }
 
-  bool sanitize (SANITIZE_ARG_DEF) {
+  inline bool sanitize (SANITIZE_ARG_DEF) {
     SANITIZE_DEBUG ();
     if (!SANITIZE_GET_SIZE()) return false;
     /* Note; for non-recursive types, this is not much needed
@@ -482,7 +482,7 @@
     */
     return true;
   }
-  bool sanitize (SANITIZE_ARG_DEF, const void *base) {
+  inline bool sanitize (SANITIZE_ARG_DEF, const void *base) {
     SANITIZE_DEBUG ();
     if (!SANITIZE_GET_SIZE()) return false;
     unsigned int count = len;
@@ -491,7 +491,7 @@
         return false;
     return true;
   }
-  bool sanitize (SANITIZE_ARG_DEF, const void *base, const void *base2) {
+  inline bool sanitize (SANITIZE_ARG_DEF, const void *base, const void *base2) {
     SANITIZE_DEBUG ();
     if (!SANITIZE_GET_SIZE()) return false;
     unsigned int count = len;
@@ -500,7 +500,7 @@
         return false;
     return true;
   }
-  bool sanitize (SANITIZE_ARG_DEF, const void *base, unsigned int user_data) {
+  inline bool sanitize (SANITIZE_ARG_DEF, const void *base, unsigned int user_data) {
     SANITIZE_DEBUG ();
     if (!SANITIZE_GET_SIZE()) return false;
     unsigned int count = len;
@@ -547,7 +547,7 @@
   inline unsigned int get_size () const
   { return sizeof (len) + (len ? len - 1 : 0) * sizeof (array[0]); }
 
-  bool sanitize (SANITIZE_ARG_DEF) {
+  inline bool sanitize (SANITIZE_ARG_DEF) {
     SANITIZE_DEBUG ();
     if (!SANITIZE_GET_SIZE()) return false;
     /* Note; for non-recursive types, this is not much needed