summaryrefslogtreecommitdiffstats
path: root/src/ninja.cc
diff options
context:
space:
mode:
authorScott Graham <scottmg@chromium.org>2014-11-09 07:01:23 (GMT)
committerScott Graham <scottmg@chromium.org>2014-11-09 07:01:23 (GMT)
commit4ee1cb54d77d902a0223ebde12dff3b3efec8a8d (patch)
treebd771c7674ee2fe5ba4c334948c9149ba4ea98b9 /src/ninja.cc
parent559389de082406f44ae752a2494e53000d31a7df (diff)
downloadNinja-4ee1cb54d77d902a0223ebde12dff3b3efec8a8d.zip
Ninja-4ee1cb54d77d902a0223ebde12dff3b3efec8a8d.tar.gz
Ninja-4ee1cb54d77d902a0223ebde12dff3b3efec8a8d.tar.bz2
fix order of args to CanonicalizePath
Diffstat (limited to 'src/ninja.cc')
-rw-r--r--src/ninja.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ninja.cc b/src/ninja.cc
index 5831e26..27380c0 100644
--- a/src/ninja.cc
+++ b/src/ninja.cc
@@ -229,7 +229,7 @@ struct RealFileReader : public ManifestParser::FileReader {
bool NinjaMain::RebuildManifest(const char* input_file, string* err) {
string path = input_file;
unsigned int slash_bits; // Unused because this path is only used for lookup.
- if (!CanonicalizePath(&path, err, &slash_bits))
+ if (!CanonicalizePath(&path, &slash_bits, err))
return false;
Node* node = state_.LookupNode(path);
if (!node)
@@ -252,7 +252,7 @@ bool NinjaMain::RebuildManifest(const char* input_file, string* err) {
Node* NinjaMain::CollectTarget(const char* cpath, string* err) {
string path = cpath;
unsigned int slash_bits; // Unused because this path is only used for lookup.
- if (!CanonicalizePath(&path, err, &slash_bits))
+ if (!CanonicalizePath(&path, &slash_bits, err))
return NULL;
// Special syntax: "foo.cc^" means "the first output of foo.cc".