diff options
author | Evan Martin <martine@danga.com> | 2012-07-15 00:20:30 (GMT) |
---|---|---|
committer | Evan Martin <martine@danga.com> | 2012-07-15 00:20:30 (GMT) |
commit | 638b0336e98af65240c1d0d66c5e0d9e5b800d9e (patch) | |
tree | e860fa36b06286b7d214eaa46eb2477a8e874fcf /src | |
parent | c7a3e306bea8514d5bbdda8ccc93950752fdeb33 (diff) | |
parent | df820cf6d4f0c4f5c860690df346b0dce8039e0f (diff) | |
download | Ninja-638b0336e98af65240c1d0d66c5e0d9e5b800d9e.zip Ninja-638b0336e98af65240c1d0d66c5e0d9e5b800d9e.tar.gz Ninja-638b0336e98af65240c1d0d66c5e0d9e5b800d9e.tar.bz2 |
Merge pull request #361 from HeisSpiter/master
Check more efficiently for emptiness
Diffstat (limited to 'src')
-rw-r--r-- | src/build.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/build.cc b/src/build.cc index eed52ae..0fc387c 100644 --- a/src/build.cc +++ b/src/build.cc @@ -465,7 +465,7 @@ void RealCommandRunner::Abort() { bool RealCommandRunner::CanRunMore() { return ((int)subprocs_.running_.size()) < config_.parallelism - && ((subprocs_.running_.size() == 0 || config_.max_load_average <= 0.0f) + && ((subprocs_.running_.empty() || config_.max_load_average <= 0.0f) || GetLoadAverage() < config_.max_load_average); } |