diff options
| author | Nathan Binkert <binkertn@umich.edu> | 2005-02-11 09:48:23 -0500 |
|---|---|---|
| committer | Nathan Binkert <binkertn@umich.edu> | 2005-02-11 09:48:23 -0500 |
| commit | 10ee909fbd895b588bf01021af98e81a3ae40fc0 (patch) | |
| tree | 081da4f22aaf0e48669acacf0d23a598cd536e2a /base/misc.cc | |
| parent | 60b263466e35139ee2c773cac6c96622be990fda (diff) | |
| parent | 06a4686af9b0d8e9e25e0591873d2f269bfb6d1b (diff) | |
| download | gem5-10ee909fbd895b588bf01021af98e81a3ae40fc0.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/m5
into ziff.eecs.umich.edu:/z/binkertn/research/m5/merge
--HG--
extra : convert_revision : 5d73046310a64b80a6ba3832df3b30b55532d707
Diffstat (limited to 'base/misc.cc')
| -rw-r--r-- | base/misc.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/base/misc.cc b/base/misc.cc index 0c459352f..4b7c3632a 100644 --- a/base/misc.cc +++ b/base/misc.cc @@ -30,10 +30,11 @@ #include <string> #include "base/cprintf.hh" -#include "sim/host.hh" #include "base/hostinfo.hh" #include "base/misc.hh" +#include "base/output.hh" #include "base/trace.hh" +#include "sim/host.hh" #include "sim/universe.hh" using namespace std; @@ -116,7 +117,7 @@ __warn(const string &format, cp::ArgList &args, const char *func, #endif args.dump(cerr, fmt); - if (outputStream != &cerr && outputStream != &cout) + if (simout.isFile(*outputStream)) args.dump(*outputStream, fmt); delete &args; |