diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2018-04-05 16:26:42 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-05 16:26:42 (GMT) |
| commit | ef05d51bf9ae4c2cdc9afb14325094f98b80f971 (patch) | |
| tree | e83a90a843d6a0dc38de90fc1cedef4129b248d3 | |
| parent | 5d43e7457162c74bab25ada64a5bf87489ca5896 (diff) | |
| parent | dfed28c3073947cf6b77a53a6bab06285ff04a11 (diff) | |
| download | Ninja-ef05d51bf9ae4c2cdc9afb14325094f98b80f971.zip Ninja-ef05d51bf9ae4c2cdc9afb14325094f98b80f971.tar.gz Ninja-ef05d51bf9ae4c2cdc9afb14325094f98b80f971.tar.bz2 | |
Merge pull request #1404 from nico/c++17
make ninja build with -std=c++17
| -rw-r--r-- | src/build.cc | 7 | ||||
| -rw-r--r-- | src/build.h | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/build.cc b/src/build.cc index 61ef0e8..5239637 100644 --- a/src/build.cc +++ b/src/build.cc @@ -441,7 +441,12 @@ bool Plan::CleanNode(DependencyScan* scan, Node* node, string* err) { vector<Node*>::iterator begin = (*oe)->inputs_.begin(), end = (*oe)->inputs_.end() - (*oe)->order_only_deps_; - if (find_if(begin, end, mem_fun(&Node::dirty)) == end) { +#if __cplusplus < 201703L +#define MEM_FN mem_fun +#else +#define MEM_FN mem_fn // mem_fun was removed in C++17. +#endif + if (find_if(begin, end, MEM_FN(&Node::dirty)) == end) { // Recompute most_recent_input. Node* most_recent_input = NULL; for (vector<Node*>::iterator i = begin; i != end; ++i) { diff --git a/src/build.h b/src/build.h index 43786f1..e38719c 100644 --- a/src/build.h +++ b/src/build.h @@ -178,7 +178,11 @@ struct Builder { State* state_; const BuildConfig& config_; Plan plan_; +#if __cplusplus < 201703L auto_ptr<CommandRunner> command_runner_; +#else + unique_ptr<CommandRunner> command_runner_; // auto_ptr was removed in C++17. +#endif BuildStatus* status_; private: |