Patrick Williams | 03907ee | 2022-05-01 06:28:52 -0500 | [diff] [blame] | 1 | From f199d1982ef8a6c6d5c06c082d057b8793bcc6aa Mon Sep 17 00:00:00 2001 |
| 2 | From: Serhei Makarov <serhei@serhei.io> |
| 3 | Date: Fri, 21 Jan 2022 18:21:46 -0500 |
| 4 | Subject: [PATCH] gcc12 c++ compatibility re-tweak for rhel6: use function |
| 5 | pointer instead of lambdas instead of ptr_fun<> |
| 6 | |
| 7 | Saving 2 lines in ltrim/rtrim is probably not a good reason to drop |
| 8 | compatibility with the RHEL6 system compiler. Actually declaring a |
| 9 | named function and passing the function pointer is compatible with |
| 10 | everything. |
| 11 | |
| 12 | Upstream-Status: Backport [https://sourceware.org/git/?p=systemtap.git;a=commit;h=f199d1982ef8a6c6d5c06c082d057b8793bcc6aa] |
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 14 | --- |
| 15 | util.cxx | 13 ++++++++----- |
| 16 | 1 file changed, 8 insertions(+), 5 deletions(-) |
| 17 | |
| 18 | --- a/util.cxx |
| 19 | +++ b/util.cxx |
| 20 | @@ -1757,21 +1757,24 @@ flush_to_stream (const string &fname, os |
| 21 | return 1; // Failure |
| 22 | } |
| 23 | |
| 24 | +int |
| 25 | +not_isspace(unsigned char c) |
| 26 | +{ |
| 27 | + return !std::isspace(c); |
| 28 | +} |
| 29 | + |
| 30 | // trim from start (in place) |
| 31 | void |
| 32 | ltrim(std::string &s) |
| 33 | { |
| 34 | - s.erase(s.begin(), |
| 35 | - std::find_if(s.begin(), s.end(), |
| 36 | - std::not1(std::ptr_fun<int, int>(std::isspace)))); |
| 37 | + s.erase(s.begin(), std::find_if(s.begin(), s.end(), not_isspace)); |
| 38 | } |
| 39 | |
| 40 | // trim from end (in place) |
| 41 | void |
| 42 | rtrim(std::string &s) |
| 43 | { |
| 44 | - s.erase(std::find_if(s.rbegin(), s.rend(), |
| 45 | - std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end()); |
| 46 | + s.erase(std::find_if(s.rbegin(), s.rend(), not_isspace).base(), s.end()); |
| 47 | } |
| 48 | |
| 49 | // trim from both ends (in place) |