summaryrefslogtreecommitdiffstats
path: root/src/deps_log.cc
diff options
context:
space:
mode:
authorBeren Minor <beren.minor+git@gmail.com>2014-12-31 11:17:21 (GMT)
committerBeren Minor <beren.minor+git@gmail.com>2014-12-31 11:17:21 (GMT)
commitd1e6a29fd30337e86c346208661c00233fd223f7 (patch)
treee3085f86cb3b2cc2cdaba97ab5ad9082da4b7a1b /src/deps_log.cc
parent82e372d5fd09ef37ab1b2f1c1cc175df26648653 (diff)
downloadNinja-d1e6a29fd30337e86c346208661c00233fd223f7.zip
Ninja-d1e6a29fd30337e86c346208661c00233fd223f7.tar.gz
Ninja-d1e6a29fd30337e86c346208661c00233fd223f7.tar.bz2
Fix compilation errors on Visual Studio 2015 (_MSC_VER 1900).
Diffstat (limited to 'src/deps_log.cc')
-rw-r--r--src/deps_log.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/deps_log.cc b/src/deps_log.cc
index aa8eb23..bd47ebc 100644
--- a/src/deps_log.cc
+++ b/src/deps_log.cc
@@ -239,13 +239,13 @@ bool DepsLog::Load(const string& path, State* state, string* err) {
if (buf[path_size - 1] == '\0') --path_size;
if (buf[path_size - 1] == '\0') --path_size;
if (buf[path_size - 1] == '\0') --path_size;
- StringPiece path(buf, path_size);
+ StringPiece subpath(buf, path_size);
// It is not necessary to pass in a correct slash_bits here. It will
// either be a Node that's in the manifest (in which case it will already
// have a correct slash_bits that GetNode will look up), or it is an
// implicit dependency from a .d which does not affect the build command
// (and so need not have its slashes maintained).
- Node* node = state->GetNode(path, 0);
+ Node* node = state->GetNode(subpath, 0);
// Check that the expected index matches the actual index. This can only
// happen if two ninja processes write to the same deps log concurrently.