38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From 56c498d95c4749f15980da73b4933e7443b3f26c Mon Sep 17 00:00:00 2001
|
|
From: Jonathan Wakely <jwakely.gcc@gmail.com>
|
|
Date: Tue, 18 Jan 2022 15:52:18 -0500
|
|
Subject: [PATCH] gcc12 c++ compatibility tweak: use lambdas instead of
|
|
ptr_fun<>
|
|
|
|
Even while stap is a c++11 code base, such cleanups make code
|
|
nicer to look at.
|
|
---
|
|
util.cxx | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/util.cxx b/util.cxx
|
|
index c20f76003..e9286eca3 100644
|
|
--- a/util.cxx
|
|
+++ b/util.cxx
|
|
@@ -1763,7 +1763,7 @@ ltrim(std::string &s)
|
|
{
|
|
s.erase(s.begin(),
|
|
std::find_if(s.begin(), s.end(),
|
|
- std::not1(std::ptr_fun<int, int>(std::isspace))));
|
|
+ [](unsigned char c) { return !std::isspace(c); }));
|
|
}
|
|
|
|
// trim from end (in place)
|
|
@@ -1771,7 +1771,7 @@ void
|
|
rtrim(std::string &s)
|
|
{
|
|
s.erase(std::find_if(s.rbegin(), s.rend(),
|
|
- std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
|
|
+ [](unsigned char c) { return !std::isspace(c); }).base(), s.end());
|
|
}
|
|
|
|
// trim from both ends (in place)
|
|
--
|
|
2.21.0.windows.1
|
|
|