diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-07-29 02:02:38 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-07-29 02:02:38 +0200 |
| commit | 903fbb6be74c4664aed1b981f9f75e2678323bb0 (patch) | |
| tree | 6d2ab7bdf8c0e182f0f829e4f2bc6080703588a0 /src/server/game/Server | |
| parent | fc687effce3c877c8e4b02110973bf416a2ccdd5 (diff) | |
| parent | 833195062c310685b479ed16ff4ac5ef5664c021 (diff) | |
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/WorldSocket.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSocket.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index 46a1bf8f16d..9c46eac6896 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -191,7 +191,7 @@ void WorldSocket::AsyncWrite(WorldPacket& packet) bool needsWriteStart = _writeQueue.empty(); _authCrypt.EncryptSend(header.header, header.getHeaderLength()); - _writeQueue.emplace(header, std::move(packet)); + _writeQueue.emplace(header, packet); if (needsWriteStart) AsyncWrite(_writeQueue.front()); diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h index 4e1cbe743fd..2cf6159cb38 100644 --- a/src/server/game/Server/WorldSocket.h +++ b/src/server/game/Server/WorldSocket.h @@ -58,7 +58,7 @@ struct WorldPacketBuffer typedef boost::asio::const_buffer const* const_iterator; - WorldPacketBuffer(ServerPktHeader header, WorldPacket&& packet) : _header(header), _packet(std::move(packet)) + WorldPacketBuffer(ServerPktHeader header, WorldPacket const& packet) : _header(header), _packet(packet) { _buffers[0] = boost::asio::const_buffer(_header.header, _header.getHeaderLength()); if (!_packet.empty()) |