games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-02 00:10:22 +02:00
Code Issues Releases Activity

Move Boost Asio compatibility code to Global.h. Fix by @dydzio06143

Browse Source
This commit is contained in:
Arseniy Shestakov 2018-04-05 19:35:08 +07:00
parent 74e5c5bf05
commit f5d8e5b0cc
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Global.h
View File

@ -172,6 +172,9 @@ static_assert(sizeof(bool) == 1, "Bool needs to be 1 byte in size.");
#if defined(_MSC_VER) && (_MSC_VER == 1900 || _MSC_VER == 1910 || _MSC_VER == 1911) #if defined(_MSC_VER) && (_MSC_VER == 1900 || _MSC_VER == 1910 || _MSC_VER == 1911)
#define BOOST_NO_CXX11_VARIADIC_TEMPLATES //Variadic templates are buggy in VS2015 and VS2017, so turn this off to avoid compile errors #define BOOST_NO_CXX11_VARIADIC_TEMPLATES //Variadic templates are buggy in VS2015 and VS2017, so turn this off to avoid compile errors
#endif #endif
#if BOOST_VERSION >= 106600
#define BOOST_ASIO_ENABLE_OLD_SERVICES
#endif
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/any.hpp> #include <boost/any.hpp>

3
lib/serializer/Connection.cpp
View File

@ -14,9 +14,6 @@
#include "../mapping/CMap.h" #include "../mapping/CMap.h"
#include "../CGameState.h" #include "../CGameState.h"
#if BOOST_VERSION >= 106600
#define BOOST_ASIO_ENABLE_OLD_SERVICES
#endif
#include <boost/asio.hpp> #include <boost/asio.hpp>
using namespace boost; using namespace boost;

3
server/CVCMIServer.cpp
View File

@ -9,9 +9,6 @@
*/ */
#include "StdInc.h" #include "StdInc.h"
#if BOOST_VERSION >= 106600
#define BOOST_ASIO_ENABLE_OLD_SERVICES
#endif
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include "../lib/filesystem/Filesystem.h" #include "../lib/filesystem/Filesystem.h"