aboutsummaryrefslogtreecommitdiffstats
path: root/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
diff options
context:
space:
mode:
authorMax Cai <maxtroy@google.com>2013-10-11 20:36:00 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-10-11 20:36:01 +0000
commit39cee9f1f5cd513a53ac5100eb208ed431f99af0 (patch)
tree688c10f285f9594d56d791d1757fc81f6c4d70ec /src/google/protobuf/compiler/javanano/javanano_enum_field.cc
parentcbb08132821cb56f4e6c5e5f8a0b32f51879782a (diff)
parent5ae438cf71487d5bc8cb5c0d0e637f976734d110 (diff)
downloadexternal_protobuf-39cee9f1f5cd513a53ac5100eb208ed431f99af0.zip
external_protobuf-39cee9f1f5cd513a53ac5100eb208ed431f99af0.tar.gz
external_protobuf-39cee9f1f5cd513a53ac5100eb208ed431f99af0.tar.bz2
Merge "Remove all field initializers and let ctor call clear()."
Diffstat (limited to 'src/google/protobuf/compiler/javanano/javanano_enum_field.cc')
-rw-r--r--src/google/protobuf/compiler/javanano/javanano_enum_field.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/google/protobuf/compiler/javanano/javanano_enum_field.cc b/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
index acb8dc2..420d3c2 100644
--- a/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
+++ b/src/google/protobuf/compiler/javanano/javanano_enum_field.cc
@@ -89,11 +89,11 @@ EnumFieldGenerator::~EnumFieldGenerator() {}
void EnumFieldGenerator::
GenerateMembers(io::Printer* printer) const {
printer->Print(variables_,
- "public $type$ $name$ = $default$;\n");
+ "public $type$ $name$;\n");
if (params_.generate_has()) {
printer->Print(variables_,
- "public boolean has$capitalized_name$ = false;\n");
+ "public boolean has$capitalized_name$;\n");
}
}
@@ -178,7 +178,7 @@ AccessorEnumFieldGenerator::~AccessorEnumFieldGenerator() {}
void AccessorEnumFieldGenerator::
GenerateMembers(io::Printer* printer) const {
printer->Print(variables_,
- "private int $name$_ = $default$;\n"
+ "private int $name$_;\n"
"public int get$capitalized_name$() {\n"
" return $name$_;\n"
"}\n"
@@ -241,7 +241,7 @@ RepeatedEnumFieldGenerator::~RepeatedEnumFieldGenerator() {}
void RepeatedEnumFieldGenerator::
GenerateMembers(io::Printer* printer) const {
printer->Print(variables_,
- "public $type$[] $name$ = $repeated_default$;\n");
+ "public $type$[] $name$;\n");
if (descriptor_->options().packed()) {
printer->Print(variables_,
"private int $name$MemoizedSerializedSize;\n");