diff options
| author | Ron Dreslinski <rdreslin@umich.edu> | 2005-02-17 12:14:04 -0500 |
|---|---|---|
| committer | Ron Dreslinski <rdreslin@umich.edu> | 2005-02-17 12:14:04 -0500 |
| commit | 45ef238e3f54bd7e2b602def187085bd0b99aab5 (patch) | |
| tree | ea4057df1dac0768ebf36201468af632cdefedf1 /base/misc.cc | |
| parent | b8d65408c810ba490243fc32c7d5e6817c32c70b (diff) | |
| parent | cfe6ed7c484b62d07bae23c528f0e2e568cf0d65 (diff) | |
| download | gem5-45ef238e3f54bd7e2b602def187085bd0b99aab5.tar.xz | |
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision : 88afcacc41f5b0fae0ed1ac1821b7ca88c407e85
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; |