From ac8ba36fa16053457c07efa6b728ac76310bb967 Mon Sep 17 00:00:00 2001 From: Hoa Nguyen Date: Mon, 3 Aug 2020 15:03:51 -0700 Subject: [PATCH] cpu-kvm: Add missing 'override' keyword clang requires all functions that override a member function to be masked by the 'override' keyword. The missing 'override' in timer.hh causes compiling issues while compiling gem5 with clang. This commit adds the missing keyword. Jira: https://gem5.atlassian.net/browse/GEM5-724 Change-Id: I3b5c7af666927b079a785803c8bb4869180ff777 Signed-off-by: Hoa Nguyen Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/32095 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- src/cpu/kvm/timer.hh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cpu/kvm/timer.hh b/src/cpu/kvm/timer.hh index 376ba7c1a..7daa3cdd7 100644 --- a/src/cpu/kvm/timer.hh +++ b/src/cpu/kvm/timer.hh @@ -194,12 +194,12 @@ class PosixKvmTimer : public BaseKvmTimer float hostFactor, Tick hostFreq); ~PosixKvmTimer(); - void arm(Tick ticks); - void disarm(); + void arm(Tick ticks) override; + void disarm() override; bool expired() override; protected: - Tick calcResolution(); + Tick calcResolution() override; private: clockid_t clockID; -- 2.30.2