diff options
| author | Scott Graham <scottmg@chromium.org> | 2014-11-09 07:01:23 (GMT) |
|---|---|---|
| committer | Scott Graham <scottmg@chromium.org> | 2014-11-09 07:01:23 (GMT) |
| commit | 4ee1cb54d77d902a0223ebde12dff3b3efec8a8d (patch) | |
| tree | bd771c7674ee2fe5ba4c334948c9149ba4ea98b9 /src/manifest_parser.cc | |
| parent | 559389de082406f44ae752a2494e53000d31a7df (diff) | |
| download | Ninja-4ee1cb54d77d902a0223ebde12dff3b3efec8a8d.zip Ninja-4ee1cb54d77d902a0223ebde12dff3b3efec8a8d.tar.gz Ninja-4ee1cb54d77d902a0223ebde12dff3b3efec8a8d.tar.bz2 | |
fix order of args to CanonicalizePath
Diffstat (limited to 'src/manifest_parser.cc')
| -rw-r--r-- | src/manifest_parser.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/manifest_parser.cc b/src/manifest_parser.cc index 16214f1..388b5bc 100644 --- a/src/manifest_parser.cc +++ b/src/manifest_parser.cc @@ -210,7 +210,7 @@ bool ManifestParser::ParseDefault(string* err) { string path = eval.Evaluate(env_); string path_err; unsigned int slash_bits; // Unused because this only does lookup. - if (!CanonicalizePath(&path, &path_err, &slash_bits)) + if (!CanonicalizePath(&path, &slash_bits, &path_err)) return lexer_.Error(path_err, err); if (!state_->AddDefault(path, &path_err)) return lexer_.Error(path_err, err); @@ -325,7 +325,7 @@ bool ManifestParser::ParseEdge(string* err) { string path = i->Evaluate(env); string path_err; unsigned int slash_bits; - if (!CanonicalizePath(&path, &path_err, &slash_bits)) + if (!CanonicalizePath(&path, &slash_bits, &path_err)) return lexer_.Error(path_err, err); state_->AddIn(edge, path, slash_bits); } @@ -333,7 +333,7 @@ bool ManifestParser::ParseEdge(string* err) { string path = i->Evaluate(env); string path_err; unsigned int slash_bits; - if (!CanonicalizePath(&path, &path_err, &slash_bits)) + if (!CanonicalizePath(&path, &slash_bits, &path_err)) return lexer_.Error(path_err, err); state_->AddOut(edge, path, slash_bits); } |