From 6adae966803385528b0c48139b81a201cce79e98 Mon Sep 17 00:00:00 2001
From: Elmsroth <elmsroth@eskwad.net>
Date: Fri, 5 Mar 2021 21:15:44 +0100
Subject: [PATCH] Linux build fix attempt 1 (#141)

---
 src/modules/Bots/playerbot/Helpers.cpp     | 10 ----------
 src/modules/Bots/playerbot/PlayerbotAI.cpp |  2 +-
 src/shared/Utilities/Util.h                | 12 +++++++++++-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/modules/Bots/playerbot/Helpers.cpp b/src/modules/Bots/playerbot/Helpers.cpp
index 46e1ed9c..e75fbc52 100644
--- a/src/modules/Bots/playerbot/Helpers.cpp
+++ b/src/modules/Bots/playerbot/Helpers.cpp
@@ -2,7 +2,6 @@
 #include "playerbot.h"
 #include "Util.h"
 #include <algorithm>
-#include <functional>
 #include <cctype>
 #include <locale>
 
@@ -78,12 +77,3 @@ uint64 extractGuid(WorldPacket& packet)
     return guid;
 }
 
-
-std::string &rtrim(std::string &s) {
-        s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
-        return s;
-}
-
-std::string &trim(std::string &s) {
-        return ltrim(rtrim(s));
-}
diff --git a/src/modules/Bots/playerbot/PlayerbotAI.cpp b/src/modules/Bots/playerbot/PlayerbotAI.cpp
index cd934dc3..47e23f23 100644
--- a/src/modules/Bots/playerbot/PlayerbotAI.cpp
+++ b/src/modules/Bots/playerbot/PlayerbotAI.cpp
@@ -15,6 +15,7 @@
 #include "PlayerbotAI.h"
 #include "PlayerbotFactory.h"
 #include "PlayerbotSecurity.h"
+#include "Util.h"
 
 using namespace ai;
 using namespace std;
@@ -23,7 +24,6 @@ vector<string>& split(const string &s, char delim, vector<string> &elems);
 vector<string> split(const string &s, char delim);
 char * strstri (string str1, string str2);
 uint64 extractGuid(WorldPacket& packet);
-std::string &trim(std::string &s);
 
 uint32 PlayerbotChatHandler::extractQuestId(string str)
 {
diff --git a/src/shared/Utilities/Util.h b/src/shared/Utilities/Util.h
index 61b6be5c..2e169b66 100644
--- a/src/shared/Utilities/Util.h
+++ b/src/shared/Utilities/Util.h
@@ -32,6 +32,7 @@
 #include <vector>
 #include <algorithm>
 #include <cctype>
+#include <functional>
 
 /**
  * @brief
@@ -115,13 +116,22 @@ inline uint32 secsToTimeBitFields(time_t secs)
 }
 
 
-inline std::string   ltrim(std::string& s) {
+inline std::string& ltrim(std::string& s) {
     s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char ch) {
         return !std::isspace(ch);
         }));
     return s;
 }
 
+inline std::string& rtrim(std::string& s) {
+    s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
+    return s;
+}
+
+inline std::string& trim(std::string& s) {
+    return ltrim(rtrim(s));
+}
+
 /**
  * @brief Return a random number in the range min..max; (max-min) must be smaller than 32768.
  *