From fc687effce3c877c8e4b02110973bf416a2ccdd5 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Mon, 28 Jul 2014 10:15:31 +0200
Subject: Attempt to fix centos compile

---
 src/server/authserver/Server/AuthSession.cpp      | 2 +-
 src/server/authserver/Server/AuthSession.h        | 3 +--
 src/server/authserver/Server/BattlenetSession.cpp | 2 +-
 src/server/authserver/Server/BattlenetSession.h   | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/server/authserver/Server/AuthSession.cpp b/src/server/authserver/Server/AuthSession.cpp
index efffbda2e91..6607e98fb3b 100644
--- a/src/server/authserver/Server/AuthSession.cpp
+++ b/src/server/authserver/Server/AuthSession.cpp
@@ -181,7 +181,7 @@ void AuthSession::AsyncWrite(ByteBuffer& packet)
     _writeQueue.push(std::move(packet));
 
     if (needsWriteStart)
-        Base::AsyncWrite(_writeQueue.front());
+        AuthSocket::AsyncWrite(_writeQueue.front());
 }
 
 bool AuthSession::HandleLogonChallenge()
diff --git a/src/server/authserver/Server/AuthSession.h b/src/server/authserver/Server/AuthSession.h
index 14129d76fd8..2ba6b3efdd4 100644
--- a/src/server/authserver/Server/AuthSession.h
+++ b/src/server/authserver/Server/AuthSession.h
@@ -32,7 +32,7 @@ struct AuthHandler;
 
 class AuthSession : public Socket<AuthSession, ByteBuffer>
 {
-    typedef Socket<AuthSession, ByteBuffer> Base;
+    typedef Socket<AuthSession, ByteBuffer> AuthSocket;
 
 public:
     static std::unordered_map<uint8, AuthHandler> InitHandlers();
@@ -48,7 +48,6 @@ public:
         AsyncReadHeader();
     }
 
-    using Base::AsyncWrite;
     void AsyncWrite(ByteBuffer& packet);
 
 protected:
diff --git a/src/server/authserver/Server/BattlenetSession.cpp b/src/server/authserver/Server/BattlenetSession.cpp
index 2adc73d7e00..0fd08c267f1 100644
--- a/src/server/authserver/Server/BattlenetSession.cpp
+++ b/src/server/authserver/Server/BattlenetSession.cpp
@@ -613,7 +613,7 @@ void Battlenet::Session::AsyncWrite(ServerPacket* packet)
     _writeQueue.push(packet);
 
     if (needsWriteStart)
-        Base::AsyncWrite(_writeQueue.front());
+        BattlenetSocket::AsyncWrite(_writeQueue.front());
 }
 
 inline void ReplaceResponse(Battlenet::ServerPacket** oldResponse, Battlenet::ServerPacket* newResponse)
diff --git a/src/server/authserver/Server/BattlenetSession.h b/src/server/authserver/Server/BattlenetSession.h
index afd0b5fe0b3..78ae00b4e3e 100644
--- a/src/server/authserver/Server/BattlenetSession.h
+++ b/src/server/authserver/Server/BattlenetSession.h
@@ -53,7 +53,7 @@ namespace Battlenet
 
     class Session : public Socket<Session, ServerPacket*>
     {
-        typedef Socket<Session, ServerPacket*> Base;
+        typedef Socket<Session, ServerPacket*> BattlenetSocket;
 
     public:
         explicit Session(tcp::socket&& socket);
-- 
cgit v1.2.3