diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2016-09-14 09:37:48 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2016-09-14 09:37:48 -0700 |
| commit | 58860c021f0bdd0c79e612e7092c6c3d692488c0 (patch) | |
| tree | 7c05b76a3b5573130daf2d0bf4e70359d87f02c1 /src/google/protobuf/compiler/cpp/cpp_message.cc | |
| parent | 86fcd879b38505446799b2f2a2929415ddad620a (diff) | |
| parent | 57170b93438b25c9c7da9bc53a9545dad261fbcb (diff) | |
| download | protobuf-58860c021f0bdd0c79e612e7092c6c3d692488c0.tar.gz protobuf-58860c021f0bdd0c79e612e7092c6c3d692488c0.tar.bz2 protobuf-58860c021f0bdd0c79e612e7092c6c3d692488c0.zip | |
Merge remote-tracking branch 'origin/3.0.x' into merge
Diffstat (limited to 'src/google/protobuf/compiler/cpp/cpp_message.cc')
| -rw-r--r-- | src/google/protobuf/compiler/cpp/cpp_message.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/google/protobuf/compiler/cpp/cpp_message.cc b/src/google/protobuf/compiler/cpp/cpp_message.cc index 69cd5f3c..0034b121 100644 --- a/src/google/protobuf/compiler/cpp/cpp_message.cc +++ b/src/google/protobuf/compiler/cpp/cpp_message.cc @@ -3363,6 +3363,7 @@ GenerateSerializeWithCachedSizesToArray(io::Printer* printer) { "classname", classname_); printer->Indent(); + printer->Print("(void)deterministic; // Unused\n"); printer->Print( "// @@protoc_insertion_point(serialize_to_array_start:$full_name$)\n", "full_name", descriptor_->full_name()); |