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/graph.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/graph.cc')
| -rw-r--r-- | src/graph.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/graph.cc b/src/graph.cc index 8666f50..f85a1f6 100644 --- a/src/graph.cc +++ b/src/graph.cc @@ -393,7 +393,7 @@ bool ImplicitDepLoader::LoadDepFile(Edge* edge, const string& path, unsigned int unused; if (!CanonicalizePath(const_cast<char*>(depfile.out_.str_), - &depfile.out_.len_, err, &unused)) + &depfile.out_.len_, &unused, err)) return false; // Check that this depfile matches the edge's output. @@ -413,8 +413,8 @@ bool ImplicitDepLoader::LoadDepFile(Edge* edge, const string& path, for (vector<StringPiece>::iterator i = depfile.ins_.begin(); i != depfile.ins_.end(); ++i, ++implicit_dep) { unsigned int slash_bits; - if (!CanonicalizePath(const_cast<char*>(i->str_), &i->len_, err, - &slash_bits)) + if (!CanonicalizePath(const_cast<char*>(i->str_), &i->len_, &slash_bits, + err)) return false; Node* node = state_->GetNode(*i, slash_bits); |