sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

android compile fix, needs to be approved by lotodore

Browse Source
This commit is contained in:
Felix Hammer
2015-08-19 14:52:11 +02:00
parent 1d34288a91
commit a7cc33e89a
4 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokerth_qml-client.pro
-1
View File
@@ -6,7 +6,6 @@ isEmpty( PREFIX ){
DEFINES += PREFIX=\"$${PREFIX}\" DEFINES += PREFIX=\"$${PREFIX}\"
TEMPLATE = app TEMPLATE = app
TARGET = pokerth
CODECFORSRC = UTF-8 CODECFORSRC = UTF-8
QT += core qml quick widgets svg sql QT += core qml quick widgets svg sql
CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on CONFIG += qt thread embed_manifest_exe exceptions rtti stl warn_on
src/net/common/sessiondata.cpp
+3 -2
View File
@@ -318,8 +318,9 @@ void
SessionData::CloseWebSocketHandle() SessionData::CloseWebSocketHandle()
{ {
if (m_webData) { if (m_webData) {
boost::system::error_code ec; // boost::system::error_code ec;
m_webData->webSocketServer->close(m_webData->webHandle, websocketpp::close::status::normal, "PokerTH server closed the connection.", ec); std::error_code std_ec;
m_webData->webSocketServer->close(m_webData->webHandle, websocketpp::close::status::normal, "PokerTH server closed the connection.", std_ec);
} }
} }
src/net/common/websendbuffer.cpp
+7 -5
View File
@@ -57,9 +57,10 @@ void
WebSendBuffer::AsyncSendNextPacket(boost::shared_ptr<SessionData> session) WebSendBuffer::AsyncSendNextPacket(boost::shared_ptr<SessionData> session)
{ {
if (closeAfterSend) { if (closeAfterSend) {
boost::system::error_code ec; // boost::system::error_code ec;
std::error_code std_ec;
boost::shared_ptr<WebSocketData> webData = session->GetWebData(); boost::shared_ptr<WebSocketData> webData = session->GetWebData();
webData->webSocketServer->close(webData->webHandle, websocketpp::close::status::normal, "PokerTH server closed the connection.", ec); webData->webSocketServer->close(webData->webHandle, websocketpp::close::status::normal, "PokerTH server closed the connection.", std_ec);
} }
} }
@@ -70,10 +71,11 @@ WebSendBuffer::InternalStorePacket(boost::shared_ptr<SessionData> session, boost
google::protobuf::uint8 *buf = new google::protobuf::uint8[packetSize]; google::protobuf::uint8 *buf = new google::protobuf::uint8[packetSize];
packet->GetMsg()->SerializeWithCachedSizesToArray(buf); packet->GetMsg()->SerializeWithCachedSizesToArray(buf);
boost::system::error_code ec; // boost::system::error_code ec;
std::error_code std_ec;
boost::shared_ptr<WebSocketData> webData = session->GetWebData(); boost::shared_ptr<WebSocketData> webData = session->GetWebData();
webData->webSocketServer->send(webData->webHandle, string((const char *)buf, packetSize), websocketpp::frame::opcode::BINARY, ec); webData->webSocketServer->send(webData->webHandle, string((const char *)buf, packetSize), websocketpp::frame::opcode::BINARY, std_ec);
if (ec) { if (std_ec) {
SetCloseAfterSend(); SetCloseAfterSend();
} }
src/net/serveracceptwebhelper.h
+3 -2
View File
@@ -37,7 +37,8 @@
#include <net/serveracceptinterface.h> #include <net/serveracceptinterface.h>
#include <net/serverlobbythread.h> #include <net/serverlobbythread.h>
#include <boost/smart_ptr/owner_less.hpp> //#include <boost/smart_ptr/owner_less.hpp>
#include <memory>
class ServerAcceptWebHelper : public ServerAcceptInterface class ServerAcceptWebHelper : public ServerAcceptInterface
{ {
@@ -52,7 +53,7 @@ public:
protected: protected:
typedef std::map<websocketpp::connection_hdl, boost::weak_ptr<SessionData>, boost::owner_less<websocketpp::connection_hdl> > SessionMap; typedef std::map<websocketpp::connection_hdl, boost::weak_ptr<SessionData>, std::owner_less<websocketpp::connection_hdl> > SessionMap;
bool validate(websocketpp::connection_hdl hdl); bool validate(websocketpp::connection_hdl hdl);
void on_open(websocketpp::connection_hdl hdl); void on_open(websocketpp::connection_hdl hdl);