changeset b31738224fb0 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=b31738224fb0
description:
misc: Appease clang...again
Once again, clang is having issues with recently committed code.
Unfortunately HSAIL_X86 is still broken.
diffstat:
src/dev/storage/disk_image.hh | 6 +++---
src/sim/power/thermal_domain.hh | 4 ++--
src/sim/power/thermal_model.hh | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
diffs (77 lines):
diff -r 0edcf757b6a2 -r b31738224fb0 src/dev/storage/disk_image.hh
--- a/src/dev/storage/disk_image.hh Sat Apr 09 12:13:40 2016 -0400
+++ b/src/dev/storage/disk_image.hh Tue Apr 12 05:28:39 2016 -0400
@@ -87,10 +87,10 @@
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 -r 0edcf757b6a2 -r b31738224fb0 src/sim/power/thermal_domain.hh
--- a/src/sim/power/thermal_domain.hh Sat Apr 09 12:13:40 2016 -0400
+++ b/src/sim/power/thermal_domain.hh Tue Apr 12 05:28:39 2016 -0400
@@ -83,7 +83,7 @@
/** 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 @@
*/
void setSubSystem(SubSystem * ss);
- void regStats();
+ void regStats() override;
void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override;
diff -r 0edcf757b6a2 -r b31738224fb0 src/sim/power/thermal_model.hh
--- a/src/sim/power/thermal_model.hh Sat Apr 09 12:13:40 2016 -0400
+++ b/src/sim/power/thermal_model.hh Tue Apr 12 05:28:39 2016 -0400
@@ -90,7 +90,7 @@
}
LinearEquation getEquation(ThermalNode * tn, unsigned n,
- double step) const;
+ double step) const override;
private:
/* Resistance value in K/W */
@@ -114,7 +114,7 @@
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 @@
}
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 @@
double getTemp() const;
- void startup();
+ void startup() override;
void doStep();
void serialize(CheckpointOut &cp) const override;
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
