diff options
| author | Kevin Lim <ktlim@umich.edu> | 2005-02-11 17:54:42 -0500 |
|---|---|---|
| committer | Kevin Lim <ktlim@umich.edu> | 2005-02-11 17:54:42 -0500 |
| commit | 79e83cea971bf346a5b0d6e88541e502a614c777 (patch) | |
| tree | e1561f7044a4b3ee79a960d57451716af53387b5 /base/misc.cc | |
| parent | c4d0ebd25cc5f0657b99543ff2df30d1a86f3ad5 (diff) | |
| parent | 10ee909fbd895b588bf01021af98e81a3ae40fc0 (diff) | |
| download | gem5-79e83cea971bf346a5b0d6e88541e502a614c777.tar.xz | |
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5
--HG--
extra : convert_revision : 11832134b169aa827a1d03c96ef89edddf4b3dab
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; |