coffee/continuable
1
0
Fork 0
mirror of https://github.com/Naios/continuable.git synced 2025-12-06 08:46:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adapt the required boost versions for the async initiate

Browse Source 
* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitmodules vendored
View File

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

8
include/continuable/detail/external/asio.hpp vendored
View File

@ -45,9 +45,9 @@
#include <asio/system_error.hpp> #include <asio/system_error.hpp>
#endif #endif
#if (ASIO_VERSION / 100 % 1000) <= 12 #if (ASIO_VERSION < 101300) // 1.13.0
#define CTI_DETAIL_ASIO_HAS_NO_INTEGRATION #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 #define CTI_DETAIL_ASIO_HAS_EXPLICIT_RET_TYPE_INTEGRATION
#endif #endif
@ -63,9 +63,9 @@
#include <boost/system/system_error.hpp> #include <boost/system/system_error.hpp>
#endif #endif
#if (BOOST_VERSION / 100 % 1000) <= 69 #if (BOOST_VERSION < 107000) // 1.70
#define CTI_DETAIL_ASIO_HAS_NO_INTEGRATION #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 #define CTI_DETAIL_ASIO_HAS_EXPLICIT_RET_TYPE_INTEGRATION
#endif #endif