From ad454e7a2a536bdbe63dd8ac3fccb3eb4134d723 Mon Sep 17 00:00:00 2001
From: Mikael Persson <mikael.s.persson@gmail.com>
Date: Tue, 27 Aug 2024 11:47:11 -0400
Subject: [PATCH] Fixed some shadowing between local variables

---
 src/google/protobuf/descriptor.cc          | 4 ++--
 src/google/protobuf/descriptor_database.cc | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/google/protobuf/descriptor.cc b/src/google/protobuf/descriptor.cc
index 31c8e74422..93b54e615e 100644
--- a/src/google/protobuf/descriptor.cc
+++ b/src/google/protobuf/descriptor.cc
@@ -9656,8 +9656,8 @@ void FieldDescriptor::InternalTypeOnceInit() const {
       } else {
         name = lazy_default_value_enum_name;
       }
-      Symbol result = file()->pool()->CrossLinkOnDemandHelper(name, true);
-      default_value_enum_ = result.enum_value_descriptor();
+      Symbol result_enum = file()->pool()->CrossLinkOnDemandHelper(name, true);
+      default_value_enum_ = result_enum.enum_value_descriptor();
     } else {
       default_value_enum_ = nullptr;
     }
diff --git a/src/google/protobuf/descriptor_database.cc b/src/google/protobuf/descriptor_database.cc
index fde6c63d87..10ebeff62d 100644
--- a/src/google/protobuf/descriptor_database.cc
+++ b/src/google/protobuf/descriptor_database.cc
@@ -1034,8 +1034,8 @@ bool MergedDescriptorDatabase::FindAllFileNames(
     std::vector<std::string> source_output;
     if (source->FindAllFileNames(&source_output)) {
       output->reserve(output->size() + source_output.size());
-      for (auto& source : source_output) {
-        output->push_back(std::move(source));
+      for (auto& source_out : source_output) {
+        output->push_back(std::move(source_out));
       }
       implemented = true;
     }