From ffd321afd91429c5de7ab03d71ef1030044f53cb Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 21 Apr 2010 00:14:12 -0400
Subject: [PATCH] Simplify Tag struct

---
 src/hb-open-file-private.hh        | 3 ++-
 src/hb-open-type-private.hh        | 6 +-----
 src/hb-ot-layout-common-private.hh | 3 ++-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/hb-open-file-private.hh b/src/hb-open-file-private.hh
index e72a09868..ce5140f7c 100644
--- a/src/hb-open-file-private.hh
+++ b/src/hb-open-file-private.hh
@@ -84,7 +84,8 @@ typedef struct OffsetTable
   }
   inline bool find_table_index (hb_tag_t tag, unsigned int *table_index) const
   {
-    const Tag t = tag;
+    Tag t;
+    t.set (tag);
     // TODO bsearch
     unsigned int count = numTables;
     for (unsigned int i = 0; i < count; i++)
diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index 0df9e8c9a..9c88f2593 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -360,7 +360,7 @@ struct Sanitizer
   struct NAME \
   { \
     static inline unsigned int get_size () { return BYTES; } \
-    inline NAME& set (TYPE i) { BIG_ENDIAN##_put_unaligned(v, i); return *this; } \
+    inline void set (TYPE i) { BIG_ENDIAN##_put_unaligned(v, i); } \
     inline operator TYPE(void) const { return BIG_ENDIAN##_get_unaligned (v); } \
     inline bool operator == (const NAME &o) const { return BIG_ENDIAN##_cmp_unaligned (v, o.v); } \
     inline bool sanitize (SANITIZE_ARG_DEF) { \
@@ -384,10 +384,6 @@ DEFINE_INT_TYPE (LONG,	  , 32);	/* 32-bit signed integer. */
  * system, feature, or baseline */
 struct Tag : ULONG
 {
-  inline Tag (const Tag &o) { *(ULONG*)this = (ULONG&) o; }
-  inline Tag (uint32_t i) { (*(ULONG*)this).set (i); }
-  inline Tag (const char *c) { *(ULONG*)this = *(ULONG*)c; }
-  inline bool operator == (const char *c) const { return *(ULONG*)this == *(ULONG*)c; }
   /* What the char* converters return is NOT nul-terminated.  Print using "%.4s" */
   inline operator const char* (void) const { return CONST_CHARP(this); }
   inline operator char* (void) { return CHARP(this); }
diff --git a/src/hb-ot-layout-common-private.hh b/src/hb-ot-layout-common-private.hh
index ad5e5c50c..6c6d7acc2 100644
--- a/src/hb-ot-layout-common-private.hh
+++ b/src/hb-ot-layout-common-private.hh
@@ -85,7 +85,8 @@ struct RecordArrayOf : ArrayOf<Record<Type> > {
   }
   inline bool find_index (hb_tag_t tag, unsigned int *index) const
   {
-    const Tag t = tag;
+    Tag t;
+    t.set (tag);
     // TODO bsearch
     const Record<Type> *a = this->const_array();
     unsigned int count = this->len;