sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

misc: Appease clang...again

Browse source 
Once again, clang is having issues with recently committed code.

Unfortunately HSAIL_X86 is still broken.
This commit is contained in:
Andreas Hansson 2016-04-12 05:28:39 -04:00
parent d9193d1b20
commit 4b802a09c5
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/dev/storage/disk_image.hh
View file

@ -87,10 +87,10 @@ class RawDiskImage : public DiskImage
void close(); void close();
void open(const std::string &filename, bool rd_only = false); 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; std::streampos read(uint8_t *data, std::streampos offset) const override;
virtual std::streampos write(const uint8_t *data, std::streampos offset); std::streampos write(const uint8_t *data, std::streampos offset) override;
}; };
/** /**

4
src/sim/power/thermal_domain.hh
View file

@ -83,7 +83,7 @@ class ThermalDomain : public SimObject, public ThermalEntity
/** Get nodal equation imposed by this node */ /** Get nodal equation imposed by this node */
LinearEquation getEquation(ThermalNode * tn, unsigned n, LinearEquation getEquation(ThermalNode * tn, unsigned n,
double step) const; double step) const override;
/** /**
* Emit a temperature update through probe points interface * Emit a temperature update through probe points interface
@ -95,7 +95,7 @@ class ThermalDomain : public SimObject, public ThermalEntity
*/ */
void setSubSystem(SubSystem * ss); void setSubSystem(SubSystem * ss);
void regStats(); void regStats() override;
void serialize(CheckpointOut &cp) const override; void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override; void unserialize(CheckpointIn &cp) override;

8
src/sim/power/thermal_model.hh
View file

@ -90,7 +90,7 @@ class ThermalResistor : public SimObject, public ThermalEntity
} }
LinearEquation getEquation(ThermalNode * tn, unsigned n, LinearEquation getEquation(ThermalNode * tn, unsigned n,
double step) const; double step) const override;
private: private:
/* Resistance value in K/W */ /* Resistance value in K/W */
@ -114,7 +114,7 @@ class ThermalCapacitor : public SimObject, public ThermalEntity
void unserialize(CheckpointIn &cp) override; void unserialize(CheckpointIn &cp) override;
LinearEquation getEquation(ThermalNode * tn, unsigned n, LinearEquation getEquation(ThermalNode * tn, unsigned n,
double step) const; double step) const override;
void setNodes(ThermalNode * n1, ThermalNode * n2) { void setNodes(ThermalNode * n1, ThermalNode * n2) {
node1 = n1; node1 = n1;
@ -143,7 +143,7 @@ class ThermalReference : public SimObject, public ThermalEntity
} }
LinearEquation getEquation(ThermalNode * tn, unsigned n, LinearEquation getEquation(ThermalNode * tn, unsigned n,
double step) const; double step) const override;
void serialize(CheckpointOut &cp) const override; void serialize(CheckpointOut &cp) const override;
void unserialize(CheckpointIn &cp) override; void unserialize(CheckpointIn &cp) override;
@ -176,7 +176,7 @@ class ThermalModel : public ClockedObject
double getTemp() const; double getTemp() const;
void startup(); void startup() override;
void doStep(); void doStep();
void serialize(CheckpointOut &cp) const override; void serialize(CheckpointOut &cp) const override;