Index: third_party/protobuf/src/google/protobuf/compiler/java/java_lazy_message_field.cc |
diff --git a/third_party/protobuf/src/google/protobuf/compiler/java/java_lazy_message_field.cc b/third_party/protobuf/src/google/protobuf/compiler/java/java_lazy_message_field.cc |
index abf8e55cf7192f687688da9bdc6ab443b5541b8d..0de8cbe529c8b4546123d9ac30287e1218220439 100644 |
--- a/third_party/protobuf/src/google/protobuf/compiler/java/java_lazy_message_field.cc |
+++ b/third_party/protobuf/src/google/protobuf/compiler/java/java_lazy_message_field.cc |
@@ -93,7 +93,7 @@ GenerateBuilderMembers(io::Printer* printer) const { |
printer->Print(variables_, |
// If this builder is non-null, it is used and the other fields are |
// ignored. |
- "private com.google.protobuf.SingleFieldBuilder$ver$<\n" |
+ "private com.google.protobuf.SingleFieldBuilder<\n" |
" $type$, $type$.Builder, $type$OrBuilder> $name$Builder_;" |
"\n"); |
@@ -193,11 +193,11 @@ GenerateBuilderMembers(io::Printer* printer) const { |
"}\n"); |
WriteFieldDocComment(printer, descriptor_); |
printer->Print(variables_, |
- "private com.google.protobuf.SingleFieldBuilder$ver$<\n" |
+ "private com.google.protobuf.SingleFieldBuilder<\n" |
" $type$, $type$.Builder, $type$OrBuilder> \n" |
" get$capitalized_name$FieldBuilder() {\n" |
" if ($name$Builder_ == null) {\n" |
- " $name$Builder_ = new com.google.protobuf.SingleFieldBuilder$ver$<\n" |
+ " $name$Builder_ = new com.google.protobuf.SingleFieldBuilder<\n" |
" $type$, $type$.Builder, $type$OrBuilder>(\n" |
" $name$_,\n" |
" getParentForChildren(),\n" |
@@ -535,7 +535,7 @@ GenerateBuilderMembers(io::Printer* printer) const { |
printer->Print(variables_, |
// If this builder is non-null, it is used and the other fields are |
// ignored. |
- "private com.google.protobuf.RepeatedFieldBuilder$ver$<\n" |
+ "private com.google.protobuf.RepeatedFieldBuilder<\n" |
" $type$, $type$.Builder, $type$OrBuilder> $name$Builder_;\n" |
"\n"); |
@@ -763,11 +763,11 @@ GenerateBuilderMembers(io::Printer* printer) const { |
" get$capitalized_name$BuilderList() {\n" |
" return get$capitalized_name$FieldBuilder().getBuilderList();\n" |
"}\n" |
- "private com.google.protobuf.RepeatedFieldBuilder$ver$<\n" |
+ "private com.google.protobuf.RepeatedFieldBuilder<\n" |
" $type$, $type$.Builder, $type$OrBuilder> \n" |
" get$capitalized_name$FieldBuilder() {\n" |
" if ($name$Builder_ == null) {\n" |
- " $name$Builder_ = new com.google.protobuf.RepeatedFieldBuilder$ver$<\n" |
+ " $name$Builder_ = new com.google.protobuf.RepeatedFieldBuilder<\n" |
" $type$, $type$.Builder, $type$OrBuilder>(\n" |
" $name$_,\n" |
" $get_mutable_bit_builder$,\n" |