summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Binkert <binkertn@umich.edu>2005-02-03 14:33:02 -0500
committerNathan Binkert <binkertn@umich.edu>2005-02-03 14:33:02 -0500
commit936ad584022be7a4e89292c708cc624841198f62 (patch)
tree5c835e4b31d992e41d516265831e400ae7820e2c
parent15e1ad8f6b0e0b45279c27ecc8f3c70854a4b0a4 (diff)
downloadgem5-936ad584022be7a4e89292c708cc624841198f62.tar.xz
small python config related fixes.
dev/simconsole.cc: sim/universe.cc: isValid isn't compatible with new python stuff, so whack it. --HG-- extra : convert_revision : 0c50038769a558650479c51122a8be5d92e7d9c4
-rw-r--r--dev/simconsole.cc2
-rw-r--r--sim/universe.cc10
2 files changed, 7 insertions, 5 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();
diff --git a/sim/universe.cc b/sim/universe.cc
index 52353db11..115f6f790 100644
--- a/sim/universe.cc
+++ b/sim/universe.cc
@@ -143,7 +143,8 @@ CREATE_SIM_OBJECT(Root)
__ticksPerNS = freq / 1.0e9;
__ticksPerPS = freq / 1.0e12;
- if (output_dir.isValid()) {
+ outputDirectory = output_dir;
+ if (!outputDirectory.empty()) {
outputDirectory = output_dir;
// guarantee that directory ends with a '/'
@@ -159,9 +160,10 @@ CREATE_SIM_OBJECT(Root)
}
outputStream = makeOutputStream(output_file);
- configStream = config_output_file.isValid()
- ? makeOutputStream(config_output_file)
- : outputStream;
+ configStream = outputStream;
+ string cof = config_output_file;
+ if (!cof.empty())
+ configStream = makeOutputStream(cof);
return root;
}