diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2017-12-13 13:00:02 -0800 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-12-13 13:00:02 -0800 |
| commit | 7ef21dd81bb1841ea5fa44e9d26e2b23b1bf1468 (patch) | |
| tree | 82925088dd39382ff16ac99da74f52dff948e388 | |
| parent | cf65a7946fb42e941708d10adbce69924c6d1ee0 (diff) | |
| download | protobuf-7ef21dd81bb1841ea5fa44e9d26e2b23b1bf1468.tar.gz protobuf-7ef21dd81bb1841ea5fa44e9d26e2b23b1bf1468.tar.bz2 protobuf-7ef21dd81bb1841ea5fa44e9d26e2b23b1bf1468.zip | |
Use matching enum type for IsPOD.
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_message.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_message.cc b/src/google/protobuf/compiler/cpp/cpp_message.cc index 60467598..34a70b12 100644 --- a/src/google/protobuf/compiler/cpp/cpp_message.cc +++ b/src/google/protobuf/compiler/cpp/cpp_message.cc @@ -113,16 +113,16 @@ struct ExtensionRangeSorter { bool IsPOD(const FieldDescriptor* field) { if (field->is_repeated() || field->is_extension()) return false; switch (field->cpp_type()) { - case internal::WireFormatLite::CPPTYPE_ENUM: - case internal::WireFormatLite::CPPTYPE_INT32: - case internal::WireFormatLite::CPPTYPE_INT64: - case internal::WireFormatLite::CPPTYPE_UINT32: - case internal::WireFormatLite::CPPTYPE_UINT64: - case internal::WireFormatLite::CPPTYPE_FLOAT: - case internal::WireFormatLite::CPPTYPE_DOUBLE: - case internal::WireFormatLite::CPPTYPE_BOOL: + case FieldDescriptor::CPPTYPE_ENUM: + case FieldDescriptor::CPPTYPE_INT32: + case FieldDescriptor::CPPTYPE_INT64: + case FieldDescriptor::CPPTYPE_UINT32: + case FieldDescriptor::CPPTYPE_UINT64: + case FieldDescriptor::CPPTYPE_FLOAT: + case FieldDescriptor::CPPTYPE_DOUBLE: + case FieldDescriptor::CPPTYPE_BOOL: return true; - case internal::WireFormatLite::CPPTYPE_STRING: + case FieldDescriptor::CPPTYPE_STRING: return false; default: return false; |