diff options
| -rw-r--r-- | dev/simconsole.cc | 2 | ||||
| -rw-r--r-- | sim/universe.cc | 10 |
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; } |