Core: ported headers cleanup from master branch

2 files changed, 11 insertions, 11 deletions

diff --git a/src/server/worldserver/RemoteAccess/RASession.cpp b/src/server/worldserver/RemoteAccess/RASession.cpp
index 3df9556c73d..136814743a0 100644
--- a/src/server/worldserver/RemoteAccess/RASession.cpp
+++ b/src/server/worldserver/RemoteAccess/RASession.cpp
@@ -16,17 +16,17 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <memory>
-#include <boost/asio/write.hpp>
-#include <boost/asio/read_until.hpp>
-#include <boost/array.hpp>
 #include "RASession.h"
 #include "AccountMgr.h"
-#include "Log.h"
+#include "Config.h"
 #include "DatabaseEnv.h"
+#include "Log.h"
+#include "Util.h"
 #include "World.h"
-#include "Config.h"
 #include "ServerMotd.h"
+#include <boost/asio/buffer.hpp>
+#include <boost/asio/read_until.hpp>
+#include <memory>
 
 using boost::asio::ip::tcp;
 
@@ -40,7 +40,7 @@ void RASession::Start()
     if (_socket.available() > 0)
     {
         // Handle subnegotiation
-        boost::array<char, 1024> buf;
+        char buf[1024] = { };
         _socket.read_some(boost::asio::buffer(buf));
 
         // Send the end-of-negotiation packet
@@ -89,7 +89,7 @@ void RASession::Start()
     _socket.close();
 }
 
-int RASession::Send(const char* data)
+int RASession::Send(char const* data)
 {
     std::ostream os(&_writeBuffer);
     os << data;
@@ -205,7 +205,7 @@ bool RASession::ProcessCommand(std::string& command)
     return false;
 }
 
-void RASession::CommandPrint(void* callbackArg, const char* text)
+void RASession::CommandPrint(void* callbackArg, char const* text)
 {
     if (!text || !*text)
         return;
diff --git a/src/server/worldserver/RemoteAccess/RASession.h b/src/server/worldserver/RemoteAccess/RASession.h
index be40c80c5d4..a2e39888212 100644
--- a/src/server/worldserver/RemoteAccess/RASession.h
+++ b/src/server/worldserver/RemoteAccess/RASession.h
@@ -43,13 +43,13 @@ public:
     unsigned short GetRemotePort() const { return _socket.remote_endpoint().port(); }
 
 private:
-    int Send(const char* data);
+    int Send(char const* data);
     std::string ReadString();
     bool CheckAccessLevel(const std::string& user);
     bool CheckPassword(const std::string& user, const std::string& pass);
     bool ProcessCommand(std::string& command);
 
-    static void CommandPrint(void* callbackArg, const char* text);
+    static void CommandPrint(void* callbackArg, char const* text);
     static void CommandFinished(void* callbackArg, bool);
 
     tcp::socket _socket;