summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/dev/storage/disk_image.hh6
-rw-r--r--src/sim/power/thermal_domain.hh4
-rw-r--r--src/sim/power/thermal_model.hh8
3 files changed, 9 insertions, 9 deletions
diff --git a/src/dev/storage/disk_image.hh b/src/dev/storage/disk_image.hh
index 2a59dc0c3..0f86aab35 100644
--- a/src/dev/storage/disk_image.hh
+++ b/src/dev/storage/disk_image.hh
@@ -87,10 +87,10 @@ class RawDiskImage : public DiskImage
void close();
void open(const std::string &filename, bool rd_only = false);
- virtual std::streampos size() const;
+ std::streampos size() const override;
- virtual std::streampos read(uint8_t *data, std::streampos offset) const;
- virtual std::streampos write(const uint8_t *data, std::streampos offset);
+ std::streampos read(uint8_t *data, std::streampos offset) const override;
+ std::streampos write(const uint8_t *data, std::streampos offset) override;
};
/**
diff --git a/src/sim/power/thermal_domain.hh b/src/sim/power/thermal_domain.hh
index dc0e30cfa..9236a2437 100644
--- a/src/sim/power/thermal_domain.hh
+++ b/src/sim/power/thermal_domain.hh
@@ -83,7 +83,7 @@ class ThermalDomain : public SimObject, public ThermalEntity
/** Get nodal equation imposed by this node */
LinearEquation getEquation(ThermalNode * tn, unsigned n,
- double step) const;
+ double step) const override;
/**
* Emit a temperature update through probe points interface
@@ -95,7 +95,7 @@ class ThermalDomain : public SimObject, public ThermalEntity
*/
void setSubSystem(SubSystem * ss);
- void regStats();
+ void regStats() override;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override;
diff --git a/src/sim/power/thermal_model.hh b/src/sim/power/thermal_model.hh
index 3cf44c55b..64f831982 100644
--- a/src/sim/power/thermal_model.hh
+++ b/src/sim/power/thermal_model.hh
@@ -90,7 +90,7 @@ class ThermalResistor : public SimObject, public ThermalEntity
}
LinearEquation getEquation(ThermalNode * tn, unsigned n,
- double step) const;
+ double step) const override;
private:
/* Resistance value in K/W */
@@ -114,7 +114,7 @@ class ThermalCapacitor : public SimObject, public ThermalEntity
void unserialize(CheckpointIn &cp) override;
LinearEquation getEquation(ThermalNode * tn, unsigned n,
- double step) const;
+ double step) const override;
void setNodes(ThermalNode * n1, ThermalNode * n2) {
node1 = n1;
@@ -143,7 +143,7 @@ class ThermalReference : public SimObject, public ThermalEntity
}
LinearEquation getEquation(ThermalNode * tn, unsigned n,
- double step) const;
+ double step) const override;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override;
@@ -176,7 +176,7 @@ class ThermalModel : public ClockedObject
double getTemp() const;
- void startup();
+ void startup() override;
void doStep();
void serialize(CheckpointOut &cp) const override;