From: Michael Matirko (mmatirko) <mmatirko@cisco.com>
Date: Tue, 27 Feb 2024 16:08:04 +0000 (+0000)
Subject: Pull request #4228: snort2lua: change deprecated use of ptr_fn to lambda
X-Git-Tag: 3.1.82.0~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1100b819683ea1b43b6e56f85ebcba21d8726a4;p=thirdparty%2Fsnort3.git

Pull request #4228: snort2lua: change deprecated use of ptr_fn to lambda

Merge in SNORT/snort3 from ~MMATIRKO/snort3:cpp17-ptrfn to master

Squashed commit of the following:

commit f0f894c85b5440d6042fad273453a8e73be83038
Author: Michael Matirko <mmatirko@cisco.com>
Date:   Mon Feb 26 11:54:16 2024 -0500

    snort2lua: change deprecated use of ptr_fn to lambda
---

diff --git a/tools/snort2lua/helpers/s2l_util.cc b/tools/snort2lua/helpers/s2l_util.cc
index 00e896da0..64e9d93da 100644
--- a/tools/snort2lua/helpers/s2l_util.cc
+++ b/tools/snort2lua/helpers/s2l_util.cc
@@ -103,13 +103,13 @@ Table* find_table(const std::vector<Table*>& vec, const std::string& name)
 
 std::string& ltrim(std::string& s)
 {
-    s.erase(s.begin(), std::find_if(s.begin(), s.end(), std::not_fn(std::ptr_fun<int, int>(std::isspace))));
+    s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char ch) { return !std::isspace(ch); }));
     return s;
 }
 
 std::string& rtrim(std::string& s)
 {
-    s.erase(std::find_if(s.rbegin(), s.rend(), std::not_fn(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
+    s.erase(std::find_if(s.rbegin(), s.rend(), [](unsigned char ch) { return !std::isspace(ch); }).base(), s.end());
     return s;
 }