Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update conan and fix #392 #393

Merged
merged 12 commits into from
Feb 11, 2022
Merged

Update conan and fix #392 #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c9d5de0
Merge pull request #356 from stlab/develop
FelixPetriconi Feb 1, 2021
8bec449
Merge pull request #362 from stlab/develop
FelixPetriconi Feb 9, 2021
ebcf6a6
Fix #363
FelixPetriconi Feb 10, 2021
52e7b15
Merge remote-tracking branch 'stlab/main' into develop
FelixPetriconi Mar 12, 2021
e7c17d7
Merge remote-tracking branch 'stlab/main' into develop
FelixPetriconi Mar 25, 2021
3c6978c
Prepare 1.6.2 release
FelixPetriconi Mar 25, 2021
063ed07
Update status badge and minor wording improvements
FelixPetriconi Mar 25, 2021
9cb783f
issue 392: The coroutine operators should use the defined executor of…
FelixPetriconi Feb 11, 2022
152b873
Update conan version because of expired certificate
FelixPetriconi Feb 11, 2022
51007f0
Update to more recent conan version
FelixPetriconi Feb 11, 2022
0ed1de6
Merge branch 'stlab:main' into develop
FelixPetriconi Feb 11, 2022
67a725c
Update conan for Windows too
FelixPetriconi Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/stlab.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmake/stlab/coroutines/MSVC.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ string( CONCAT activate
# If using MSVC and active, set the coroutines flag
#
target_compile_options( coroutines INTERFACE
$<$<AND:$<CXX_COMPILER_ID:MSVC>,${active}>:/await> )
$<$<AND:$<CXX_COMPILER_ID:MSVC>,${active}>:/await /permissive-> )

#
# If using MSVC and active, set a preprocessor definition to enable
Expand Down
2 changes: 1 addition & 1 deletion cmake/stlab/development/MSVC.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 )
Expand Down
5 changes: 2 additions & 3 deletions stlab/concurrency/future.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2005,8 +2005,7 @@ auto operator co_await(stlab::future<R> 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<decltype(result)>(result);
ch.resume();
})
Expand All @@ -2026,7 +2025,7 @@ inline auto operator co_await(stlab::future<void> 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();
}
};
Expand Down