diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-05-18 12:58:05 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-20 22:52:22 +0100 |
commit | 7a3fd4344b70d41a8e97af67878a991daff1fe13 (patch) | |
tree | 8199205f3c8847548be6f8420f9f51606d03202b /meta/recipes-kernel/systemtap/systemtap/0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch | |
parent | c8a4ed16d4bd761865d88be0951f7e8b0096f6c4 (diff) | |
download | poky-7a3fd4344b70d41a8e97af67878a991daff1fe13.tar.gz |
systemtap: update 4.6 -> 4.7
Drop backports.
(From OE-Core rev: 589f030dec438ee8ea54991b9e471482285ef4b7)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/systemtap/systemtap/0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch')
-rw-r--r-- | meta/recipes-kernel/systemtap/systemtap/0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch b/meta/recipes-kernel/systemtap/systemtap/0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch deleted file mode 100644 index f885c44460..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap/0001-gcc12-c-compatibility-re-tweak-for-rhel6-use-functio.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
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) | ||