projects
/
gem5.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge zizzer:/bk/m5 into zeep.eecs.umich.edu:/z/saidi/work/m5
[gem5.git]
/
dev
/
simconsole.hh
diff --git
a/dev/simconsole.hh
b/dev/simconsole.hh
index 138e2e36acbdf272a39780faa3b409f21639cf82..c5a281834168e7f682f085aac1ed1ac5c3c1f5ba 100644
(file)
--- a/
dev/simconsole.hh
+++ b/
dev/simconsole.hh
@@
-70,7
+70,7
@@
class SimConsole : public SimObject
ConsoleListener *listener;
public:
- SimConsole(const std::string &name,
const std::string &file
, int num);
+ SimConsole(const std::string &name,
std::ostream *os
, int num);
~SimConsole();
protected: