Use override to make newer versions of C++ compiler happy.

Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>

6 files changed, 17 insertions, 17 deletions

diff --git a/qtmips_machine/cache.h b/qtmips_machine/cache.h
index 1c455f7..b45913f 100644
--- a/qtmips_machine/cache.h
+++ b/qtmips_machine/cache.h
@@ -50,12 +50,12 @@ public:
           unsigned memory_access_penalty_w = 1, unsigned memory_access_penalty_b = 0);
     ~Cache();
 
-    bool wword(std::uint32_t address, std::uint32_t value);
-    std::uint32_t rword(std::uint32_t address, bool debug_access = false) const;
+    bool wword(std::uint32_t address, std::uint32_t value) override;
+    std::uint32_t rword(std::uint32_t address, bool debug_access = false) const override;
     virtual std::uint32_t get_change_counter() const override;
 
     void flush(); // flush cache
-    void sync(); // Same as flush
+    void sync() override; // Same as flush
 
     unsigned hit() const; // Number of recorded hits
     unsigned miss() const; // Number of recorded misses
@@ -68,7 +68,7 @@ public:
     void reset(); // Reset whole state of cache
 
     const MachineConfigCache &config() const;
-    enum LocationStatus location_status(std::uint32_t address) const;
+    enum LocationStatus location_status(std::uint32_t address) const override;
 
 signals:
     void hit_update(unsigned) const;
diff --git a/qtmips_machine/lcddisplay.h b/qtmips_machine/lcddisplay.h
index 4821401..705ff67 100644
--- a/qtmips_machine/lcddisplay.h
+++ b/qtmips_machine/lcddisplay.h
@@ -57,8 +57,8 @@ signals:
     void pixel_update(uint x, uint y, uint r, uint g, uint b);
 
 public:
-    bool wword(std::uint32_t address, std::uint32_t value);
-    std::uint32_t rword(std::uint32_t address, bool debug_access = false) const;
+    bool wword(std::uint32_t address, std::uint32_t value) override;
+    std::uint32_t rword(std::uint32_t address, bool debug_access = false) const override;
     virtual std::uint32_t get_change_counter() const override;
 
     inline uint width() {
diff --git a/qtmips_machine/memory.h b/qtmips_machine/memory.h
index 2b20366..667212c 100644
--- a/qtmips_machine/memory.h
+++ b/qtmips_machine/memory.h
@@ -81,8 +81,8 @@ public:
     MemorySection(const MemorySection&);
     ~MemorySection();
 
-    bool wword(std::uint32_t offset, std::uint32_t value);
-    std::uint32_t rword(std::uint32_t offsetbool, bool debug_access = false) const;
+    bool wword(std::uint32_t offset, std::uint32_t value) override;
+    std::uint32_t rword(std::uint32_t offsetbool, bool debug_access = false) const override;
     virtual std::uint32_t get_change_counter() const override;
     void merge(MemorySection&);
 
@@ -112,8 +112,8 @@ public:
     void reset(const Memory&);
 
     MemorySection *get_section(std::uint32_t address, bool create) const; // returns section containing given address
-    bool wword(std::uint32_t address, std::uint32_t value);
-    std::uint32_t rword(std::uint32_t address, bool debug_access = false) const;
+    bool wword(std::uint32_t address, std::uint32_t value) override;
+    std::uint32_t rword(std::uint32_t address, bool debug_access = false) const override;
     virtual std::uint32_t get_change_counter() const override;
 
     bool operator==(const Memory&) const;
diff --git a/qtmips_machine/peripspiled.h b/qtmips_machine/peripspiled.h
index 70c8019..582349f 100644
--- a/qtmips_machine/peripspiled.h
+++ b/qtmips_machine/peripspiled.h
@@ -67,8 +67,8 @@ public slots:
     void green_knob_push(bool state);
     void blue_knob_push(bool state);
 public:
-    bool wword(std::uint32_t address, std::uint32_t value);
-    std::uint32_t rword(std::uint32_t address, bool debug_access = false) const;
+    bool wword(std::uint32_t address, std::uint32_t value) override;
+    std::uint32_t rword(std::uint32_t address, bool debug_access = false) const override;
     virtual std::uint32_t get_change_counter() const override;
 private:
     void knob_update_notify(std::uint32_t val, std::uint32_t mask, int shift);
diff --git a/qtmips_machine/physaddrspace.h b/qtmips_machine/physaddrspace.h
index 7bc126b..ce91570 100644
--- a/qtmips_machine/physaddrspace.h
+++ b/qtmips_machine/physaddrspace.h
@@ -51,14 +51,14 @@ public:
     PhysAddrSpace();
     ~PhysAddrSpace();
 
-    bool wword(std::uint32_t address, std::uint32_t value);
-    std::uint32_t rword(std::uint32_t address, bool debug_access = false) const;
+    bool wword(std::uint32_t address, std::uint32_t value) override;
+    std::uint32_t rword(std::uint32_t address, bool debug_access = false) const override;
     virtual std::uint32_t get_change_counter() const override;
 
     bool insert_range(MemoryAccess *mem_acces, std::uint32_t start_addr, std::uint32_t last_addr, bool move_ownership);
     bool remove_range(MemoryAccess *mem_acces);
     void clean_range(std::uint32_t start_addr, std::uint32_t last_addr);
-    enum LocationStatus location_status(std::uint32_t offset) const;
+    enum LocationStatus location_status(std::uint32_t offset) const override;
 private slots:
     void range_external_change(const MemoryAccess *mem_access, std::uint32_t start_addr,
                                std::uint32_t last_addr, bool external);
diff --git a/qtmips_machine/serialport.h b/qtmips_machine/serialport.h
index 095c06e..10def57 100644
--- a/qtmips_machine/serialport.h
+++ b/qtmips_machine/serialport.h
@@ -61,8 +61,8 @@ public slots:
     void rx_queue_check() const;
 
 public:
-    bool wword(std::uint32_t address, std::uint32_t value);
-    std::uint32_t rword(std::uint32_t address, bool debug_access = false) const;
+    bool wword(std::uint32_t address, std::uint32_t value) override;
+    std::uint32_t rword(std::uint32_t address, bool debug_access = false) const override;
     virtual std::uint32_t get_change_counter() const override;
 private:
     void rx_queue_check_internal() const;