Changes from sources/src/sc_int.h at r27 to latest/src/sc_int.h at r1

File:

• latest/src/sc_int.h (modified) (4 diffs)

latest/src/sc_int.h

@@ -18 +18 @@
 #include <sc_logic.h>
 #include <sc_bv.h>
-#include <cstdlib>
 
 // ----------------------------------------------------------------------------
@@ -29 +28 @@
 // ----------------------------------------------------------------------------
 
-#include "sc_nbdefs.h"
+#include"sc_nbdefs.h"
 
 namespace sc_dt {
@@ -136 +135 @@
   sc_int()                 { val = 0; }
 //  sc_int(data_type val_)  { val = 0; write (val_); }
-  sc_int (const char *a)   { val = 0; write (std::atoi (a)); }
+  sc_int (const char *a)   { val = 0; write (atoi (a)); }
   sc_int (unsigned short a){ val = 0; write (a); }
   sc_int (short a)         { val = 0; write (a); }
@@ -198 +197 @@
 
   // arithmetic
-#define DEFINE_OPERATOR(OPER)        \
-  template <typename T>              \
-  inline sc_int& 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
-
+  template <typename T>
+  inline sc_int& operator <<= (T v)
+  { vf.valW <<= v; return *this; }
+  template <typename T>
+  inline sc_int& operator >>= (T v)
+  { vf.valW >>= v; return *this; }
+  template <typename T>
+  inline sc_int& operator += (T v)
+  { vf.valW += v; return *this; }
+  template <typename T>
+  inline sc_int& operator -= (T v)
+  { vf.valW -= v; return *this; }
+  template <typename T>
+  inline sc_int& operator *= (T v)
+  { vf.valW *= v; return *this; }
+  template <typename T>
+  inline sc_int& operator /= (T v)
+  { vf.valW /= v; return *this; }
+  template <typename T>
+  inline sc_int& operator %= (T v)
+  { vf.valW %= v; return *this; }
+  template <typename T>
+  inline sc_int& operator &= (T v)
+  { vf.valW &= v; return *this; }
+  template <typename T>
+  inline sc_int& operator |= (T v)
+  { vf.valW |= v; return *this; }
+  template <typename T>
+  inline sc_int& operator ^= (T v)
+  { vf.valW ^= v; return *this; }
   inline sc_int_bit_ref& operator [] (int v)
   { return (vf.valW >> v) & 1; }