diff options
| -rw-r--r-- | sim/builder.cc | 3 | ||||
| -rw-r--r-- | sim/param.cc | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/sim/builder.cc b/sim/builder.cc index e2345556e..110c42f25 100644 --- a/sim/builder.cc +++ b/sim/builder.cc @@ -32,6 +32,7 @@ #include "base/misc.hh" #include "sim/builder.hh" #include "sim/configfile.hh" +#include "sim/config_node.hh" #include "sim/host.hh" #include "sim/sim_object.hh" #include "sim/universe.hh" @@ -153,7 +154,7 @@ SimObjectClass::createObject(IniFile &configDB, // (specified by 'type=' parameter) string simObjClassName; - if (!configDB.findDefault(configClassName, "type", simObjClassName)) { + if (!configNode->find("type", simObjClassName)) { cerr << "Configuration class '" << configClassName << "' not found." << endl; abort(); diff --git a/sim/param.cc b/sim/param.cc index 7affe4786..bb372f631 100644 --- a/sim/param.cc +++ b/sim/param.cc @@ -147,14 +147,14 @@ template <> bool parseParam(const string &s, bool &value) { - const string &lower = to_lower(s); + const string &ls = to_lower(s); - if (lower == "true" || lower == "t" || lower == "yes" || lower == "y") { + if (ls == "true" || ls == "t" || ls == "yes" || ls == "y" || ls == "1") { value = true; return true; } - if (lower == "false" || lower == "f" || lower == "no" || lower == "n") { + if (ls == "false" || ls == "f" || ls == "no" || ls == "n" || ls == "0") { value = false; return true; } |