diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2012-07-28 16:56:59 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2012-07-28 16:56:59 (GMT) |
| commit | 957a801ace27426f3ceb544449f882dba1924161 (patch) | |
| tree | 6a212b102467312452e89dc5472c2e4230f1cbc6 /src/graph.cc | |
| parent | 3ab35e5403066f48117f442f9ba8853e70edab13 (diff) | |
| download | Ninja-957a801ace27426f3ceb544449f882dba1924161.zip Ninja-957a801ace27426f3ceb544449f882dba1924161.tar.gz Ninja-957a801ace27426f3ceb544449f882dba1924161.tar.bz2 | |
Revert "Make StringPiece data members private."
This reverts commit 904c9610fe66c4f4bd63a07d6f057c8603d24394.
The commit caused issue #380, this revert fixes it. The revert
also makes the test from the previous commit pass.
Diffstat (limited to 'src/graph.cc')
| -rw-r--r-- | src/graph.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/graph.cc b/src/graph.cc index caf2aca..18adeee 100644 --- a/src/graph.cc +++ b/src/graph.cc @@ -295,8 +295,7 @@ bool Edge::LoadDepFile(State* state, DiskInterface* disk_interface, // Add all its in-edges. for (vector<StringPiece>::iterator i = depfile.ins_.begin(); i != depfile.ins_.end(); ++i, ++implicit_dep) { - int length = i->len(); - if (!CanonicalizePath(const_cast<char*>(i->str()), &length, err)) + if (!CanonicalizePath(const_cast<char*>(i->str_), &i->len_, err)) return false; Node* node = state->GetNode(*i); |