Update grpc
This commit is contained in:
2
.github/workflows/c-cpp.yml
vendored
2
.github/workflows/c-cpp.yml
vendored
@@ -357,8 +357,6 @@ jobs:
|
||||
run: |
|
||||
cd external/src/grpc/third_party/boringssl-with-bazel
|
||||
git apply --verbose --ignore-whitespace ../../../../../patches/msys2/gcc14_boringssl.patch
|
||||
cd ../abseil-cpp
|
||||
git apply --verbose --ignore-whitespace ../../../../../patches/msys2/gcc14_abseil.patch
|
||||
cd /
|
||||
git apply --verbose --ignore-whitespace --directory=mingw64/include/c++/`ls mingw64/include/c++`/ /d/a/p2pool/p2pool/patches/msys2/typeinfo.patch
|
||||
|
||||
|
||||
2
external/src/grpc
vendored
2
external/src/grpc
vendored
Submodule external/src/grpc updated: 62618530b0...783e600967
@@ -1,13 +0,0 @@
|
||||
diff --git a/absl/numeric/internal/bits.h b/absl/numeric/internal/bits.h
|
||||
index bfef06bc..3091d1b4 100644
|
||||
--- a/absl/numeric/internal/bits.h
|
||||
+++ b/absl/numeric/internal/bits.h
|
||||
@@ -303,7 +303,7 @@ CountTrailingZeroesNonzero64(uint64_t x) {
|
||||
|
||||
ABSL_ATTRIBUTE_ALWAYS_INLINE ABSL_INTERNAL_CONSTEXPR_CTZ inline int
|
||||
CountTrailingZeroesNonzero16(uint16_t x) {
|
||||
-#if ABSL_HAVE_BUILTIN(__builtin_ctzs)
|
||||
+#if ABSL_HAVE_BUILTIN(__builtin_ctzs) && defined(__clang__)
|
||||
static_assert(sizeof(unsigned short) == sizeof(x), // NOLINT(runtime/int)
|
||||
"__builtin_ctzs does not take 16-bit arg");
|
||||
return __builtin_ctzs(x);
|
||||
Reference in New Issue
Block a user