From: Gabe Black <gabeblack@google.com>
Date: Tue, 11 Dec 2018 07:21:39 +0000 (-0800)
Subject: systemc: Stop using the non-standard sc_time % in TLM.
X-Git-Tag: v19.0.0.0~1300
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=370b103d6d8f1aed0294525105ed0b9497b28521;p=gem5.git

systemc: Stop using the non-standard sc_time % in TLM.

The TLM headers were using the non-standard % operator on sc_time.
This change replaces that with % applied to the result of
sc_time::value().

Change-Id: Ic381eb1ada2c994d04e65896db178f58446944ae
Reviewed-on: https://gem5-review.googlesource.com/c/15062
Reviewed-by: Anthony Gutierrez <anthony.gutierrez@amd.com>
Maintainer: Anthony Gutierrez <anthony.gutierrez@amd.com>
---

diff --git a/src/systemc/tlm_core/2/quantum/global_quantum.cc b/src/systemc/tlm_core/2/quantum/global_quantum.cc
index 7ba44e3cb..69a68aa9c 100644
--- a/src/systemc/tlm_core/2/quantum/global_quantum.cc
+++ b/src/systemc/tlm_core/2/quantum/global_quantum.cc
@@ -40,7 +40,8 @@ tlm_global_quantum::compute_local_quantum()
     if (m_global_quantum != sc_core::SC_ZERO_TIME) {
         const sc_core::sc_time current = sc_core::sc_time_stamp();
         const sc_core::sc_time g_quant = m_global_quantum;
-        return g_quant - (current % g_quant);
+        return sc_core::sc_time::from_value(
+                g_quant.value() - (current.value() % g_quant.value()));
     } else {
         return sc_core::SC_ZERO_TIME;
     }