From 69d887b421bcb4bfaba0d39b62f87cdce4fbcabe Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Wed, 1 Jan 2020 20:47:58 -0600
Subject: [PATCH] Use something a little more compatibility friendly

---
 common/string_util.h | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/common/string_util.h b/common/string_util.h
index 78fbe66f2..037d6a2d8 100644
--- a/common/string_util.h
+++ b/common/string_util.h
@@ -45,32 +45,35 @@ const std::string vStringFormat(const char* format, va_list args);
 std::string implode(std::string glue, std::vector<std::string> src);
 
 /**
- * @param s
+ * @param str
+ * @param chars
  * @return
  */
-static inline std::string &ltrim(std::string &s)
+inline std::string &ltrim(std::string &str, const std::string &chars = "\t\n\v\f\r ")
 {
-	s.erase(s.begin(), std::find_if(s.begin(), s.end(), std::not1(std::ptr_fun<int, int>(std::isspace))));
-	return s;
+	str.erase(0, str.find_first_not_of(chars));
+	return str;
 }
 
 /**
- * @param s
+ * @param str
+ * @param chars
  * @return
  */
-static inline std::string &rtrim(std::string &s)
+inline std::string &rtrim(std::string &str, const std::string &chars = "\t\n\v\f\r ")
 {
-	s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
-	return s;
+	str.erase(str.find_last_not_of(chars) + 1);
+	return str;
 }
 
 /**
- * @param s
+ * @param str
+ * @param chars
  * @return
  */
-static inline std::string &trim(std::string &s)
+inline std::string &trim(std::string &str, const std::string &chars = "\t\n\v\f\r ")
 {
-	return ltrim(rtrim(s));
+	return ltrim(rtrim(str, chars), chars);
 }
 
 template <typename T>