organicmaps/protobuf
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Fix windows build.

Browse source 
Change-Id: Ibf7d1df850f4b497303f9f617751be98327898ef
This commit is contained in:
Feng Xiao 2016-06-30 14:29:05 -07:00
parent 69cc213c76
commit 2fe0556c7a
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/google/protobuf/extension_set.h
View file

@ -419,13 +419,8 @@ class LIBPROTOBUF_EXPORT ExtensionSet {
// are never forced to serialize deterministically.
uint8* SerializeWithCachedSizesToArray(int start_field_number,
int end_field_number,
uint8* target) const {
return InternalSerializeWithCachedSizesToArray(
start_field_number, end_field_number, false, target);
}
uint8* SerializeMessageSetWithCachedSizesToArray(uint8* target) const {
return InternalSerializeMessageSetWithCachedSizesToArray(false, target);
}
uint8* target) const;
uint8* SerializeMessageSetWithCachedSizesToArray(uint8* target) const;
// Returns the total serialized size of all the extensions.
int ByteSize() const;

12
src/google/protobuf/extension_set_heavy.cc
View file

@ -409,6 +409,18 @@ int ExtensionSet::Extension::SpaceUsedExcludingSelf() const {
// The Serialize*ToArray methods are only needed in the heavy library, as
// the lite library only generates SerializeWithCachedSizes.
uint8* ExtensionSet::SerializeWithCachedSizesToArray(int start_field_number,
int end_field_number,
uint8* target) const {
return InternalSerializeWithCachedSizesToArray(
start_field_number, end_field_number, false, target);
}
uint8* ExtensionSet::SerializeMessageSetWithCachedSizesToArray(
uint8* target) const {
return InternalSerializeMessageSetWithCachedSizesToArray(false, target);
}
uint8* ExtensionSet::InternalSerializeWithCachedSizesToArray(
int start_field_number, int end_field_number,
bool deterministic, uint8* target) const {