summaryrefslogtreecommitdiff
path: root/src/sim
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2016-04-12 05:28:39 -0400
committerAndreas Hansson <andreas.hansson@arm.com>2016-04-12 05:28:39 -0400
commit4b802a09c52ca2a2274a232ba5a29936de8ec3a9 (patch)
tree0e9e87f29b5811d0a8ace0994f095d56ca3fe881 /src/sim
parentd9193d1b2039739ef4fb264c742d37f9803817e5 (diff)
downloadgem5-4b802a09c52ca2a2274a232ba5a29936de8ec3a9.tar.xz
misc: Appease clang...again
Once again, clang is having issues with recently committed code. Unfortunately HSAIL_X86 is still broken.
Diffstat (limited to 'src/sim')
-rw-r--r--src/sim/power/thermal_domain.hh4
-rw-r--r--src/sim/power/thermal_model.hh8
2 files changed, 6 insertions, 6 deletions
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;