Skip to content

Commit 1e9ad83

Browse files
committed
Merge branch 'unify_experimental_includes'
2 parents f8972ab + 1081167 commit 1e9ad83

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

include/cppcoro/detail/sync_wait_task.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ namespace cppcoro
6868
return completion_notifier{};
6969
}
7070

71-
#if CPPCORO_COMPILER_MSVC && CPPCORO_COMPILER_MSVC < 19'00'00000
71+
#if CPPCORO_COMPILER_MSVC && CPPCORO_COMPILER_MSVC < 19'20'00000
7272
// HACK: This is needed to work around a bug in MSVC 2017.7/2017.8.
7373
// See comment in make_sync_wait_task below.
7474
template<typename Awaitable>
@@ -245,7 +245,7 @@ namespace cppcoro
245245

246246
};
247247

248-
#if CPPCORO_COMPILER_MSVC && CPPCORO_COMPILER_MSVC < 19'00'00000
248+
#if CPPCORO_COMPILER_MSVC && CPPCORO_COMPILER_MSVC < 19'20'00000
249249
// HACK: Work around bug in MSVC where passing a parameter by universal reference
250250
// results in an error when passed a move-only type, complaining that the copy-constructor
251251
// has been deleted. The parameter should be passed by reference and the compiler should

include/cppcoro/detail/when_all_task.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ namespace cppcoro
7777
assert(false);
7878
}
7979

80-
#if CPPCORO_COMPILER_MSVC && CPPCORO_COMPILER_MSVC < 19'00'00000
80+
#if CPPCORO_COMPILER_MSVC && CPPCORO_COMPILER_MSVC < 19'20'00000
8181
// HACK: This is needed to work around a bug in MSVC 2017.7/2017.8.
8282
// See comment in make_when_all_task below.
8383
template<typename Awaitable>
@@ -302,7 +302,7 @@ namespace cppcoro
302302
std::enable_if_t<!std::is_void_v<RESULT>, int> = 0>
303303
when_all_task<RESULT> make_when_all_task(AWAITABLE awaitable)
304304
{
305-
#if CPPCORO_COMPILER_MSVC && CPPCORO_COMPILER_MSVC < 19'00'00000
305+
#if CPPCORO_COMPILER_MSVC && CPPCORO_COMPILER_MSVC < 19'20'00000
306306
// HACK: Workaround another bug in MSVC where the expression 'co_yield co_await x' seems
307307
// to completely ignore the co_yield an never calls promise.yield_value().
308308
// The coroutine seems to be resuming the 'co_await' after the 'co_yield'
@@ -330,7 +330,7 @@ namespace cppcoro
330330
std::enable_if_t<!std::is_void_v<RESULT>, int> = 0>
331331
when_all_task<RESULT> make_when_all_task(std::reference_wrapper<AWAITABLE> awaitable)
332332
{
333-
#if CPPCORO_COMPILER_MSVC && CPPCORO_COMPILER_MSVC < 19'00'00000
333+
#if CPPCORO_COMPILER_MSVC && CPPCORO_COMPILER_MSVC < 19'20'00000
334334
// HACK: Workaround another bug in MSVC where the expression 'co_yield co_await x' seems
335335
// to completely ignore the co_yield and never calls promise.yield_value().
336336
// The coroutine seems to be resuming the 'co_await' after the 'co_yield'

0 commit comments

Comments
 (0)