Define co_await operators for C++20 coroutines as well (#764) (#765)

kobykahane · web-flow · commit ed1079ab8fbb · 2020-10-15T11:12:24.000-07:00
diff --git a/strings/base_coroutine_foundation.h b/strings/base_coroutine_foundation.h
@@ -223,7 +223,7 @@ namespace winrt::impl
     }
 }
 
-#ifdef __cpp_coroutines
+#ifdef WINRT_IMPL_COROUTINES
 WINRT_EXPORT namespace winrt::Windows::Foundation
 {
     inline impl::await_adapter<IAsyncAction> operator co_await(IAsyncAction const& async)
diff --git a/strings/base_coroutine_system.h b/strings/base_coroutine_system.h
@@ -41,7 +41,7 @@ WINRT_EXPORT namespace winrt
         return awaitable{ dispatcher, priority };
     };
 
-#ifdef __cpp_coroutines
+#ifdef WINRT_IMPL_COROUTINES
     inline auto operator co_await(Windows::System::DispatcherQueue const& dispatcher)
     {
         return resume_foreground(dispatcher);
diff --git a/strings/base_coroutine_system_winui.h b/strings/base_coroutine_system_winui.h
@@ -41,7 +41,7 @@ WINRT_EXPORT namespace winrt
         return awaitable{ dispatcher, priority };
     };
 
-#ifdef __cpp_coroutines
+#ifdef WINRT_IMPL_COROUTINES
     inline auto operator co_await(Microsoft::System::DispatcherQueue const& dispatcher)
     {
         return resume_foreground(dispatcher);
diff --git a/strings/base_coroutine_threadpool.h b/strings/base_coroutine_threadpool.h
@@ -442,7 +442,7 @@ WINRT_EXPORT namespace winrt
         return awaitable{ duration };
     }
 
-#ifdef __cpp_coroutines
+#ifdef WINRT_IMPL_COROUTINES
     inline auto operator co_await(Windows::Foundation::TimeSpan duration)
     {
         return resume_after(duration);
diff --git a/strings/base_coroutine_ui_core.h b/strings/base_coroutine_ui_core.h
@@ -39,7 +39,7 @@ WINRT_EXPORT namespace winrt
         return awaitable{ dispatcher, priority };
     };
 
-#ifdef __cpp_coroutines
+#ifdef WINRT_IMPL_COROUTINES
     inline auto operator co_await(Windows::UI::Core::CoreDispatcher const& dispatcher)
     {
         return resume_foreground(dispatcher);
diff --git a/strings/base_deferral.h b/strings/base_deferral.h
@@ -1,7 +1,7 @@
 
 WINRT_EXPORT namespace winrt
 {
-#ifdef __cpp_coroutines
+#ifdef WINRT_IMPL_COROUTINES
     template<typename D>
     struct deferrable_event_args
     {
diff --git a/strings/base_macros.h b/strings/base_macros.h
@@ -27,8 +27,8 @@
 // Note: this is a workaround for a false-positive warning produced by the Visual C++ 16.3 compiler.
 #pragma warning(disable : 4268)
 
-#if defined(_RESUMABLE_FUNCTIONS_SUPPORTED) && !defined(__cpp_coroutines)
-#define __cpp_coroutines
+#if defined(__cpp_lib_coroutine) || defined(__cpp_coroutines) || defined(_RESUMABLE_FUNCTIONS_SUPPORTED)
+#define WINRT_IMPL_COROUTINES
 #endif
 
 #ifndef WINRT_EXPORT

Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ namespace winrt::impl`
`223`	`223`	`}`
`224`	`224`	`}`
`225`	`225`
`226`		`-#ifdef __cpp_coroutines`
	`226`	`+#ifdef WINRT_IMPL_COROUTINES`
`227`	`227`	`WINRT_EXPORT namespace winrt::Windows::Foundation`
`228`	`228`	`{`
`229`	`229`	`inline impl::await_adapter<IAsyncAction> operator co_await(IAsyncAction const& async)`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ WINRT_EXPORT namespace winrt`
`41`	`41`	`return awaitable{ dispatcher, priority };`
`42`	`42`	`};`
`43`	`43`
`44`		`-#ifdef __cpp_coroutines`
	`44`	`+#ifdef WINRT_IMPL_COROUTINES`
`45`	`45`	`inline auto operator co_await(Windows::System::DispatcherQueue const& dispatcher)`
`46`	`46`	`{`
`47`	`47`	`return resume_foreground(dispatcher);`
Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,7 @@ WINRT_EXPORT namespace winrt`
`442`	`442`	`return awaitable{ duration };`
`443`	`443`	`}`
`444`	`444`
`445`		`-#ifdef __cpp_coroutines`
	`445`	`+#ifdef WINRT_IMPL_COROUTINES`
`446`	`446`	`inline auto operator co_await(Windows::Foundation::TimeSpan duration)`
`447`	`447`	`{`
`448`	`448`	`return resume_after(duration);`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ WINRT_EXPORT namespace winrt`
`39`	`39`	`return awaitable{ dispatcher, priority };`
`40`	`40`	`};`
`41`	`41`
`42`		`-#ifdef __cpp_coroutines`
	`42`	`+#ifdef WINRT_IMPL_COROUTINES`
`43`	`43`	`inline auto operator co_await(Windows::UI::Core::CoreDispatcher const& dispatcher)`
`44`	`44`	`{`
`45`	`45`	`return resume_foreground(dispatcher);`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`
`2`	`2`	`WINRT_EXPORT namespace winrt`
`3`	`3`	`{`
`4`		`-#ifdef __cpp_coroutines`
	`4`	`+#ifdef WINRT_IMPL_COROUTINES`
`5`	`5`	`template<typename D>`
`6`	`6`	`struct deferrable_event_args`
`7`	`7`	`{`