Fixed some shadowing between local variables

pull/17971/head
Mikael Persson 7 months ago
parent eafacfad50
commit ad454e7a2a
No known key found for this signature in database
GPG Key ID: 6F19D22A78F46C8C
  1. 4
      src/google/protobuf/descriptor.cc
  2. 4
      src/google/protobuf/descriptor_database.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;
}

@ -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;
}

Loading…
Cancel
Save