Fixing several compiler warnings.

src/net/common/asiosendbuffer.cpp

@@ -99,7 +99,7 @@ AsioSendBuffer::AsyncSendNextPacket(boost::shared_ptr<boost::asio::ip::tcp::sock
 }
 
 void
-AsioSendBuffer::InternalStorePacket(boost::shared_ptr<SessionData> session, boost::shared_ptr<NetPacket> packet)
+AsioSendBuffer::InternalStorePacket(boost::shared_ptr<SessionData> /*session*/, boost::shared_ptr<NetPacket> packet)
 {
 	uint32_t packetSize = packet->GetMsg()->ByteSize();
 	google::protobuf::uint8 *buf = new google::protobuf::uint8[packetSize + NET_HEADER_SIZE];

src/net/common/serveracceptwebhelper.cpp

@@ -37,7 +37,7 @@
 using namespace std;
 
 ServerAcceptWebHelper::ServerAcceptWebHelper(ServerCallback &serverCallback, boost::shared_ptr<boost::asio::io_service> ioService)
-	: m_serverCallback(serverCallback), m_ioService(ioService)
+	: m_ioService(ioService), m_serverCallback(serverCallback)
 {
 	m_webSocketServer.reset(new server);
 }
@@ -71,7 +71,7 @@ ServerAcceptWebHelper::Close()
 }
 
 bool
-ServerAcceptWebHelper::validate(websocketpp::connection_hdl hdl)
+ServerAcceptWebHelper::validate(websocketpp::connection_hdl /*hdl*/)
 {
 	return true;
 }

src/net/common/sessiondata.cpp

@@ -50,13 +50,13 @@ SessionData::SessionData(boost::shared_ptr<boost::asio::ip::tcp::socket> sock, S
 	m_sendBuffer.reset(new AsioSendBuffer);
 }
 
-SessionData::SessionData(boost::shared_ptr<WebSocketData> webData, SessionId id, SessionDataCallback &cb, boost::asio::io_service &ioService, int filler)
+SessionData::SessionData(boost::shared_ptr<WebSocketData> webData, SessionId id, SessionDataCallback &cb, boost::asio::io_service &ioService, int /*filler*/)
 	: m_webData(webData), m_id(id), m_state(SessionData::Init), m_readyFlag(false), m_wantsLobbyMsg(true),
 	  m_activityTimeoutSec(0), m_activityWarningRemainingSec(0), m_initTimeoutTimer(ioService), m_globalTimeoutTimer(ioService),
 	  m_activityTimeoutTimer(ioService), m_callback(cb), m_authSession(NULL), m_curAuthStep(0)
 {
 	m_receiveBuffer.reset(new WebReceiveBuffer);
-	m_sendBuffer.reset(new WebSendBuffer(webData));
+	m_sendBuffer.reset(new WebSendBuffer);
 }
 
 SessionData::~SessionData()
@@ -107,6 +107,12 @@ SessionData::GetAsioSocket()
 	return m_socket;
 }
 
+boost::shared_ptr<WebSocketData>
+SessionData::GetWebData()
+{
+	return m_webData;
+}
+
 bool
 SessionData::CreateServerAuthSession(Gsasl *context)
 {

src/net/common/webreceivebuffer.cpp

@@ -41,7 +41,7 @@ WebReceiveBuffer::WebReceiveBuffer()
 }
 
 void
-WebReceiveBuffer::StartAsyncRead(boost::shared_ptr<SessionData> session)
+WebReceiveBuffer::StartAsyncRead(boost::shared_ptr<SessionData> /*session*/)
 {
 	// Nothing to do. This is handled internally by websocketpp.
 }

src/net/common/websendbuffer.cpp

@@ -32,12 +32,13 @@
 #include <net/websendbuffer.h>
 #include <net/websocketdata.h>
 #include <net/netpacket.h>
+#include <net/sessiondata.h>
 
 using namespace std;
 
 
-WebSendBuffer::WebSendBuffer(boost::shared_ptr<WebSocketData> webData)
-	: closeAfterSend(false), m_webData(webData)
+WebSendBuffer::WebSendBuffer()
+	: closeAfterSend(false)
 {
 }
 
@@ -57,7 +58,8 @@ WebSendBuffer::AsyncSendNextPacket(boost::shared_ptr<SessionData> session)
 {
 	if (closeAfterSend) {
 		boost::system::error_code ec;
-		m_webData->webSocketServer->close(m_webData->webHandle, websocketpp::close::status::normal, "PokerTH server closed the connection.", ec);
+		boost::shared_ptr<WebSocketData> webData = session->GetWebData();
+		webData->webSocketServer->close(webData->webHandle, websocketpp::close::status::normal, "PokerTH server closed the connection.", ec);
 	}
 }
 
@@ -69,7 +71,8 @@ WebSendBuffer::InternalStorePacket(boost::shared_ptr<SessionData> session, boost
 	packet->GetMsg()->SerializeWithCachedSizesToArray(buf);
 
 	boost::system::error_code ec;
-	m_webData->webSocketServer->send(m_webData->webHandle, string((const char *)buf, packetSize), websocketpp::frame::opcode::BINARY, ec);
+	boost::shared_ptr<WebSocketData> webData = session->GetWebData();
+	webData->webSocketServer->send(webData->webHandle, string((const char *)buf, packetSize), websocketpp::frame::opcode::BINARY, ec);
 	if (ec) {
 		SetCloseAfterSend();
 	}

src/net/sessiondata.h

@@ -74,6 +74,7 @@ public:
 	void SetState(State state);
 
 	boost::shared_ptr<boost::asio::ip::tcp::socket> GetAsioSocket();
+	boost::shared_ptr<WebSocketData> GetWebData();
 
 	bool CreateServerAuthSession(Gsasl *context);
 	bool CreateClientAuthSession(Gsasl *context, const std::string &userName, const std::string &password);

src/net/websendbuffer.h

@@ -36,12 +36,10 @@
 #include <net/sendbuffer.h>
 #include <cstdlib>
 
-struct WebSocketData;
-
 class WebSendBuffer : public SendBuffer
 {
 public:
-	WebSendBuffer(boost::shared_ptr<WebSocketData> webData);
+	WebSendBuffer();
 
 	virtual void SetCloseAfterSend();
 
@@ -52,7 +50,6 @@ public:
 
 private:
 	bool closeAfterSend;
-	boost::shared_ptr<WebSocketData> m_webData;
 };
 
 #endif