aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2014-07-13 16:40:31 -0500
committerSubv <subv2112@gmail.com>2014-07-13 16:40:31 -0500
commitf6962f9c682fa01e6986dd24c51248ac03e13377 (patch)
treeb14e185b754585a1529178979fce45131f78fd1a /src
parenta4f7211aedc767878fa2234c592ebf83c2e3fa10 (diff)
Fixed some compiler warnings
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Maps/MapUpdater.cpp2
-rw-r--r--src/server/game/Server/WorldSocket.cpp2
-rw-r--r--src/server/shared/Networking/AsyncAcceptor.h4
-rw-r--r--src/server/worldserver/RemoteAccess/RASession.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Maps/MapUpdater.cpp b/src/server/game/Maps/MapUpdater.cpp
index 0a007b3484e..c456f57bd20 100644
--- a/src/server/game/Maps/MapUpdater.cpp
+++ b/src/server/game/Maps/MapUpdater.cpp
@@ -45,7 +45,7 @@ class MapUpdateRequest
}
};
-MapUpdater::MapUpdater() : pending_requests(0), _cancelationToken(false) {}
+MapUpdater::MapUpdater() : _cancelationToken(false), pending_requests(0) {}
MapUpdater::~MapUpdater()
{
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index a77c253ce1a..bbb86cf3d2f 100644
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -30,7 +30,7 @@ using boost::asio::ip::tcp;
using boost::asio::streambuf;
WorldSocket::WorldSocket(tcp::socket&& socket)
- : _socket(std::move(socket)), _authSeed(static_cast<uint32>(rand32())), _worldSession(nullptr), _OverSpeedPings(0)
+ : _socket(std::move(socket)), _authSeed(static_cast<uint32>(rand32())), _OverSpeedPings(0), _worldSession(nullptr)
{
}
diff --git a/src/server/shared/Networking/AsyncAcceptor.h b/src/server/shared/Networking/AsyncAcceptor.h
index 81e1c1e1da8..169d1cfdb07 100644
--- a/src/server/shared/Networking/AsyncAcceptor.h
+++ b/src/server/shared/Networking/AsyncAcceptor.h
@@ -27,8 +27,8 @@ class AsyncAcceptor
{
public:
AsyncAcceptor(boost::asio::io_service& ioService, std::string bindIp, int port) :
- _socket(ioService),
- _acceptor(ioService, tcp::endpoint(boost::asio::ip::address::from_string(bindIp), port))
+ _acceptor(ioService, tcp::endpoint(boost::asio::ip::address::from_string(bindIp), port)),
+ _socket(ioService)
{
AsyncAccept();
};
diff --git a/src/server/worldserver/RemoteAccess/RASession.cpp b/src/server/worldserver/RemoteAccess/RASession.cpp
index d065ae822a9..02d6cec6ebf 100644
--- a/src/server/worldserver/RemoteAccess/RASession.cpp
+++ b/src/server/worldserver/RemoteAccess/RASession.cpp
@@ -40,7 +40,7 @@ void RASession::Start()
{
// Handle subnegotiation
boost::array<char, 1024> buf;
- std::size_t length = _socket.read_some(boost::asio::buffer(buf));
+ _socket.read_some(boost::asio::buffer(buf));
// Send the end-of-negotiation packet
uint8 const reply[2] = { 0xFF, 0xF0 };