diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2016-02-03 20:57:10 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2016-02-03 20:57:10 (GMT) |
| commit | 27c87c5efdb5c5243550a9261c122a1e9d7d0c75 (patch) | |
| tree | 723fcb3a1eb5d8399b4490ccdd04a096aebd9da9 /src/manifest_parser.cc | |
| parent | 7d8f9ef43e261724be256ae69b1642b6729f776a (diff) | |
| parent | e74cefa6c606d69ddfd6bc9b055ef0c697c4f29a (diff) | |
| download | Ninja-27c87c5efdb5c5243550a9261c122a1e9d7d0c75.zip Ninja-27c87c5efdb5c5243550a9261c122a1e9d7d0c75.tar.gz Ninja-27c87c5efdb5c5243550a9261c122a1e9d7d0c75.tar.bz2 | |
Merge pull request #1060 from bradking/deduplicate-disk-interface
Deduplicate disk abstraction infrastructure
Diffstat (limited to 'src/manifest_parser.cc')
| -rw-r--r-- | src/manifest_parser.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/manifest_parser.cc b/src/manifest_parser.cc index d0fac59..8bdb330 100644 --- a/src/manifest_parser.cc +++ b/src/manifest_parser.cc @@ -18,6 +18,7 @@ #include <stdlib.h> #include <vector> +#include "disk_interface.h" #include "graph.h" #include "metrics.h" #include "state.h" @@ -35,7 +36,7 @@ bool ManifestParser::Load(const string& filename, string* err, Lexer* parent) { METRIC_RECORD(".ninja parse"); string contents; string read_err; - if (!file_reader_->ReadFile(filename, &contents, &read_err)) { + if (file_reader_->ReadFile(filename, &contents, &read_err) != FileReader::Okay) { *err = "loading '" + filename + "': " + read_err; if (parent) parent->Error(string(*err), err); |