blob: 277a368b67bc9a0d1e411b8bf1c670bbcf4080ce [file] [log] [blame]
Andrew Geisslerc5535c92023-01-27 16:10:19 -06001From 455001cb0112f7324ab50f555aa5ed5eae1bb93b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 16 Jan 2023 19:23:18 -0800
4Subject: [PATCH] Replace std::ptr_fun for c++17
5
6std::ptr_fun was deprecated in C++11, and removed completely in C++17.
7Similarly, std::not1 is deprecated since C++17.
8
9Modern compilers like clang >= 16 have started to notice it
10
11src/FatUtils.h:41:46: error: use of undeclared identifier 'ptr_fun'
12| s.erase(find_if(s.rbegin(), s.rend(), not1(ptr_fun<int, int>(isspace))).base(), s.end());
13
14Therefore replace ptr_fun with lambda
15
16Also use 'unsigned char' parameter to std::isspace, for reason see [1]
17
18[1] https://en.cppreference.com/w/cpp/string/byte/isspace#Notes
19
20Upstream-Status: Submitted [https://github.com/Gregwar/fatcat/pull/36]
21Signed-off-by: Khem Raj <raj.khem@gmail.com>
22---
23 src/FatUtils.h | 4 ++--
24 1 file changed, 2 insertions(+), 2 deletions(-)
25
26diff --git a/src/FatUtils.h b/src/FatUtils.h
27index 5080f2a..a8d69ee 100644
28--- a/src/FatUtils.h
29+++ b/src/FatUtils.h
30@@ -32,13 +32,13 @@ using namespace std;
31
32 // trim from start
33 static inline string ltrim(string s) {
34- s.erase(s.begin(), find_if(s.begin(), s.end(), not1(ptr_fun<int, int>(isspace))));
35+ s.erase(s.begin(), find_if(s.begin(), s.end(), [](unsigned char c) {return !isspace(c);}));
36 return s;
37 }
38
39 // trim from end
40 static inline string rtrim(string s) {
41- s.erase(find_if(s.rbegin(), s.rend(), not1(ptr_fun<int, int>(isspace))).base(), s.end());
42+ s.erase(find_if(s.rbegin(), s.rend(), [](unsigned char c) {return !isspace(c);}).base(), s.end());
43 return s;
44 }
45
46--
472.39.0
48