diff options
author | B Stack <bgstack15@gmail.com> | 2020-05-17 17:14:47 +0000 |
---|---|---|
committer | B Stack <bgstack15@gmail.com> | 2020-05-17 17:14:47 +0000 |
commit | cca3f71f16f85f5d506bf4bb7b3ec38fda31516a (patch) | |
tree | 1f52055b2f26fc2389d3ab4eb8d8d1e234a6316a /zen/thread.h | |
parent | Merge branch '10.23' into 'master' (diff) | |
parent | add upstream 10.24 (diff) | |
download | FreeFileSync-cca3f71f16f85f5d506bf4bb7b3ec38fda31516a.tar.gz FreeFileSync-cca3f71f16f85f5d506bf4bb7b3ec38fda31516a.tar.bz2 FreeFileSync-cca3f71f16f85f5d506bf4bb7b3ec38fda31516a.zip |
Merge branch '10.24' into 'master'
add upstream 10.24
See merge request opensource-tracking/FreeFileSync!21
Diffstat (limited to 'zen/thread.h')
-rw-r--r-- | zen/thread.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/zen/thread.h b/zen/thread.h index a1d5197c..99e61e1f 100644 --- a/zen/thread.h +++ b/zen/thread.h @@ -18,9 +18,6 @@ namespace zen { class InterruptionStatus; -#if __cpp_lib_jthread - #error refactor! -#endif class InterruptibleThread { public: @@ -92,7 +89,7 @@ template<typename T> inline bool isReady(const std::future<T>& f) { return f.wait_for(std::chrono::seconds(0)) == std::future_status::ready; } //------------------------------------------------------------------------------------------ -//wait until first job is successful or all failed: substitute until std::when_any is available +//wait until first job is successful or all failed //TODO: use std::when_any when available template <class T> class AsyncFirstResult |