diff --git a/.gitmodules b/.gitmodules index c83b0b5..51de450 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/include/continuable/detail/external/asio.hpp b/include/continuable/detail/external/asio.hpp index 5f4d9d8..162cb6f 100644 --- a/include/continuable/detail/external/asio.hpp +++ b/include/continuable/detail/external/asio.hpp @@ -45,9 +45,9 @@ #include #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 #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