diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2018-01-03 09:28:40 -0800 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2018-01-03 09:28:40 -0800 |
| commit | 383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a (patch) | |
| tree | 45bdce007f64e47ff2a0b60fb1920efc3eaf3b00 /src/google/protobuf/compiler/cpp | |
| parent | 8529f2aee33ae793c9ce362a45370b98f675370a (diff) | |
| parent | 88e5573b9a8a5c4038f9db3633610f032aab277d (diff) | |
| download | protobuf-383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a.tar.gz protobuf-383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a.tar.bz2 protobuf-383a4941d5b1aa3c0afbdc24dd0e5d63d263fc3a.zip | |
Merge remote-tracking branch 'origin/3.5.x' into master
Diffstat (limited to 'src/google/protobuf/compiler/cpp')
| -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 8636f089..9b2f090e 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; |