From 936ad584022be7a4e89292c708cc624841198f62 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Thu, 3 Feb 2005 14:33:02 -0500 Subject: 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 --- sim/universe.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'sim') 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; } -- cgit v1.2.3