From 074e230dd2a21cbc41df5b3ed3f169521c03e9e5 Mon Sep 17 00:00:00 2001
From: Gabe Black <gabeblack@google.com>
Date: Sat, 23 May 2020 00:07:03 -0700
Subject: [PATCH] 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>
---
 src/systemc/core/scheduler.cc | 7 -------
 src/systemc/core/scheduler.hh | 7 ++++++-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/systemc/core/scheduler.cc b/src/systemc/core/scheduler.cc
index f94c20499..179bd5523 100644
--- a/src/systemc/core/scheduler.cc
+++ b/src/systemc/core/scheduler.cc
@@ -479,13 +479,6 @@ Scheduler::scheduleStop(bool finish_delta)
     schedule(&stopEvent);
 }
 
-void
-Scheduler::scheduleTimeAdvancesEvent()
-{
-    if (!traceFiles.empty() && !timeAdvancesEvent.scheduled())
-        schedule(&timeAdvancesEvent);
-}
-
 void
 Scheduler::trace(bool delta)
 {
diff --git a/src/systemc/core/scheduler.hh b/src/systemc/core/scheduler.hh
index e7c7290e3..c9ca161cf 100644
--- a/src/systemc/core/scheduler.hh
+++ b/src/systemc/core/scheduler.hh
@@ -459,7 +459,12 @@ class Scheduler
 
     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;
-- 
2.30.2