diff options
| author | Konstantin Kharlamov <Hi-Angel@users.noreply.github.com> | 2019-09-19 21:08:27 (GMT) |
|---|---|---|
| committer | Jan Niklas Hasse <jhasse@bixense.com> | 2019-09-19 21:08:27 (GMT) |
| commit | 8ed4bb844908de8bf2623bd6739da463fe83ef0b (patch) | |
| tree | d03ca7f34bb2164e92ba86c3cab154482f9883d8 /src/build.cc | |
| parent | 61f90e918b608413daf07ffcb5c5c0930416951a (diff) | |
| download | Ninja-8ed4bb844908de8bf2623bd6739da463fe83ef0b.zip Ninja-8ed4bb844908de8bf2623bd6739da463fe83ef0b.tar.gz Ninja-8ed4bb844908de8bf2623bd6739da463fe83ef0b.tar.bz2 | |
Small constifications (#1647)
* build: constify EdgeWanted()
* build: constify a bit of CommandRunner
* graph: constify functions of struct Edge
Signed-off-by: Konstantin Kharlamov <Hi-Angel@yandex.ru>
Diffstat (limited to 'src/build.cc')
| -rw-r--r-- | src/build.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/build.cc b/src/build.cc index 8ef88b5..931fb95 100644 --- a/src/build.cc +++ b/src/build.cc @@ -47,7 +47,7 @@ struct DryRunCommandRunner : public CommandRunner { virtual ~DryRunCommandRunner() {} // Overridden from CommandRunner: - virtual bool CanRunMore(); + virtual bool CanRunMore() const; virtual bool StartCommand(Edge* edge); virtual bool WaitForCommand(Result* result); @@ -55,7 +55,7 @@ struct DryRunCommandRunner : public CommandRunner { queue<Edge*> finished_; }; -bool DryRunCommandRunner::CanRunMore() { +bool DryRunCommandRunner::CanRunMore() const { return true; } @@ -373,7 +373,7 @@ bool Plan::AddSubTarget(Node* node, Node* dependent, string* err, return true; } -void Plan::EdgeWanted(Edge* edge) { +void Plan::EdgeWanted(const Edge* edge) { ++wanted_edges_; if (!edge->is_phony()) ++command_edges_; @@ -668,7 +668,7 @@ void Plan::Dump() { struct RealCommandRunner : public CommandRunner { explicit RealCommandRunner(const BuildConfig& config) : config_(config) {} virtual ~RealCommandRunner() {} - virtual bool CanRunMore(); + virtual bool CanRunMore() const; virtual bool StartCommand(Edge* edge); virtual bool WaitForCommand(Result* result); virtual vector<Edge*> GetActiveEdges(); @@ -691,7 +691,7 @@ void RealCommandRunner::Abort() { subprocs_.Clear(); } -bool RealCommandRunner::CanRunMore() { +bool RealCommandRunner::CanRunMore() const { size_t subproc_number = subprocs_.running_.size() + subprocs_.finished_.size(); return (int)subproc_number < config_.parallelism |