mirror of
				https://github.com/vcmi/vcmi.git
				synced 2025-10-31 00:07:39 +02:00 
			
		
		
		
	Move Boost Asio compatibility code to Global.h. Fix by @dydzio06143
This commit is contained in:
		
							
								
								
									
										3
									
								
								Global.h
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								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> | ||||
|   | ||||
| @@ -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; | ||||
|   | ||||
| @@ -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" | ||||
|   | ||||
		Reference in New Issue
	
	Block a user