diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2015-12-11 17:09:20 -0800 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2015-12-11 17:10:28 -0800 |
| commit | e841bac4fcf47f809e089a70d5f84ac37b3883df (patch) | |
| tree | d25dc5fc814db182c04c5f276ff1a609c5965a5a /src/google/protobuf/util/internal/type_info.cc | |
| parent | 99a6a95c751a28a3cc33dd2384959179f83f682c (diff) | |
Down-integrate from internal code base.
Diffstat (limited to 'src/google/protobuf/util/internal/type_info.cc')
| -rw-r--r-- | src/google/protobuf/util/internal/type_info.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/google/protobuf/util/internal/type_info.cc b/src/google/protobuf/util/internal/type_info.cc index a45a76e3..00a8ee7a 100644 --- a/src/google/protobuf/util/internal/type_info.cc +++ b/src/google/protobuf/util/internal/type_info.cc @@ -136,8 +136,7 @@ class TypeInfoForTypeResolver : public TypeInfo { for (int i = 0; i < type->fields_size(); ++i) { const google::protobuf::Field& field = type->fields(i); StringPiece name = field.name(); - StringPiece camel_case_name = - *string_storage_.insert(ToCamelCase(name)).first; + StringPiece camel_case_name = field.json_name(); const StringPiece* existing = InsertOrReturnExisting( &camel_case_name_table_, camel_case_name, name); if (existing && *existing != name) { |