From 8ab5012e4d14af55561524b5809bdcf89e6d10c6 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Sat, 23 Sep 2017 23:47:42 +0200
Subject: [PATCH] More formatting and linux stuff

---
 src/servers/Server_Common/Database/PreparedResultSet.cpp | 1 +
 src/servers/Server_Common/Database/ResultSet.cpp         | 6 +++---
 src/servers/Server_Common/Database/mysql_util.cpp        | 1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/servers/Server_Common/Database/PreparedResultSet.cpp b/src/servers/Server_Common/Database/PreparedResultSet.cpp
index fa1a0fce..15e2b07b 100644
--- a/src/servers/Server_Common/Database/PreparedResultSet.cpp
+++ b/src/servers/Server_Common/Database/PreparedResultSet.cpp
@@ -4,6 +4,7 @@
 #include <string>
 #include <cctype>
 #include <clocale>
+#include <string.h>
 
 namespace
 {
diff --git a/src/servers/Server_Common/Database/ResultSet.cpp b/src/servers/Server_Common/Database/ResultSet.cpp
index 645ff55b..18d057cc 100644
--- a/src/servers/Server_Common/Database/ResultSet.cpp
+++ b/src/servers/Server_Common/Database/ResultSet.cpp
@@ -16,13 +16,13 @@ Core::Db::ResultSet::ResultSet( MYSQL_RES *res, Core::Db::Statement *par )
    m_pStmt = par;
    m_rowPosition = 1;
 
-   for (unsigned int i = 0; i < m_numFields; ++i)
+   for( uint32_t i = 0; i < m_numFields; ++i )
    {
 
       std::string fieldName( getFieldMeta(i + 1)->name );
 
       std::transform( fieldName.begin(), fieldName.end(), fieldName.begin(),
-                      [](unsigned char c){ return std::toupper(c); } );
+                      []( unsigned char c ){ return std::toupper(c); } );
 
       m_fieldNameToIndex[fieldName] = i;
    }
@@ -34,7 +34,7 @@ Core::Db::ResultSet::~ResultSet()
    mysql_free_result( m_pRes );
 }
 
-MYSQL_FIELD* Core::Db::ResultSet::getFieldMeta( unsigned int columnIndex ) const
+MYSQL_FIELD* Core::Db::ResultSet::getFieldMeta( uint32_t columnIndex ) const
 {
    return mysql_fetch_field_direct( m_pRes, columnIndex - 1 );
 }
diff --git a/src/servers/Server_Common/Database/mysql_util.cpp b/src/servers/Server_Common/Database/mysql_util.cpp
index 0260b847..f0d1db16 100644
--- a/src/servers/Server_Common/Database/mysql_util.cpp
+++ b/src/servers/Server_Common/Database/mysql_util.cpp
@@ -1,6 +1,7 @@
 #include "mysql_util.h"
 #include "DataType.h"
 #include <mysql.h>
+#include <vector>
 
 long double Util::strtold(const char *nptr, char **endptr)
 {