aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/compiler/javanano/javanano_message_field.cc
diff options
context:
space:
mode:
authorGravatar Tom Chao <chaot@google.com>2013-07-18 11:34:04 -0700
committerGravatar Tom Chao <chaot@google.com>2013-07-19 09:30:56 -0700
commitd4bb971d18087273d5c56183c3b9acb3d4ae82d6 (patch)
treed1d93b5a8a77d3e8fd5e592766f089210d28153d /src/google/protobuf/compiler/javanano/javanano_message_field.cc
parentb8f5dad1c76e596e774e16e98cb7ef0728774c73 (diff)
Update nano to serialize java keywords properly.
Change-Id: I7407d0fab609c336ecd73499e725aed0dd50f555
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_message_field.cc')
-rw-r--r--src/google/protobuf/compiler/javanano/javanano_message_field.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_message_field.cc b/src/google/protobuf/compiler/javanano/javanano_message_field.cc
index ec9d995f..7d9a281e 100644
--- a/src/google/protobuf/compiler/javanano/javanano_message_field.cc
+++ b/src/google/protobuf/compiler/javanano/javanano_message_field.cc
@@ -56,9 +56,9 @@ namespace {
void SetMessageVariables(const Params& params,
const FieldDescriptor* descriptor, map<string, string>* variables) {
(*variables)["name"] =
- UnderscoresToCamelCase(descriptor);
+ RenameJavaKeywords(UnderscoresToCamelCase(descriptor));
(*variables)["capitalized_name"] =
- UnderscoresToCapitalizedCamelCase(descriptor);
+ RenameJavaKeywords(UnderscoresToCapitalizedCamelCase(descriptor));
(*variables)["number"] = SimpleItoa(descriptor->number());
(*variables)["type"] = ClassName(params, descriptor->message_type());
(*variables)["group_or_message"] =