summaryrefslogtreecommitdiffstats
path: root/src/ninja.cc
diff options
context:
space:
mode:
authorScott Graham <scottmg@chromium.org>2016-01-27 19:10:34 (GMT)
committerScott Graham <scottmg@chromium.org>2016-01-27 19:10:34 (GMT)
commit56bab441b70e6f09f3faf7936118c309f9ce48cb (patch)
tree1b71d58b91645b4e770ad5bbf2a40d635a0069d5 /src/ninja.cc
parent233acbad4dea6410b567f077ecc8699525a46683 (diff)
downloadNinja-56bab441b70e6f09f3faf7936118c309f9ce48cb.zip
Ninja-56bab441b70e6f09f3faf7936118c309f9ce48cb.tar.gz
Ninja-56bab441b70e6f09f3faf7936118c309f9ce48cb.tar.bz2
dupe_edge_should_err from bool to enum
Diffstat (limited to 'src/ninja.cc')
-rw-r--r--src/ninja.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ninja.cc b/src/ninja.cc
index 691afad..a15d423 100644
--- a/src/ninja.cc
+++ b/src/ninja.cc
@@ -1114,7 +1114,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());