From 3fd4d3fe8e1f64bcc88f7e1db87fe143d17efc8b Mon Sep 17 00:00:00 2001 From: Dave MacLachlan Date: Thu, 24 Jun 2021 14:09:20 -0700 Subject: [PATCH] Fix up objectivec sources to simplfy import into Google. --- .../protobuf/compiler/objectivec/objectivec_generator.cc | 8 ++++---- .../protobuf/compiler/objectivec/objectivec_helpers.cc | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/google/protobuf/compiler/objectivec/objectivec_generator.cc b/src/google/protobuf/compiler/objectivec/objectivec_generator.cc index 9aefa4a984..50b847e951 100644 --- a/src/google/protobuf/compiler/objectivec/objectivec_generator.cc +++ b/src/google/protobuf/compiler/objectivec/objectivec_generator.cc @@ -150,11 +150,11 @@ bool ObjectiveCGenerator::GenerateAll( // is just what to do if that isn't set. The available options are: // "no": Not prefixed (the existing mode). // "yes": Make a prefix out of the proto package. - std::string lower_value(options[i].second); - LowerString(&lower_value); - if (lower_value == "no") { + std::string upper_value(options[i].second); + UpperString(&upper_value); + if (upper_value == "NO") { SetUseProtoPackageAsDefaultPrefix(false); - } else if (lower_value == "yes") { + } else if (upper_value == "YES") { SetUseProtoPackageAsDefaultPrefix(true); } else { *error = "error: Unknown use_package_as_prefix: " + options[i].second; diff --git a/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc b/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc index 9aeb0f6f2e..b79e8cb185 100644 --- a/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc +++ b/src/google/protobuf/compiler/objectivec/objectivec_helpers.cc @@ -523,8 +523,7 @@ std::string FileClassPrefix(const FileDescriptor* file) { // camelcase each one and then join them with underscores, and add an // underscore at the end. std::string result; - const std::vector segments = - Split(file->package(), ".", true /* skip_empty */); + const std::vector segments = Split(file->package(), ".", true); for (const auto& segment : segments) { const std::string part = UnderscoresToCamelCase(segment, true); if (part.empty()) {