From 44d3a76d4af3aebcb9bcb15fc003010fd0ae1d76 Mon Sep 17 00:00:00 2001 From: Brad King Date: Fri, 22 Sep 2017 14:06:33 -0400 Subject: Avoid using std::bind1st that is removed in C++17 Use a lambda instead now that we require C++11. --- Source/cmAlgorithms.h | 3 +-- 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::const_iterator cmFindNot(Range const& r, T const& t) { - return std::find_if(r.begin(), r.end(), - std::bind1st(std::not_equal_to(), t)); + return std::find_if(r.begin(), r.end(), [&t](T const& i) { return i != t; }); } template 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 -#include #include #include #include @@ -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(), prefix)); + [&prefix](std::string const& s) { return prefix + s; }); } } -- cgit v0.12