commit ed07422c33bbb52ff4d79e65986171e3f07697d8
author Behdad Esfahbod <behdad@behdad.org> Mon May 10 18:08:46 2010 -0400
committer Behdad Esfahbod <behdad@behdad.org> Mon May 10 18:08:46 2010 -0400
tree 8084b9a8f3dc3932649e85e0f18f8af385f7f456
parent a82ef7a893b773a17f7548375de9f588dfc83aba

Further cleanup of sizeof

src/hb-open-type-private.hh

diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index 45ed801..c6c9811 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -120,7 +120,7 @@
 /* Generic template for nul-content sizeof-sized Null objects. */
 template <typename Type>
 static inline const Type& Null () {
-  ASSERT_STATIC (sizeof (Type) <= sizeof (_NullPool));
+  ASSERT_STATIC (Type::min_size <= sizeof (_NullPool));
   return *CastP<Type> (_NullPool);
 }
 
@@ -673,7 +673,10 @@
   }
 
   USHORT len;
-/*Type array[VAR];*/
+  private:
+  Type arrayX[VAR];
+  public:
+  DEFINE_SIZE_VAR (sizeof (USHORT), Type);
 };