Revert "systemc: Fix clang9 linker error"
This reverts commit 80a263698323852b1951d8d71ca0d599dff7ef3c.
Change-Id: I24c69d1a5a54ac8b8d5713314f6e91e5a6263c26
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/29395
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
diff --git a/src/systemc/core/scheduler.cc b/src/systemc/core/scheduler.cc
index f94c204..179bd55 100644
--- a/src/systemc/core/scheduler.cc
+++ b/src/systemc/core/scheduler.cc
@@ -480,13 +480,6 @@
}
void
-Scheduler::scheduleTimeAdvancesEvent()
-{
- if (!traceFiles.empty() && !timeAdvancesEvent.scheduled())
- schedule(&timeAdvancesEvent);
-}
-
-void
Scheduler::trace(bool delta)
{
for (auto tf: traceFiles)
diff --git a/src/systemc/core/scheduler.hh b/src/systemc/core/scheduler.hh
index e7c7290..c9ca161 100644
--- a/src/systemc/core/scheduler.hh
+++ b/src/systemc/core/scheduler.hh
@@ -459,7 +459,12 @@
void timeAdvances() { trace(false); }
EventWrapper<Scheduler, &Scheduler::timeAdvances> timeAdvancesEvent;
- void scheduleTimeAdvancesEvent();
+ void
+ scheduleTimeAdvancesEvent()
+ {
+ if (!traceFiles.empty() && !timeAdvancesEvent.scheduled())
+ schedule(&timeAdvancesEvent);
+ }
uint64_t _numCycles;
uint64_t _changeStamp;