diff --git a/.github/install.sh b/.github/install.sh index f17134267..260f15e4c 100644 --- a/.github/install.sh +++ b/.github/install.sh @@ -21,8 +21,8 @@ if [[ "$(uname -s)" == 'Darwin' ]]; then fi pip install --upgrade pip -pip install conan_package_tools==0.35.0 -pip install conan==1.32.0 +pip install conan_package_tools==0.37.0 +pip install conan==1.43.0 conan --version conan user diff --git a/.github/workflows/stlab.yml b/.github/workflows/stlab.yml index 10c937320..3a99b650a 100644 --- a/.github/workflows/stlab.yml +++ b/.github/workflows/stlab.yml @@ -53,8 +53,8 @@ jobs: python.exe --version cmake --version python.exe -m pip install --upgrade pip - pip.exe install conan_package_tools==0.35.0 - pip.exe install conan==1.32.0 + pip.exe install conan_package_tools==0.37.0 + pip.exe install conan==1.43.0 conan --version conan user shell: cmd diff --git a/cmake/stlab/coroutines/MSVC.cmake b/cmake/stlab/coroutines/MSVC.cmake index 7bc4550ab..4f9d330b4 100644 --- a/cmake/stlab/coroutines/MSVC.cmake +++ b/cmake/stlab/coroutines/MSVC.cmake @@ -38,7 +38,7 @@ string( CONCAT activate # If using MSVC and active, set the coroutines flag # target_compile_options( coroutines INTERFACE - $<$,${active}>:/await> ) + $<$,${active}>:/await /permissive-> ) # # If using MSVC and active, set a preprocessor definition to enable diff --git a/cmake/stlab/development/MSVC.cmake b/cmake/stlab/development/MSVC.cmake index 8699ca96e..a155d8bb2 100644 --- a/cmake/stlab/development/MSVC.cmake +++ b/cmake/stlab/development/MSVC.cmake @@ -1,4 +1,4 @@ -set( stlab_MSVC_base_flags /W3 /WX /D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS) +set( stlab_MSVC_base_flags /W3 /WX /D_SILENCE_ALL_CXX17_DEPRECATION_WARNINGS /bigobj /Zc:__cplusplus) set( stlab_MSVC_debug_flags ) set( stlab_MSVC_coverage_flags ) set( stlab_MSVC_release_flags ) diff --git a/stlab/concurrency/future.hpp b/stlab/concurrency/future.hpp index cfc321045..9f4217e8f 100755 --- a/stlab/concurrency/future.hpp +++ b/stlab/concurrency/future.hpp @@ -2005,8 +2005,7 @@ auto operator co_await(stlab::future f) { void await_suspend(std::experimental::coroutine_handle<> ch) { std::move(_input) - .then(stlab::default_executor, - [this, ch](auto&& result) mutable { + .then([this, ch](auto&& result) mutable { this->_result = std::forward(result); ch.resume(); }) @@ -2026,7 +2025,7 @@ inline auto operator co_await(stlab::future f) { inline void await_suspend(std::experimental::coroutine_handle<> ch) { std::move(_input) - .then(stlab::default_executor, [ch]() mutable { ch.resume(); }) + .then([ch]() mutable { ch.resume(); }) .detach(); } };