diff options
| author | Max Cai <maxtroy@google.com> | 2014-02-10 14:04:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-10 14:04:23 +0000 |
| commit | 447f664aef6694bb9fb3db85d6166d908cde8a8d (patch) | |
| tree | caafb95d8d88c96d22422fac3b878254e5e7eeb7 /src/google/protobuf/compiler/javanano/javanano_helpers.cc | |
| parent | a8af729b5ef822971f025a7e8ff197545986910d (diff) | |
| parent | f4523ddb8a4e6f1008bfec2ee9e39629be792639 (diff) | |
| download | external_protobuf-447f664aef6694bb9fb3db85d6166d908cde8a8d.zip external_protobuf-447f664aef6694bb9fb3db85d6166d908cde8a8d.tar.gz external_protobuf-447f664aef6694bb9fb3db85d6166d908cde8a8d.tar.bz2 | |
Merge changes I9fecff3c,I2c1eb07f
* changes:
Fix repeated packed field merging code for non-packed data.
Add validation when parsing enum fields.
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_helpers.cc')
| -rw-r--r-- | src/google/protobuf/compiler/javanano/javanano_helpers.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_helpers.cc b/src/google/protobuf/compiler/javanano/javanano_helpers.cc index b3bedcb..ede4c6f 100644 --- a/src/google/protobuf/compiler/javanano/javanano_helpers.cc +++ b/src/google/protobuf/compiler/javanano/javanano_helpers.cc @@ -412,7 +412,7 @@ string DefaultValue(const Params& params, const FieldDescriptor* field) { case FieldDescriptor::CPPTYPE_ENUM: return ClassName(params, field->enum_type()) + "." + - field->default_value_enum()->name(); + RenameJavaKeywords(field->default_value_enum()->name()); case FieldDescriptor::CPPTYPE_MESSAGE: return "null"; |