diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2016-01-29 03:07:12 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2016-01-29 03:07:12 (GMT) |
| commit | 35e950d4c2d97d21ef7adf27cf6d003827e908ed (patch) | |
| tree | 388c35ead599c61b9999aa55d7309661f7064f4a /src/ninja.cc | |
| parent | 16553f76a68d12e0b48fad12f9a76861c14ffd35 (diff) | |
| parent | 56bab441b70e6f09f3faf7936118c309f9ce48cb (diff) | |
| download | Ninja-35e950d4c2d97d21ef7adf27cf6d003827e908ed.zip Ninja-35e950d4c2d97d21ef7adf27cf6d003827e908ed.tar.gz Ninja-35e950d4c2d97d21ef7adf27cf6d003827e908ed.tar.bz2 | |
Merge pull request #1096 from sgraham/dupe-edge-action
dupe_edge_should_err from bool to enum
Diffstat (limited to 'src/ninja.cc')
| -rw-r--r-- | src/ninja.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ninja.cc b/src/ninja.cc index bb76f5d..3af10d6 100644 --- a/src/ninja.cc +++ b/src/ninja.cc @@ -1119,7 +1119,9 @@ int real_main(int argc, char** argv) { RealFileReader file_reader; ManifestParser parser(&ninja.state_, &file_reader, - options.dupe_edges_should_err); + options.dupe_edges_should_err + ? kDupeEdgeActionError + : kDupeEdgeActionWarn); string err; if (!parser.Load(options.input_file, &err)) { Error("%s", err.c_str()); |