summaryrefslogtreecommitdiffstats
path: root/chromium/build/patches/chromium_protobuf_32bit.patch
blob: cb319d2e99f02f9746beeea68a830108ee1adb0d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
Reference:	https://github.com/protocolbuffers/protobuf/issues/9792
		http://pb2.nyi.freebsd.org/data/123i386-default-foo/2022-04-16_08h34m58s/logs/errors/protobuf-3.20.0,1.log

--- third_party/protobuf/src/google/protobuf/arenastring.cc.orig	2022-03-25 21:52:12 UTC
+++ third_party/protobuf/src/google/protobuf/arenastring.cc
@@ -64,7 +64,7 @@ constexpr size_t kNewAlign = alignof(std::max_align_t)
 #endif
 constexpr size_t kStringAlign = alignof(std::string);
 
-static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 8, "");
+//static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 8, "");
 static_assert(alignof(ExplicitlyConstructedArenaString) >= 8, "");
 
 }  // namespace