Merge branch 'master' into Playerbot

src/server/shared/Network/AsyncAcceptor.h

@@ -18,7 +18,6 @@
 #ifndef __ASYNCACCEPT_H_
 #define __ASYNCACCEPT_H_
 
-#include "IoContext.h"
 #include "IpAddress.h"
 #include "Log.h"
 #include <atomic>

src/server/shared/Network/NetworkThread.h

@@ -24,10 +24,8 @@
 #include "IoContext.h"
 #include "Log.h"
 #include "Socket.h"
-#include "Timer.h"
 #include <atomic>
 #include <boost/asio/ip/tcp.hpp>
-#include <chrono>
 #include <memory>
 #include <mutex>
 #include <set>

src/server/shared/Realms/RealmList.cpp

@@ -21,6 +21,7 @@
 #include "IoContext.h"
 #include "Log.h"
 #include "Resolver.h"
+#include "QueryResult.h"
 #include "Util.h"
 #include <boost/asio/ip/tcp.hpp>
 

src/server/shared/Realms/RealmList.h

@@ -22,6 +22,7 @@
 #include "Realm.h"
 #include <array>
 #include <map>
+#include <memory>
 #include <vector>
 
 struct RealmBuildInfo