diff --git a/upstream_utils/protobuf_patches/0005-Suppress-enum-enum-conversion-warning.patch b/upstream_utils/protobuf_patches/0005-Suppress-enum-enum-conversion-warning.patch index 84712afc3b8..d848134268d 100644 --- a/upstream_utils/protobuf_patches/0005-Suppress-enum-enum-conversion-warning.patch +++ b/upstream_utils/protobuf_patches/0005-Suppress-enum-enum-conversion-warning.patch @@ -8,7 +8,7 @@ Subject: [PATCH 05/13] Suppress enum-enum conversion warning 1 file changed, 9 insertions(+) diff --git a/src/google/protobuf/generated_message_tctable_impl.h b/src/google/protobuf/generated_message_tctable_impl.h -index 21fa5332d39b24e0bdb6432f27183df743d512c6..ce3d9110e28706ca18dcf0f2c94feba75f447dc7 100644 +index 21fa5332d39b24e0bdb6432f27183df743d512c6..5aceeb39ae24866e7258d62cf5b025df0ba20fc5 100644 --- a/src/google/protobuf/generated_message_tctable_impl.h +++ b/src/google/protobuf/generated_message_tctable_impl.h @@ -180,6 +180,12 @@ static_assert(kFmtShift + kFmtBits == 12, "number of bits changed"); @@ -17,7 +17,7 @@ index 21fa5332d39b24e0bdb6432f27183df743d512c6..ce3d9110e28706ca18dcf0f2c94feba7 +#ifdef __GNUC__ +#pragma GCC diagnostic push -+#if __GNUC__ >= 12 || (__GNUC__ == 11 && __GNUC_MINOR >= 1) ++#if __GNUC__ >= 12 || (__GNUC__ == 11 && __GNUC_MINOR__ >= 1) +#pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion" +#endif +#endif diff --git a/upstream_utils/protobuf_patches/0006-Fix-noreturn-function-returning.patch b/upstream_utils/protobuf_patches/0006-Fix-noreturn-function-returning.patch index 70841fe6532..94dea8680d7 100644 --- a/upstream_utils/protobuf_patches/0006-Fix-noreturn-function-returning.patch +++ b/upstream_utils/protobuf_patches/0006-Fix-noreturn-function-returning.patch @@ -8,7 +8,7 @@ Subject: [PATCH 06/13] Fix noreturn function returning 1 file changed, 3 insertions(+) diff --git a/src/google/protobuf/generated_message_tctable_impl.h b/src/google/protobuf/generated_message_tctable_impl.h -index ce3d9110e28706ca18dcf0f2c94feba75f447dc7..a8f8bdc192081763b0ad8c685384ae68d901736c 100644 +index 5aceeb39ae24866e7258d62cf5b025df0ba20fc5..c80ac0cd299c126398329c780534156bb1536e15 100644 --- a/src/google/protobuf/generated_message_tctable_impl.h +++ b/src/google/protobuf/generated_message_tctable_impl.h @@ -262,6 +262,9 @@ template diff --git a/wpiutil/src/main/native/thirdparty/protobuf/include/google/protobuf/generated_message_tctable_impl.h b/wpiutil/src/main/native/thirdparty/protobuf/include/google/protobuf/generated_message_tctable_impl.h index a8f8bdc1920..c80ac0cd299 100644 --- a/wpiutil/src/main/native/thirdparty/protobuf/include/google/protobuf/generated_message_tctable_impl.h +++ b/wpiutil/src/main/native/thirdparty/protobuf/include/google/protobuf/generated_message_tctable_impl.h @@ -182,7 +182,7 @@ static_assert(kFmtShift + kFmtBits <= 16, "too many bits"); #ifdef __GNUC__ #pragma GCC diagnostic push -#if __GNUC__ >= 12 || (__GNUC__ == 11 && __GNUC_MINOR >= 1) +#if __GNUC__ >= 12 || (__GNUC__ == 11 && __GNUC_MINOR__ >= 1) #pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion" #endif #endif