Reflect changes in boost::asio released in Boost 1.66.

The service template parameters are disabled by default for now. Use BOOST_ASIO_ENABLE_OLD_SERVICES macro to enable the old interface.
vcmi · Mar 10, 2018 · 75276d5 · 75276d5
1 parent b2faf30
commit 75276d5
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/lib/serializer/Connection.cpp b/lib/serializer/Connection.cpp
@@ -14,6 +14,9 @@
 #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;

diff --git a/lib/serializer/Connection.h b/lib/serializer/Connection.h
@@ -12,6 +12,8 @@
 #include "BinaryDeserializer.h"
 #include "BinarySerializer.h"
 
+#include <boost/version.hpp>
+
 struct CPack;
 
 namespace boost
@@ -22,7 +24,13 @@ namespace boost
 		{
 			class tcp;
 		}
+
+#if BOOST_VERSION >= 106600  // Boost version >= 1.66
+		class io_context;
+		typedef io_context io_service;
+#else
 		class io_service;
+#endif
 
 		template <typename Protocol> class stream_socket_service;
 		template <typename Protocol,typename StreamSocketService>

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

diff --git a/server/CVCMIServer.h b/server/CVCMIServer.h
@@ -10,6 +10,7 @@
 #pragma once
 
 #include <boost/program_options.hpp>
+#include <boost/version.hpp>
 
 class CMapInfo;
 
@@ -26,7 +27,13 @@ namespace boost
 		{
 			class tcp;
 		}
-		class io_service;
+
+#if BOOST_VERSION >= 106600  // Boost version >= 1.66
+		class io_context;
+		typedef io_context io_service;
+#else
+		class io_service;
+#endif
 
 		template <typename Protocol> class stream_socket_service;
 		template <typename Protocol,typename StreamSocketService>