From 77832c456fe57bf50486cecdbd82836a93813666 Mon Sep 17 00:00:00 2001 From: Niklas Rosenstein Date: Wed, 12 Sep 2018 10:45:58 +0200 Subject: [PATCH] get rid of std::ptr_fun in string.hpp --- include/NiklasRosenstein/string.hpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/include/NiklasRosenstein/string.hpp b/include/NiklasRosenstein/string.hpp index 70e408e..9d02ed6 100644 --- a/include/NiklasRosenstein/string.hpp +++ b/include/NiklasRosenstein/string.hpp @@ -58,18 +58,14 @@ namespace niklasrosenstein { } /* Trims a string of whitespace from the left. */ - template - inline string& ltrim(string& s) { - s.erase(s.begin(), std::find_if(s.begin(), s.end(), - std::not1(std::ptr_fun(std::isspace)))); + inline std::string& ltrim(std::string& s) { + s.erase(s.begin(), std::find_if(s.begin(), s.end(), [] (auto&& c) { return !std::isspace(c); })); return s; } /* Trims a string of whitespace from the right. */ - template - inline string& rtrim(string& s) { - s.erase(std::find_if(s.rbegin(), s.rend(), - std::not1(std::ptr_fun(std::isspace))).base(), s.end()); + inline std::string& rtrim(std::string& s) { + s.erase(std::find_if(s.rbegin(), s.rend(), [] (auto&& c) { return !std::isspace(c); }).base(), s.end()); return s; }