diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-02-07 16:43:47 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-02-07 16:43:47 -0500 |
| commit | fdaff2b1088446325dcb3c270b350b3314dca99a (patch) | |
| tree | 2592166e187fa8e70b567581b073b76f077058a6 | |
| parent | 8ffd12e807bd05a57bbe8857dbff0ecaf217fe64 (diff) | |
| parent | a19e9ea5fca3567bdf9d780b4e7669507daba88b (diff) | |
| download | gem5-fdaff2b1088446325dcb3c270b350b3314dca99a.tar.xz | |
Merge zizzer:/bk/newmem
into zeep.pool:/z/saidi/work/m5.newmem
--HG--
extra : convert_revision : 60aabc4b93ef9d742f7e07363bd51f24170b85b8
| -rw-r--r-- | src/mem/packet.hh | 1 | ||||
| -rw-r--r-- | src/unittest/cprintftest.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/mem/packet.hh b/src/mem/packet.hh index 15f605ca7..a4c003e8b 100644 --- a/src/mem/packet.hh +++ b/src/mem/packet.hh @@ -41,6 +41,7 @@ #include <cassert> #include <list> +#include "base/compiler.hh" #include "base/misc.hh" #include "mem/request.hh" #include "sim/host.hh" diff --git a/src/unittest/cprintftest.cc b/src/unittest/cprintftest.cc index a454be05e..7fb10375c 100644 --- a/src/unittest/cprintftest.cc +++ b/src/unittest/cprintftest.cc @@ -40,7 +40,7 @@ using namespace std; int main() { - char foo[9]; + char foo[] = "foo"; cprintf("%s\n", foo); cprintf("%d\n", 'A'); |