Forráskód Böngészése

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

Arseniy Shestakov 7 éve
szülő
commit
f5d8e5b0cc
3 módosított fájl, 3 hozzáadás és 6 törlés
  1. 3 0
      Global.h
  2. 0 3
      lib/serializer/Connection.cpp
  3. 0 3
      server/CVCMIServer.cpp

+ 3 - 0
Global.h

@@ -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)
 #define BOOST_NO_CXX11_VARIADIC_TEMPLATES //Variadic templates are buggy in VS2015 and VS2017, so turn this off to avoid compile errors
 #endif
+#if BOOST_VERSION >= 106600
+#define BOOST_ASIO_ENABLE_OLD_SERVICES
+#endif
 
 #include <boost/algorithm/string.hpp>
 #include <boost/any.hpp>

+ 0 - 3
lib/serializer/Connection.cpp

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

+ 0 - 3
server/CVCMIServer.cpp

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