diff options
author | Boris Kolpackov <boris@codesynthesis.com> | 2015-04-08 16:09:31 +0200 |
---|---|---|
committer | Boris Kolpackov <boris@codesynthesis.com> | 2015-04-08 16:09:31 +0200 |
commit | 5af9070fda0dba591264ed675920efcfd62e81bc (patch) | |
tree | 8331fc83572c4bcd93a06adfcb489877b9816153 /build/config | |
parent | 22a280a1f3f92c2e01ef192a4dda65e7ae957188 (diff) |
Distinguish between undefined and null variables
Diffstat (limited to 'build/config')
-rw-r--r-- | build/config/operation.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/config/operation.cxx b/build/config/operation.cxx index b85a5c7..ef83e47 100644 --- a/build/config/operation.cxx +++ b/build/config/operation.cxx @@ -99,13 +99,13 @@ namespace build // if (auto gval = (*global_scope)[var]) { - if (!pval || !pval->compare (gval.as<const value&> ())) + if (pval == nullptr || !pval->compare (gval.as<const value&> ())) warn << "variable " << var.name << " configured value " << "differs from command line value" << info << "reconfigure the project to use command line value"; } - if (pval) + if (pval != nullptr) { //@@ TODO: assuming list // @@ -116,8 +116,8 @@ namespace build } else { - ofs << var.name << " =" << endl; // @@ TODO: [undefined] - //text << var.name << " = [undefined]"; + ofs << var.name << " = #[null]" << endl; // @@ TODO: [null] + //text << var.name << " = [null]"; } } } |