diff options
author | Brad King <brad.king@kitware.com> | 2017-09-22 18:06:33 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2017-09-23 10:49:48 (GMT) |
commit | 44d3a76d4af3aebcb9bcb15fc003010fd0ae1d76 (patch) | |
tree | 5f85790d967d8a08c7d37437e23c12251b6789ee | |
parent | 4609aaf513ffd6f253ec7c8a8bca6bb93d7eede5 (diff) | |
download | CMake-44d3a76d4af3aebcb9bcb15fc003010fd0ae1d76.zip CMake-44d3a76d4af3aebcb9bcb15fc003010fd0ae1d76.tar.gz CMake-44d3a76d4af3aebcb9bcb15fc003010fd0ae1d76.tar.bz2 |
Avoid using std::bind1st that is removed in C++17
Use a lambda instead now that we require C++11.
-rw-r--r-- | Source/cmAlgorithms.h | 3 | ||||
-rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmAlgorithms.h b/Source/cmAlgorithms.h index b6ea75a..69d0ed6 100644 --- a/Source/cmAlgorithms.h +++ b/Source/cmAlgorithms.h @@ -370,8 +370,7 @@ std::string cmWrap(char prefix, Range const& r, char suffix, template <typename Range, typename T> typename Range::const_iterator cmFindNot(Range const& r, T const& t) { - return std::find_if(r.begin(), r.end(), - std::bind1st(std::not_equal_to<T>(), t)); + return std::find_if(r.begin(), r.end(), [&t](T const& i) { return i != t; }); } template <typename Range> diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index df02f84..50ed0ed 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -5,7 +5,6 @@ #include "cmsys/FStream.hxx" #include "cmsys/Terminal.h" #include <algorithm> -#include <functional> #include <sstream> #include <stdio.h> #include <utility> @@ -2073,7 +2072,7 @@ void cmLocalUnixMakefileGenerator3::CreateCDCommand( std::string outputForExisting = this->ConvertToOutputForExisting(tgtDir); std::string prefix = cd_cmd + outputForExisting + " && "; std::transform(commands.begin(), commands.end(), commands.begin(), - std::bind1st(std::plus<std::string>(), prefix)); + [&prefix](std::string const& s) { return prefix + s; }); } } |