diff options
| author | Evan Martin <martine@danga.com> | 2012-05-06 21:00:09 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2012-05-06 21:00:09 (GMT) |
| commit | cc0cf7aa6a51301a53b6b1870c0492f2e3fe35bb (patch) | |
| tree | 48dfafe3a399753360a6922af347c14dad1f748c | |
| parent | 054ff2b69b3d9e317b2ab90dea0695c786efb55f (diff) | |
| parent | dea535b93dfebd86f6c01b617da0e7eab6633202 (diff) | |
| download | Ninja-cc0cf7aa6a51301a53b6b1870c0492f2e3fe35bb.zip Ninja-cc0cf7aa6a51301a53b6b1870c0492f2e3fe35bb.tar.gz Ninja-cc0cf7aa6a51301a53b6b1870c0492f2e3fe35bb.tar.bz2 | |
Merge pull request #298 from tfarina/build-log-string
No need to convert log_path to c-string. Two places.
| -rw-r--r-- | src/ninja.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/ninja.cc b/src/ninja.cc index ac862e9..667aaae 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -739,13 +739,12 @@ reload: log_path = build_dir + "/" + kLogPath; } - if (!build_log.Load(log_path.c_str(), &err)) { - Error("loading build log %s: %s", - log_path.c_str(), err.c_str()); + if (!build_log.Load(log_path, &err)) { + Error("loading build log %s: %s", log_path.c_str(), err.c_str()); return 1; } - if (!build_log.OpenForWrite(log_path.c_str(), &err)) { + if (!build_log.OpenForWrite(log_path, &err)) { Error("opening build log: %s", err.c_str()); return 1; } |