Adapt the required boost versions for the async initiate

* Also respect asio and boost major versions
This commit is contained in:
Denis Blank 2020-04-04 22:47:09 +02:00
parent 1e39bd85dd
commit adc75655f4
2 changed files with 16 additions and 15 deletions

23
.gitmodules vendored
View File

@ -1,15 +1,16 @@
[submodule "dep/googletest/googletest"]
path = dep/googletest/googletest
url = https://github.com/google/googletest.git
path = dep/googletest/googletest
url = https://github.com/google/googletest.git
branch = master
[submodule "dep/function2/function2"]
path = dep/function2/function2
url = https://github.com/Naios/function2.git
[submodule "dep/cxx_function/cxx_function"]
path = dep/cxx_function/cxx_function
url = https://github.com/potswa/cxx_function.git
path = dep/function2/function2
url = https://github.com/Naios/function2.git
branch = master
[submodule "dep/asio/asio"]
path = dep/asio/asio
url = https://github.com/chriskohlhoff/asio.git
path = dep/asio/asio
url = https://github.com/chriskohlhoff/asio.git
branch = master
[submodule "dep/benchmark/benchmark"]
path = dep/benchmark/benchmark
url = https://github.com/google/benchmark.git
path = dep/benchmark/benchmark
url = https://github.com/google/benchmark.git
branch = master

View File

@ -45,9 +45,9 @@
#include <asio/system_error.hpp>
#endif
#if (ASIO_VERSION / 100 % 1000) <= 12
#if (ASIO_VERSION < 101300) // 1.13.0
#define CTI_DETAIL_ASIO_HAS_NO_INTEGRATION
#elif (ASIO_VERSION / 100 % 1000) <= 14
#elif (ASIO_VERSION < 101600) // 1.16.0 (boost 1.72 baseline)
#define CTI_DETAIL_ASIO_HAS_EXPLICIT_RET_TYPE_INTEGRATION
#endif
@ -63,9 +63,9 @@
#include <boost/system/system_error.hpp>
#endif
#if (BOOST_VERSION / 100 % 1000) <= 69
#if (BOOST_VERSION < 107000) // 1.70
#define CTI_DETAIL_ASIO_HAS_NO_INTEGRATION
#elif (BOOST_VERSION / 100 % 1000) <= 71
#elif (BOOST_VERSION < 107200) // 1.72
#define CTI_DETAIL_ASIO_HAS_EXPLICIT_RET_TYPE_INTEGRATION
#endif