power: Avoid forward declarations that confuse wrappers

The Python wrappers get confused by the forward declarations in the
power framework. This changeset restructures the code slightly to
avoid the troublesome forward declarations.

Change-Id: Id8c93224f1988edb5fdf9d3abc6237f2f688c02d
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Andreas Hansson <andreas.hansson@arm.com>
Reviewed-by: Curtis Dunham <curtis.dunham@arm.com>
Reviewed-by: Sascha Bischoff <sascha.bischoff@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/2227
Reviewed-by: Pierre-Yves Péneau <pierre-yves.peneau@lirmm.fr>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>

1 files changed, 2 insertions, 18 deletions

diff --git a/src/sim/power/thermal_model.hh b/src/sim/power/thermal_model.hh
index 32f34f109..7ee4ffdc3 100644
--- a/src/sim/power/thermal_model.hh
+++ b/src/sim/power/thermal_model.hh
@@ -47,27 +47,11 @@
 #include "params/ThermalReference.hh"
 #include "params/ThermalResistor.hh"
 #include "sim/clocked_object.hh"
+#include "sim/power/thermal_domain.hh"
 #include "sim/power/thermal_entity.hh"
+#include "sim/power/thermal_node.hh"
 #include "sim/sim_object.hh"
 
-class ThermalDomain;
-
-
-/**
- * A ThermalNode is used to connect thermal entities, such as
- * resistors, capacitors, references and domains. It is the circuital
- * equivalent to a voltage node.
- */
-class ThermalNode : public SimObject
-{
-  public:
-    typedef SimObjectParams Params;
-    ThermalNode(const Params *p);
-
-    int id;
-    bool isref;
-    double temp;
-};
 
 /**
  * A ThermalResistor is used to model a thermal resistance between two