mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 01:19:08 +08:00
a1703aa3e8
Updated to include capnproto f4152f83b which fixes error C7692: "rewritten candidate function was excluded..." which occurs when building with MSVC 2022. The updated code brings in another bug which is only fixed in the v2 branch of capnproto (not in master which is used here). The first patch in this commit disables the problematic code by disabling the coroutine check in async-prelude.h The second patch disables KJ_USE_EPOLL for Android NDK version < 23 where sigtimedwait is not defined.
26 lines
816 B
Diff
26 lines
816 B
Diff
From da5b439b558e354a8fc59d09dff6a9eb657f54fd Mon Sep 17 00:00:00 2001
|
|
From: Stig Hornang <shornang@gmail.com>
|
|
Date: Mon, 28 Aug 2023 22:28:43 +0200
|
|
Subject: [PATCH] Disable C++20 co-routines
|
|
|
|
---
|
|
c++/src/kj/async-prelude.h | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/c++/src/kj/async-prelude.h b/c++/src/kj/async-prelude.h
|
|
index 6289bf3f..c9845cdc 100644
|
|
--- a/c++/src/kj/async-prelude.h
|
|
+++ b/c++/src/kj/async-prelude.h
|
|
@@ -36,7 +36,7 @@
|
|
#if (__cpp_impl_coroutine >= 201902L) && __has_include(<coroutine>)
|
|
// C++20 Coroutines detected.
|
|
#include <coroutine>
|
|
-#define KJ_HAS_COROUTINE 1
|
|
+// #define KJ_HAS_COROUTINE 1
|
|
#define KJ_COROUTINE_STD_NAMESPACE std
|
|
#elif (__cpp_coroutines >= 201703L) && __has_include(<experimental/coroutine>)
|
|
// Coroutines TS detected.
|
|
--
|
|
2.41.0.windows.3
|
|
|