From 6418789489e984ec800578c09a3c385b2b0c3b72 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 29 Jul 2014 01:52:28 +0200 Subject: Core/Socket: Fixed expected template evaluated type for AsyncWrite if PacketType is a pointer (Bla* const& is not what we want) --- src/server/shared/Networking/Socket.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/server/shared/Networking') diff --git a/src/server/shared/Networking/Socket.h b/src/server/shared/Networking/Socket.h index 059de140797..d9d03b8bbd9 100644 --- a/src/server/shared/Networking/Socket.h +++ b/src/server/shared/Networking/Socket.h @@ -34,6 +34,8 @@ using boost::asio::ip::tcp; template class Socket : public std::enable_shared_from_this { + typedef std::conditional::value, PacketType, PacketType const&>::type WritePacketType; + public: Socket(tcp::socket&& socket, std::size_t headerSize) : _socket(std::move(socket)), _headerSize(headerSize) { } @@ -93,7 +95,7 @@ public: } } - void AsyncWrite(PacketType const& data) + void AsyncWrite(WritePacketType data) { boost::asio::async_write(_socket, boost::asio::buffer(data), std::bind(&Socket::WriteHandler, this->shared_from_this(), std::placeholders::_1, std::placeholders::_2)); -- cgit v1.2.3