Internal Code Change

PiperOrigin-RevId: 540289901
pull/13021/head
Protobuf Team Bot 2 years ago committed by Copybara-Service
parent 2cf94fafe3
commit e4b500c476
  1. 11
      src/google/protobuf/descriptor_database.cc

@ -1022,23 +1022,18 @@ bool MergedDescriptorDatabase::FindFileContainingExtension(
bool MergedDescriptorDatabase::FindAllExtensionNumbers( bool MergedDescriptorDatabase::FindAllExtensionNumbers(
const std::string& extendee_type, std::vector<int>* output) { const std::string& extendee_type, std::vector<int>* output) {
// NOLINTNEXTLINE(google3-runtime-rename-unnecessary-ordering)
absl::btree_set<int> merged_results; absl::btree_set<int> merged_results;
std::vector<int> results; std::vector<int> results;
bool success = false; bool success = false;
for (DescriptorDatabase* source : sources_) { for (DescriptorDatabase* source : sources_) {
if (source->FindAllExtensionNumbers(extendee_type, &results)) { if (source->FindAllExtensionNumbers(extendee_type, &results)) {
std::copy(results.begin(), results.end(), for (int r : results) merged_results.insert(r);
std::insert_iterator<absl::btree_set<int> >(
merged_results, merged_results.begin()));
success = true; success = true;
} }
results.clear(); results.clear();
} }
for (int r : merged_results) output->push_back(r);
std::copy(merged_results.begin(), merged_results.end(),
std::insert_iterator<std::vector<int> >(*output, output->end()));
return success; return success;
} }

Loading…
Cancel
Save