diff options
| author | Steve Reinhardt <stever@gmail.com> | 2008-06-28 13:20:00 -0400 |
|---|---|---|
| committer | Steve Reinhardt <stever@gmail.com> | 2008-06-28 13:20:00 -0400 |
| commit | 96bbccc36bad7c6f67b1cb70965eab3a621c7270 (patch) | |
| tree | e43e352c7d264d3b84540dd5d3ed26b3e5386a4b /src/sim/sim_object.hh | |
| parent | caaac16803db6eaf3ee20b5d062ec2211fe6584d (diff) | |
| parent | 3205768ea57b4e2f75561eebb39671045a6d6746 (diff) | |
| download | gem5-96bbccc36bad7c6f67b1cb70965eab3a621c7270.tar.xz | |
Automated merge after backout.
Diffstat (limited to 'src/sim/sim_object.hh')
| -rw-r--r-- | src/sim/sim_object.hh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/sim/sim_object.hh b/src/sim/sim_object.hh index ec565ce82..00bb3fee6 100644 --- a/src/sim/sim_object.hh +++ b/src/sim/sim_object.hh @@ -36,10 +36,11 @@ #ifndef __SIM_OBJECT_HH__ #define __SIM_OBJECT_HH__ -#include <map> +#include <iostream> #include <list> +#include <map> +#include <string> #include <vector> -#include <iostream> #include "params/SimObject.hh" #include "sim/serialize.hh" |