From 71b2fc5ada3abf1250c69568dddc23bfecd1427f Mon Sep 17 00:00:00 2001 From: 4kangjc Date: Thu, 15 Jun 2023 01:39:05 +0800 Subject: [PATCH] Modify port_def.inc to ignore -Wshadow warning Closes #13037 --- src/google/protobuf/port_def.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index fc62bbf639..71833249b9 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -1035,6 +1035,10 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3), // This error has been generally flaky, but we need to disable it specifically // to fix https://github.com/protocolbuffers/protobuf/issues/12313 #pragma clang diagnostic ignored "-Wunused-parameter" +// -Wshadow means that declaration shadows a variable. +// for (int i = 0; i < file_->public_dependency_count(); ++i) +// for (int i = 0; i < public_dep->message_type_count(); ++i) +#pragma clang diagnostic ignored "-Wshadow" #endif #ifdef __GNUC__ #pragma GCC diagnostic push @@ -1058,6 +1062,10 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3), // This error has been generally flaky, but we need to disable it specifically // to fix https://github.com/protocolbuffers/protobuf/issues/12313 #pragma GCC diagnostic ignored "-Wunused-parameter" +// -Wshadow means that declaration shadows a variable. +// for (int i = 0; i < file_->public_dependency_count(); ++i) +// for (int i = 0; i < public_dep->message_type_count(); ++i) +#pragma GCC diagnostic ignored "-Wshadow" #ifndef __clang__ // This causes spurious warnings in GCC 13. #pragma GCC diagnostic ignored "-Wstringop-overflow"