chatcleaner.pro | 64 ---------------------- pokerth.pro | 2 +- pokerth.proto | 2 +- src/gui/qt/gametable/gametableimpl.cpp | 2 +- src/gui/qt/sound/sdlplayer.cpp | 1 + src/net/common/clientthread.cpp | 4 ++ src/net/common/netpacket.cpp | 2 +- src/net/serveraccepthelper.h | 4 ++ .../qtsingleapplication/qtlocalpeer.cpp | 1 + 9 files changed, 14 insertions(+), 68 deletions(-) diff --git a/chatcleaner.pro b/chatcleaner.pro deleted file mode 100644 index 6d63b4a..0000000 --- a/chatcleaner.pro +++ /dev/null @@ -1,64 +0,0 @@ -# ------------------------------------------------- -# Project created by QtCreator 2009-07-17T21:51:00 -# ------------------------------------------------- -CODECFORSRC = UTF-8 -QT += network -QT -= gui -TARGET = chatcleaner -CONFIG += console -CONFIG -= app_bundle -DEFINES += TIXML_USE_STL -MOC_DIR = mocs -OBJECTS_DIR = obj -TEMPLATE = app -INCLUDEPATH += src/ \ - src/chatcleaner/ \ - src/net/ -DEPENDPATH += src/ \ - src/chatcleaner/ \ - src/net/ -SOURCES += src/chatcleaner/chatcleaner.cpp \ - src/chatcleaner/cleanerserver.cpp \ - src/chatcleaner/messagefilter.cpp \ - src/chatcleaner/badwordcheck.cpp \ - src/chatcleaner/textfloodcheck.cpp \ - src/chatcleaner/cleanerconfig.cpp \ - src/chatcleaner/capsfloodcheck.cpp \ - src/chatcleaner/letterrepeatingcheck.cpp \ - src/chatcleaner/urlcheck.cpp -HEADERS += src/chatcleaner/cleanerserver.h \ - src/chatcleaner/messagefilter.h \ - src/chatcleaner/badwordcheck.h \ - src/chatcleaner/textfloodcheck.h \ - src/chatcleaner/cleanerconfig.h \ - src/chatcleaner/capsfloodcheck.h \ - src/chatcleaner/letterrepeatingcheck.h \ - src/chatcleaner/urlcheck.h -LIBPATH += lib -LIBS += -lpokerth_lib \ - -lpokerth_protocol \ - -lprotobuf \ - -ltinyxml - -win32 { - LIBPATH += ../boost/stage/lib - INCLUDEPATH += ../boost/ - debug:LIBPATH += debug/lib - release:LIBPATH += release/lib -} -!win32{ - ##### My release static build options - #QMAKE_CXXFLAGS += -ffunction-sections -fdata-sections - INCLUDEPATH += $${PREFIX}/include -} -mac { - # make it x86_64 only - CONFIG += x86_64 - CONFIG -= x86 - CONFIG -= ppc - QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 - QMAKE_CXXFLAGS -= -std=gnu++0x - LIBPATH += /Developer/SDKs/MacOSX10.5.sdk/usr/lib - INCLUDEPATH += /Developer/SDKs/MacOSX10.6.sdk/usr/include/ - INCLUDEPATH += /usr/local/include -} diff --git a/pokerth.pro b/pokerth.pro index 18ab00e..7eb40e8 100644 --- a/pokerth.pro +++ b/pokerth.pro @@ -9,7 +9,7 @@ client: { SUBDIRS += pokerth_game.pro } !mac:!gui_800x480:!client:!qml-client { - SUBDIRS += pokerth_server.pro chatcleaner.pro + SUBDIRS += pokerth_server.pro } CONFIG += ordered diff --git a/pokerth.proto b/pokerth.proto index bc88087..36d686b 100644 --- a/pokerth.proto +++ b/pokerth.proto @@ -701,7 +701,7 @@ message ReportGameAckMessage { message ErrorMessage { enum ErrorReason { - reserved = 0; + _reserved = 0; initVersionNotSupported = 1; initServerFull = 2; initAuthFailure = 3; diff --git a/src/gui/qt/gametable/gametableimpl.cpp b/src/gui/qt/gametable/gametableimpl.cpp index 1394186..e0743b8 100755 --- a/src/gui/qt/gametable/gametableimpl.cpp +++ b/src/gui/qt/gametable/gametableimpl.cpp @@ -3859,7 +3859,7 @@ void gameTableImpl::triggerVoteOnKick(int id) int playerCount = static_cast(seatList->size()); if (id < playerCount) { PlayerListIterator pos = seatList->begin(); - advance(pos, id); + std::advance(pos, id); myStartWindow->getSession()->startVoteKickPlayer((*pos)->getMyUniqueID()); } } diff --git a/src/gui/qt/sound/sdlplayer.cpp b/src/gui/qt/sound/sdlplayer.cpp index 5d0d8e9..f41fdd5 100644 --- a/src/gui/qt/sound/sdlplayer.cpp +++ b/src/gui/qt/sound/sdlplayer.cpp @@ -29,6 +29,7 @@ * as that of the covered work. * *****************************************************************************/ #include "sdlplayer.h" +#include #if (defined __APPLE__) #include diff --git a/src/net/common/clientthread.cpp b/src/net/common/clientthread.cpp index c23747c..3e2d97b 100644 --- a/src/net/common/clientthread.cpp +++ b/src/net/common/clientthread.cpp @@ -993,8 +993,12 @@ ClientThread::CreateContextSession() newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v6())); else newSock.reset(new boost::asio::ip::tcp::socket(*m_ioService, tcp::v4())); +#if BOOST_VERSION < 106600 boost::asio::socket_base::non_blocking_io command(true); newSock->io_control(command); +#else + newSock->non_blocking(true); +#endif newSock->set_option(tcp::no_delay(true)); newSock->set_option(boost::asio::socket_base::keep_alive(true)); diff --git a/src/net/common/netpacket.cpp b/src/net/common/netpacket.cpp index c07cc7a..c4b66fe 100644 --- a/src/net/common/netpacket.cpp +++ b/src/net/common/netpacket.cpp @@ -249,7 +249,7 @@ NetPacket::GameErrorToNetError(int gameErrorReason) retVal = ErrorMessage::sessionTimeout; break; default : - retVal = ErrorMessage::reserved; + retVal = ErrorMessage::_reserved; break; } return retVal; diff --git a/src/net/serveraccepthelper.h b/src/net/serveraccepthelper.h index 19db005..330b6c8 100644 --- a/src/net/serveraccepthelper.h +++ b/src/net/serveraccepthelper.h @@ -122,8 +122,12 @@ protected: const boost::system::error_code &error) { if (!error) { +#if BOOST_VERSION < 106600 boost::asio::socket_base::non_blocking_io command(true); acceptedSocket->io_control(command); +#else + acceptedSocket->non_blocking(true); +#endif acceptedSocket->set_option(typename P::no_delay(true)); acceptedSocket->set_option(boost::asio::socket_base::keep_alive(true)); boost::shared_ptr sessionData(new SessionData(acceptedSocket, m_lobbyThread->GetNextSessionId(), m_lobbyThread->GetSessionDataCallback(), *m_ioService)); diff --git a/src/third_party/qtsingleapplication/qtlocalpeer.cpp b/src/third_party/qtsingleapplication/qtlocalpeer.cpp index 7b733ae..be520cc 100644 --- a/src/third_party/qtsingleapplication/qtlocalpeer.cpp +++ b/src/third_party/qtsingleapplication/qtlocalpeer.cpp @@ -31,6 +31,7 @@ #include #include +#include #if defined(Q_OS_WIN) #include