summaryrefslogtreecommitdiff
path: root/dev/simconsole.cc
diff options
context:
space:
mode:
authorRon Dreslinski <rdreslin@umich.edu>2005-02-09 12:56:24 -0500
committerRon Dreslinski <rdreslin@umich.edu>2005-02-09 12:56:24 -0500
commit230a5a608dfb2204e2886a795e6bd8a30224b84f (patch)
tree81d312257237c4d13ad44836d55d2f192a479036 /dev/simconsole.cc
parentd9317dd348f3acd853d1e6a09c09f2a27ad5d707 (diff)
parentc4089562d5add225cd8275b59456eb7eb559b988 (diff)
downloadgem5-230a5a608dfb2204e2886a795e6bd8a30224b84f.tar.xz
Merger
cpu/simple_cpu/simple_cpu.hh: Merge --HG-- extra : convert_revision : 1b6003ac731051fefacb7d7a30c317553b4bf1bc
Diffstat (limited to 'dev/simconsole.cc')
-rw-r--r--dev/simconsole.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/dev/simconsole.cc b/dev/simconsole.cc
index d8d890e15..48e5d0201 100644
--- a/dev/simconsole.cc
+++ b/dev/simconsole.cc
@@ -315,7 +315,7 @@ CREATE_SIM_OBJECT(SimConsole)
{
string filename;
- if (!output.isValid()) {
+ if (filename.empty()) {
filename = getInstanceName();
} else if (append_name) {
filename = (string)output + "." + getInstanceName();