diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2016-06-30 14:29:05 -0700 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2016-06-30 14:29:05 -0700 |
commit | 2fe0556c7abbe31c02147b9171397737a35bfe3b (patch) | |
tree | 2a48c8754aade46ecaae735a7e43e5db6babf631 /src | |
parent | 69cc213c76350f3edcec27081d2383d50e696c6b (diff) | |
download | protobuf-2fe0556c7abbe31c02147b9171397737a35bfe3b.tar.gz protobuf-2fe0556c7abbe31c02147b9171397737a35bfe3b.tar.bz2 protobuf-2fe0556c7abbe31c02147b9171397737a35bfe3b.zip |
Fix windows build.
Change-Id: Ibf7d1df850f4b497303f9f617751be98327898ef
Diffstat (limited to 'src')
-rw-r--r-- | src/google/protobuf/extension_set.h | 9 | ||||
-rw-r--r-- | src/google/protobuf/extension_set_heavy.cc | 12 |
2 files changed, 14 insertions, 7 deletions
diff --git a/src/google/protobuf/extension_set.h b/src/google/protobuf/extension_set.h index a92c5043..3e1d1ef5 100644 --- a/src/google/protobuf/extension_set.h +++ b/src/google/protobuf/extension_set.h @@ -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; diff --git a/src/google/protobuf/extension_set_heavy.cc b/src/google/protobuf/extension_set_heavy.cc index 7177d786..5dd171ed 100644 --- a/src/google/protobuf/extension_set_heavy.cc +++ b/src/google/protobuf/extension_set_heavy.cc @@ -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 { |