summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2015-04-09 18:47:28 (GMT)
committerNico Weber <nicolasweber@gmx.de>2015-04-09 18:47:28 (GMT)
commitce70cde4b17e2b506a824bb4b58bd7c82116514d (patch)
tree62c4ed0290f1e45ac6176d59c006e377772bad17 /src
parent9e727e5002fe3fa6159f54ce100df6d11e03ce5c (diff)
parent5ee7238bda57e711749be799e9824bfa2d791192 (diff)
downloadNinja-ce70cde4b17e2b506a824bb4b58bd7c82116514d.zip
Ninja-ce70cde4b17e2b506a824bb4b58bd7c82116514d.tar.gz
Ninja-ce70cde4b17e2b506a824bb4b58bd7c82116514d.tar.bz2
Merge pull request #954 from nico/fix
Fix an assert (and tests in --debug mode) after #921.
Diffstat (limited to 'src')
-rw-r--r--src/eval_env.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eval_env.cc b/src/eval_env.cc
index e03a82e..e991d21 100644
--- a/src/eval_env.cc
+++ b/src/eval_env.cc
@@ -30,7 +30,7 @@ void BindingEnv::AddBinding(const string& key, const string& val) {
}
void BindingEnv::AddRule(const Rule* rule) {
- assert(LookupRule(rule->name()) == NULL);
+ assert(LookupRuleCurrentScope(rule->name()) == NULL);
rules_[rule->name()] = rule;
}