From 4effe34f94b599add133357473e1b120b54719ab Mon Sep 17 00:00:00 2001 From: Andrea Mondelli Date: Tue, 19 Mar 2019 13:12:58 -0400 Subject: [PATCH] misc: missing override specifier Missing specifier of overridden virtual function declared in sim_object.hh Removed redundant "virtual" keyword Change-Id: I42aa3349b537c9e62607bce20cf1b3aabdb99bf2 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/17468 Reviewed-by: Jason Lowe-Power Reviewed-by: Gabe Black Maintainer: Gabe Black --- src/cpu/testers/directedtest/RubyDirectedTester.hh | 2 +- .../garnet_synthetic_traffic/GarnetSyntheticTraffic.hh | 2 +- src/cpu/testers/memtest/memtest.hh | 2 +- src/cpu/testers/rubytest/RubyTester.hh | 2 +- src/dev/io_device.hh | 2 +- src/mem/addr_mapper.hh | 2 +- src/mem/bridge.hh | 2 +- src/mem/external_master.hh | 2 +- src/mem/external_slave.hh | 2 +- src/mem/mem_checker_monitor.hh | 2 +- src/mem/ruby/network/MessageBuffer.hh | 2 +- src/mem/ruby/network/Network.hh | 2 +- src/mem/xbar.hh | 4 ++-- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/cpu/testers/directedtest/RubyDirectedTester.hh b/src/cpu/testers/directedtest/RubyDirectedTester.hh index 0f519762c..740843562 100644 --- a/src/cpu/testers/directedtest/RubyDirectedTester.hh +++ b/src/cpu/testers/directedtest/RubyDirectedTester.hh @@ -72,7 +72,7 @@ class RubyDirectedTester : public MemObject MasterPort* getCpuPort(int idx); - virtual void init(); + void init() override; void wakeup(); diff --git a/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh b/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh index a18f5bbda..7f9ca5f7c 100644 --- a/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh +++ b/src/cpu/testers/garnet_synthetic_traffic/GarnetSyntheticTraffic.hh @@ -59,7 +59,7 @@ class GarnetSyntheticTraffic : public MemObject typedef GarnetSyntheticTrafficParams Params; GarnetSyntheticTraffic(const Params *p); - virtual void init(); + void init() override; // main simulation loop (one cycle) void tick(); diff --git a/src/cpu/testers/memtest/memtest.hh b/src/cpu/testers/memtest/memtest.hh index 8e8f73996..b429fed69 100644 --- a/src/cpu/testers/memtest/memtest.hh +++ b/src/cpu/testers/memtest/memtest.hh @@ -75,7 +75,7 @@ class MemTest : public MemObject typedef MemTestParams Params; MemTest(const Params *p); - virtual void regStats(); + void regStats() override; Port &getPort(const std::string &if_name, PortID idx=InvalidPortID) override; diff --git a/src/cpu/testers/rubytest/RubyTester.hh b/src/cpu/testers/rubytest/RubyTester.hh index 2509aa2cd..3ca71f608 100644 --- a/src/cpu/testers/rubytest/RubyTester.hh +++ b/src/cpu/testers/rubytest/RubyTester.hh @@ -103,7 +103,7 @@ class RubyTester : public MemObject MasterPort* getReadableCpuPort(int idx); MasterPort* getWritableCpuPort(int idx); - virtual void init(); + void init() override; void wakeup(); diff --git a/src/dev/io_device.hh b/src/dev/io_device.hh index 64d7aa5ec..8dc3f943a 100644 --- a/src/dev/io_device.hh +++ b/src/dev/io_device.hh @@ -123,7 +123,7 @@ class PioDevice : public MemObject return dynamic_cast(_params); } - virtual void init(); + void init() override; Port &getPort(const std::string &if_name, PortID idx=InvalidPortID) override; diff --git a/src/mem/addr_mapper.hh b/src/mem/addr_mapper.hh index 6b47cfcb8..aaefdedc3 100644 --- a/src/mem/addr_mapper.hh +++ b/src/mem/addr_mapper.hh @@ -65,7 +65,7 @@ class AddrMapper : public MemObject Port &getPort(const std::string &if_name, PortID idx=InvalidPortID) override; - virtual void init(); + void init() override; protected: diff --git a/src/mem/bridge.hh b/src/mem/bridge.hh index 906640355..b3fb90d93 100644 --- a/src/mem/bridge.hh +++ b/src/mem/bridge.hh @@ -319,7 +319,7 @@ class Bridge : public MemObject Port &getPort(const std::string &if_name, PortID idx=InvalidPortID) override; - virtual void init(); + void init() override; typedef BridgeParams Params; diff --git a/src/mem/external_master.hh b/src/mem/external_master.hh index 42ac67c03..f105054b4 100644 --- a/src/mem/external_master.hh +++ b/src/mem/external_master.hh @@ -129,7 +129,7 @@ class ExternalMaster : public MemObject static void registerHandler(const std::string &handler_name, Handler *handler); - void init(); + void init() override; const MasterID masterId; }; diff --git a/src/mem/external_slave.hh b/src/mem/external_slave.hh index 7290d6339..cfe89b98a 100644 --- a/src/mem/external_slave.hh +++ b/src/mem/external_slave.hh @@ -135,7 +135,7 @@ class ExternalSlave : public MemObject static void registerHandler(const std::string &handler_name, Handler *handler); - void init(); + void init() override; }; diff --git a/src/mem/mem_checker_monitor.hh b/src/mem/mem_checker_monitor.hh index 0564a8178..ba150493f 100644 --- a/src/mem/mem_checker_monitor.hh +++ b/src/mem/mem_checker_monitor.hh @@ -73,7 +73,7 @@ class MemCheckerMonitor : public MemObject Port &getPort(const std::string &if_name, PortID idx=InvalidPortID) override; - virtual void init(); + void init() override; private: diff --git a/src/mem/ruby/network/MessageBuffer.hh b/src/mem/ruby/network/MessageBuffer.hh index 4e85ac413..05821d5ac 100644 --- a/src/mem/ruby/network/MessageBuffer.hh +++ b/src/mem/ruby/network/MessageBuffer.hh @@ -128,7 +128,7 @@ class MessageBuffer : public SimObject return RubyDummyPort::instance(); } - void regStats(); + void regStats() override; // Function for figuring out if any of the messages in the buffer need // to be updated with the data from the packet. diff --git a/src/mem/ruby/network/Network.hh b/src/mem/ruby/network/Network.hh index 4e9791824..0830187c8 100644 --- a/src/mem/ruby/network/Network.hh +++ b/src/mem/ruby/network/Network.hh @@ -82,7 +82,7 @@ class Network : public ClockedObject { return dynamic_cast(_params); } virtual ~Network(); - virtual void init(); + void init() override; static uint32_t getNumberOfVirtualNetworks() { return m_virtual_networks; } int getNumNodes() const { return m_nodes; } diff --git a/src/mem/xbar.hh b/src/mem/xbar.hh index 0745ea5ac..674515001 100644 --- a/src/mem/xbar.hh +++ b/src/mem/xbar.hh @@ -410,13 +410,13 @@ class BaseXBar : public MemObject virtual ~BaseXBar(); - virtual void init(); + void init() override; /** A function used to return the port associated with this object. */ Port &getPort(const std::string &if_name, PortID idx=InvalidPortID) override; - virtual void regStats(); + void regStats() override; }; -- 2.30.2