Merge pull request #8948 from compnerd/split-check
build: fix the support for CMake[<3.7]
diff --git a/src/google/protobuf/generated_message_reflection.cc b/src/google/protobuf/generated_message_reflection.cc
index cfae9ee..a84fb35 100644
--- a/src/google/protobuf/generated_message_reflection.cc
+++ b/src/google/protobuf/generated_message_reflection.cc
@@ -2491,18 +2491,12 @@
// (which uses HasField()) needs to be consistent with this.
switch (field->cpp_type()) {
case FieldDescriptor::CPPTYPE_STRING:
- switch (field->options().ctype()) {
- default: {
- if (IsInlined(field)) {
- return !GetField<InlinedStringField>(message, field)
- .GetNoArena()
- .empty();
- }
-
- return GetField<ArenaStringPtr>(message, field).Get().size() > 0;
- }
+ if (IsInlined(field)) {
+ return !GetField<InlinedStringField>(message, field)
+ .GetNoArena()
+ .empty();
}
- return false;
+ return GetField<ArenaStringPtr>(message, field).Get().size() > 0;
case FieldDescriptor::CPPTYPE_BOOL:
return GetRaw<bool>(message, field) != false;
case FieldDescriptor::CPPTYPE_INT32:
