diff --git a/internal/platform/implementation/windows/generated/base-no-coroutines.patch b/internal/platform/implementation/windows/generated/base-no-coroutines.patch deleted file mode 100644 index dd98c390..00000000 --- a/internal/platform/implementation/windows/generated/base-no-coroutines.patch +++ /dev/null @@ -1,38 +0,0 @@ -*** third_party/nearby/internal/platform/implementation/windows/generated/winrt/base.h 2022-12-07 15:29:09.000000000 -0500 ---- third_party/nearby/internal/platform/implementation/windows/generated/winrt/base-no-coroutines.h 2022-12-07 15:28:53.000000000 -0500 -*************** -*** 35,40 **** ---- 35,67 ---- - #include - #endif - -+ #if defined(_LIBCPP_VERSION) && __cplusplus < 202002 -+ // If the C++ standard is cxx17, coroutines are not available in libc++. -+ // To compile WinRT without coroutines, define some placeholder types. -+ // These placeholders should not be used. If they are used, they should fail. -+ namespace std::experimental { -+ template -+ struct coroutine_handle { -+ coroutine_handle() { throw std::logic_error("Not implemented."); } -+ coroutine_handle(std::nullptr_t __h) { -+ throw std::logic_error("Not implemented."); -+ } -+ static coroutine_handle from_address(void*) { -+ throw std::logic_error("Not implemented."); -+ } -+ void operator()() const { throw std::logic_error("Not implemented."); } -+ void* address() const { throw std::logic_error("Not implemented."); } -+ }; -+ -+ class suspend_always {}; -+ class suspend_never {}; -+ -+ template -+ struct coroutine_traits; -+ -+ } // namespace std::experimental -+ #endif -+ - #ifdef __cpp_lib_coroutine - - #include diff --git a/internal/platform/implementation/windows/generated/patch_winrt_base.sh b/internal/platform/implementation/windows/generated/patch_winrt_base.sh deleted file mode 100755 index ba8e7f2c..00000000 --- a/internal/platform/implementation/windows/generated/patch_winrt_base.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -patch \ - --forward \ - -r - \ - third_party/nearby/internal/platform/implementation/windows/generated/winrt/base.h \ - third_party/nearby/internal/platform/implementation/windows/generated/base-no-coroutines.patch diff --git a/internal/platform/implementation/windows/generated/winrt/base.h b/internal/platform/implementation/windows/generated/winrt/base.h index ebc74f70..df79959c 100644 --- a/internal/platform/implementation/windows/generated/winrt/base.h +++ b/internal/platform/implementation/windows/generated/winrt/base.h @@ -35,33 +35,6 @@ #include #endif -#if defined(_LIBCPP_VERSION) && __cplusplus < 202002 -// If the C++ standard is cxx17, coroutines are not available in libc++. -// To compile WinRT without coroutines, define some placeholder types. -// These placeholders should not be used. If they are used, they should fail. -namespace std::experimental { -template -struct coroutine_handle { - coroutine_handle() { throw std::logic_error("Not implemented."); } - coroutine_handle(std::nullptr_t __h) { - throw std::logic_error("Not implemented."); - } - static coroutine_handle from_address(void*) { - throw std::logic_error("Not implemented."); - } - void operator()() const { throw std::logic_error("Not implemented."); } - void* address() const { throw std::logic_error("Not implemented."); } -}; - -class suspend_always {}; -class suspend_never {}; - -template -struct coroutine_traits; - -} // namespace std::experimental -#endif - #ifdef __cpp_lib_coroutine #include