commit 586b60622c33878f9ca4826b4ef07369d32bf039
author Behdad Esfahbod <behdad@behdad.org> Fri Jun 27 15:39:47 2014 -0400
committer Behdad Esfahbod <behdad@behdad.org> Fri Jun 27 15:39:47 2014 -0400
tree b505c73dab926156be5e1ca44bc438bfb886613e
parent 51d9ba09bc78188ec87218aef5232e80568c1712

Minor: final bits of cleanup

src/hb-open-type-private.hh

diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index b63daee..5f4cd42 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -728,6 +728,7 @@
   inline bool neuter (hb_sanitize_context_t *c) {
     return c->try_set (this, 0);
   }
+  DEFINE_SIZE_STATIC (sizeof(OffsetType));
 };
 template <typename Base, typename OffsetType, typename Type>
 static inline const Type& operator + (const Base &base, const OffsetTo<Type, OffsetType> &offset) { return offset (base); }

src/hb-ot-layout-common-private.hh

diff --git a/src/hb-ot-layout-common-private.hh b/src/hb-ot-layout-common-private.hh
index 2ed14a2..82e0fb7 100644
--- a/src/hb-ot-layout-common-private.hh
+++ b/src/hb-ot-layout-common-private.hh
@@ -502,7 +502,7 @@
      * Adobe tools, only the 'size' feature had FeatureParams defined.
      */
 
-    Offset<> orig_offset = featureParams;
+    OffsetTo<FeatureParams> orig_offset = featureParams;
     if (unlikely (!featureParams.sanitize (c, this, closure ? closure->tag : HB_TAG_NONE)))
       return TRACE_RETURN (false);
 
@@ -516,7 +516,7 @@
       unsigned int new_offset_int = (unsigned int) orig_offset -
 				    (((char *) this) - ((char *) closure->list_base));
 
-      Offset<> new_offset;
+      OffsetTo<FeatureParams> new_offset;
       /* Check that it did not overflow. */
       new_offset.set (new_offset_int);
       if (new_offset == new_offset_int &&