Changes in sources/src/sc_uint.h [27:11]

File:

• sources/src/sc_uint.h (modified) (2 diffs)

sources/src/sc_uint.h

@@ -25 +25 @@
 // ----------------------------------------------------------------------------
 
-#include "sc_nbdefs.h"
+#include"sc_nbdefs.h"
 
 namespace sc_dt {
@@ -183 +183 @@
 
   // arithmetic
-#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
+  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; }
   inline sc_uint_bit_ref operator [] (int v)
   { return (vf.valW >> v) & 1; }