From 0d3f9d77bf91aa149e1a2f5d4d402cc0b0479a72 Mon Sep 17 00:00:00 2001
From: mordred <you@example.com>
Date: Fri, 26 Oct 2018 11:01:41 +0200
Subject: [PATCH] A few bugfixes

---
 src/servers/sapphire_api/SapphireAPI.h     |  2 +-
 src/servers/sapphire_api/server_http.hpp   | 14 +++++++-------
 src/servers/sapphire_lobby/client_http.hpp |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/servers/sapphire_api/SapphireAPI.h b/src/servers/sapphire_api/SapphireAPI.h
index a891dea2..e78dbe1a 100644
--- a/src/servers/sapphire_api/SapphireAPI.h
+++ b/src/servers/sapphire_api/SapphireAPI.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 #include <map>
-
+#include <memory>
 #include "PlayerMinimal.h"
 
 namespace Core {
diff --git a/src/servers/sapphire_api/server_http.hpp b/src/servers/sapphire_api/server_http.hpp
index fcd9cf41..51069c4b 100644
--- a/src/servers/sapphire_api/server_http.hpp
+++ b/src/servers/sapphire_api/server_http.hpp
@@ -94,7 +94,7 @@ namespace SimpleWeb {
 
             std::unordered_multimap<std::string, std::string, case_insensitive_hash, case_insensitive_equals> header;
 
-            REGEX_NS::smatch path_match;
+	    std::smatch path_match;
             
             std::string remote_endpoint_address;
             unsigned short remote_endpoint_port;
@@ -134,11 +134,11 @@ namespace SimpleWeb {
         Config config;
         
     private:
-        class regex_orderable : public REGEX_NS::regex {
+        class regex_orderable : public std::regex {
             std::string str;
         public:
-            regex_orderable(const char *regex_cstr) : REGEX_NS::regex(regex_cstr), str(regex_cstr) {}
-            regex_orderable(const std::string &regex_str) : REGEX_NS::regex(regex_str), str(regex_str) {}
+            regex_orderable(const char *regex_cstr) : std::regex(regex_cstr), str(regex_cstr) {}
+            regex_orderable(const std::string &regex_str) : std::regex(regex_str), str(regex_str) {}
             bool operator<(const regex_orderable &rhs) const {
                 return str<rhs.str;
             }
@@ -350,8 +350,8 @@ namespace SimpleWeb {
             for(auto &regex_method: resource) {
                 auto it=regex_method.second.find(request->method);
                 if(it!=regex_method.second.end()) {
-                    REGEX_NS::smatch sm_res;
-                    if(REGEX_NS::regex_match(request->path, sm_res, regex_method.first)) {
+                    std::smatch sm_res;
+                    if(std::regex_match(request->path, sm_res, regex_method.first)) {
                         request->path_match=std::move(sm_res);
                         write_response(socket, request, it->second);
                         return;
@@ -388,7 +388,7 @@ namespace SimpleWeb {
                         
                         auto range=request->header.equal_range("Connection");
                         for(auto it=range.first;it!=range.second;it++) {
-                            if( Core::Util::toLoweCopy( it->second ) == "close" )
+                            if( Core::Util::toLowerCopy( it->second ) == "close" )
                                 return;
                         }
                         if(http_version>1.05)
diff --git a/src/servers/sapphire_lobby/client_http.hpp b/src/servers/sapphire_lobby/client_http.hpp
index 16cdd4c1..4b550d13 100644
--- a/src/servers/sapphire_lobby/client_http.hpp
+++ b/src/servers/sapphire_lobby/client_http.hpp
@@ -9,7 +9,7 @@
 #include <random>
 #include <mutex>
 #include <type_traits>
-#include <hash>
+#include <functional>
 
 class case_insensitive_equals {
 public: