From: Matthias Jung <jungma@eit.uni-kl.de>
Date: Mon, 9 Jan 2017 15:34:36 +0000 (-0600)
Subject: misc: fixes deprecated sc_time function for SystemC 2.3.1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=63bb17e4bd1d37aa22a87a9614957ce1302f95a9;p=gem5.git

misc: fixes deprecated sc_time function for SystemC 2.3.1

The non-standard sc_time constructors

- sc_time( uint64, bool scale )
- sc_time( double, bool scale )

have been deprecated in SystemC 2.3.1 and a warning is issued when being
used. Insted the new 'sc_time::from_value' function is used to omit the
warning message.

Signed-off-by: Jason Lowe-Power <jason@lowepower.com>
---

diff --git a/util/systemc/sc_module.cc b/util/systemc/sc_module.cc
index 71b3b5fbb..46a8d39ee 100644
--- a/util/systemc/sc_module.cc
+++ b/util/systemc/sc_module.cc
@@ -42,6 +42,7 @@
  * Authors: Nathan Binkert
  *          Steve Reinhardt
  *          Andrew Bardsley
+ *          Matthias Jung
  */
 
 /**
@@ -221,8 +222,8 @@ Module::eventLoop()
 
             /* The next event is scheduled in the future, wait until
              *  then or until externalSchedulingEvent */
-            eventLoopEnterEvent.notify(sc_core::sc_time(
-                sc_dt::uint64(wait_period), 0));
+            eventLoopEnterEvent.notify(sc_core::sc_time::from_value(
+                sc_dt::uint64(wait_period)));
 
             return;
         } else if (gem5_time > next_event_time) {