From d64a2d9941c36a7bc2a7959ea10ab8363192ac14 Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Wed, 29 Jun 2016 15:23:27 -0700 Subject: Integrated internal changes from Google This includes all internal changes from around May 20 to now. --- src/google/protobuf/message_lite.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/google/protobuf/message_lite.cc') diff --git a/src/google/protobuf/message_lite.cc b/src/google/protobuf/message_lite.cc index 9d7b64f7..3913be1b 100644 --- a/src/google/protobuf/message_lite.cc +++ b/src/google/protobuf/message_lite.cc @@ -221,7 +221,8 @@ bool MessageLite::ParsePartialFromArray(const void* data, int size) { // =================================================================== -uint8* MessageLite::SerializeWithCachedSizesToArray(uint8* target) const { +uint8* MessageLite::InternalSerializeWithCachedSizesToArray( + bool deterministic, uint8* target) const { // We only optimize this when using optimize_for = SPEED. In other cases // we just use the CodedOutputStream path. int size = GetCachedSize(); -- cgit v1.2.3