[HarfBuzz] harfbuzz-ng: Branch 'master'

[Behdad Esfahbod]

 src/hb-open-type-private.hh |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 81408cd51ce575891e79e6483be187130f864c28
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Jul 23 14:46:57 2010 -0400

    Don't use "operator ="
    
    Some compilers don't like operator = defined on members of union members
    either.  Reported by Ginn Chen for Sun Studio compilers.

diff --git a/src/hb-open-type-private.hh b/src/hb-open-type-private.hh
index cde6414..a0ecc2e 100644
--- a/src/hb-open-type-private.hh
+++ b/src/hb-open-type-private.hh
@@ -370,7 +370,7 @@ template <typename Type>
 class BEInt<Type, 2>
 {
   public:
-  inline class BEInt<Type,2>& operator = (Type i) { hb_be_uint16_put (v,i); return *this; }
+  inline void set (Type i) { hb_be_uint16_put (v,i); }
   inline operator Type () const { return hb_be_uint16_get (v); }
   inline bool operator == (const BEInt<Type, 2>& o) const { return hb_be_uint16_cmp (v, o.v); }
   inline bool operator != (const BEInt<Type, 2>& o) const { return !(*this == o); }
@@ -380,7 +380,7 @@ template <typename Type>
 class BEInt<Type, 4>
 {
   public:
-  inline class BEInt<Type,4>& operator = (Type i) { hb_be_uint32_put (v,i); return *this; }
+  inline void set (Type i) { hb_be_uint32_put (v,i); }
   inline operator Type () const { return hb_be_uint32_get (v); }
   inline bool operator == (const BEInt<Type, 4>& o) const { return hb_be_uint32_cmp (v, o.v); }
   inline bool operator != (const BEInt<Type, 4>& o) const { return !(*this == o); }
@@ -391,7 +391,7 @@ class BEInt<Type, 4>
 template <typename Type>
 struct IntType
 {
-  inline void set (Type i) { v = i; }
+  inline void set (Type i) { v.set (i); }
   inline operator Type(void) const { return v; }
   inline bool operator == (const IntType<Type> &o) const { return v == o.v; }
   inline bool operator != (const IntType<Type> &o) const { return v != o.v; }