Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/29395 )
Change subject: Revert "systemc: Fix clang9 linker error"
......................................................................
Revert "systemc: Fix clang9 linker error"
This reverts commit 80a263698323852b1951d8d71ca0d599dff7ef3c.
Change-Id: I24c69d1a5a54ac8b8d5713314f6e91e5a6263c26
---
M src/systemc/core/scheduler.cc
M src/systemc/core/scheduler.hh
2 files changed, 6 insertions(+), 8 deletions(-)
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;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/29395
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v20.0.0.0
Gerrit-Change-Id: I24c69d1a5a54ac8b8d5713314f6e91e5a6263c26
Gerrit-Change-Number: 29395
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabebl...@google.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
