diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2016-07-19 14:31:31 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2016-07-19 14:32:51 -0700 |
| commit | 2e30301837ffcead1776a52999a6da1983a5686a (patch) | |
| tree | 1d1be87c74e6cbc7edd39e9bcbe9ef839964a5e6 /src/google/protobuf/compiler/java/java_message_field.cc | |
| parent | 77b08afaf80dc9390848fbeb47505da6a9be61be (diff) | |
Versioning Java GeneratedMessage.
Change-Id: Ib2bb5042deaabdf452d5be2ad1ce40d739ad8d1b
Diffstat (limited to 'src/google/protobuf/compiler/java/java_message_field.cc')
| -rw-r--r-- | src/google/protobuf/compiler/java/java_message_field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/compiler/java/java_message_field.cc b/src/google/protobuf/compiler/java/java_message_field.cc index cc627b5a..c9865dda 100644 --- a/src/google/protobuf/compiler/java/java_message_field.cc +++ b/src/google/protobuf/compiler/java/java_message_field.cc @@ -1203,7 +1203,7 @@ GenerateMergingCode(io::Printer* printer) const { " $name$_ = other.$name$_;\n" " $clear_mutable_bit_builder$;\n" " $name$Builder_ = \n" - " com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?\n" + " com.google.protobuf.GeneratedMessage$ver$.alwaysUseFieldBuilders ?\n" " get$capitalized_name$FieldBuilder() : null;\n" " } else {\n" " $name$Builder_.addAllMessages(other.$name$_);\n" |