Changeset 24 for branches/with_autoconf/src/sc_uint.h

Timestamp:

Apr 18, 2009, 4:36:12 PM (15 years ago)

Author:

nipo

Message:

Sync with trunk, avoid warning about pointer soup

File:

• branches/with_autoconf/src/sc_uint.h (modified) (1 diff)

branches/with_autoconf/src/sc_uint.h

@@ -183 +183 @@
 
   // arithmetic
-  template <typename T>
-  inline sc_uint& operator <<= (T v)
-  { vf.valW <<= v; return *this; }
-  template <typename T>
-  inline sc_uint& operator >>= (T v)
-  { vf.valW >>= v; return *this; }
-  template <typename T>
-  inline sc_uint& operator += (T v)
-  { vf.valW += v; return *this; }
-  template <typename T>
-  inline sc_uint& operator -= (T v)
-  { vf.valW -= v; return *this; }
-  template <typename T>
-  inline sc_uint& operator *= (T v)
-  { vf.valW *= v; return *this; }
-  template <typename T>
-  inline sc_uint& operator /= (T v)
-  { vf.valW /= v; return *this; }
-  template <typename T>
-  inline sc_uint& operator %= (T v)
-  { vf.valW %= v; return *this; }
-  template <typename T>
-  inline sc_uint& operator &= (T v)
-  { vf.valW &= v; return *this; }
-  template <typename T>
-  inline sc_uint& operator |= (T v)
-  { vf.valW |= v; return *this; }
-  template <typename T>
-  inline sc_uint& operator ^= (T v)
-  { vf.valW ^= v; return *this; }
+#define DEFINE_OPERATOR(OPER)        \
+  template <typename T>              \
+  inline sc_uint& operator OPER (T v)\
+  { vf.valW OPER v; return *this; }
+
+  DEFINE_OPERATOR(<<=)
+  DEFINE_OPERATOR(>>=)
+  DEFINE_OPERATOR(+=)
+  DEFINE_OPERATOR(-=)
+  DEFINE_OPERATOR(*=)
+  DEFINE_OPERATOR(/=)
+  DEFINE_OPERATOR(%=)
+  DEFINE_OPERATOR(&=)
+  DEFINE_OPERATOR(|=)
+  DEFINE_OPERATOR(^=)
+#undef DEFINE_OPERATOR
+
+#if 0
+#define DEFINE_OPERATOR(OPER)                                              \
+  friend bool operator OPER (const data_type& a, const data_type& b);
+//  { return (a.valW) OPER (b.valW); }
+
+  DEFINE_OPERATOR(==)
+  DEFINE_OPERATOR(!=)
+  DEFINE_OPERATOR(>=)
+  DEFINE_OPERATOR(<=)
+#undef DEFINE_OPERATOR
+#endif
   inline sc_uint_bit_ref operator [] (int v)
   { return (vf.valW >> v) & 1; }