diff options
author | Adam Cozzette <acozzette@gmail.com> | 2018-08-16 11:40:48 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-16 11:40:48 -0700 |
commit | 859405a62b5058c0352dc608a7fd887f29f48afe (patch) | |
tree | e57673aeee62c369fb72cbce92bcbdd1df9409e4 | |
parent | f2a1356966cef3889434368598ac888d131489fb (diff) | |
parent | fd25c5617b2a1f1ee875bf6c1e7518473409a211 (diff) | |
download | protobuf-859405a62b5058c0352dc608a7fd887f29f48afe.tar.gz protobuf-859405a62b5058c0352dc608a7fd887f29f48afe.tar.bz2 protobuf-859405a62b5058c0352dc608a7fd887f29f48afe.zip |
Merge pull request #5049 from nehaljwani/backport-4854
Backport #4854 to 3.6.x
-rw-r--r-- | src/google/protobuf/io/gzip_stream.h | 2 | ||||
-rw-r--r-- | src/google/protobuf/repeated_field.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/google/protobuf/io/gzip_stream.h b/src/google/protobuf/io/gzip_stream.h index 15b02fe3..df1a446e 100644 --- a/src/google/protobuf/io/gzip_stream.h +++ b/src/google/protobuf/io/gzip_stream.h @@ -118,7 +118,7 @@ class LIBPROTOBUF_EXPORT GzipOutputStream : public ZeroCopyOutputStream { ZLIB = 2, }; - struct Options { + struct LIBPROTOBUF_EXPORT Options { // Defaults to GZIP. Format format; diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h index b47ea994..fbfbf942 100644 --- a/src/google/protobuf/repeated_field.h +++ b/src/google/protobuf/repeated_field.h @@ -705,13 +705,13 @@ void GenericTypeHandler<string>::Merge(const string& from, // Declarations of the specialization as we cannot define them here, as the // header that defines ProtocolMessage depends on types defined in this header. #define DECLARE_SPECIALIZATIONS_FOR_BASE_PROTO_TYPES(TypeName) \ - template<> \ + template<> LIBPROTOBUF_EXPORT \ TypeName* GenericTypeHandler<TypeName>::NewFromPrototype( \ const TypeName* prototype, google::protobuf::Arena* arena); \ - template<> \ + template<> LIBPROTOBUF_EXPORT \ google::protobuf::Arena* GenericTypeHandler<TypeName>::GetArena( \ TypeName* value); \ - template<> \ + template<> LIBPROTOBUF_EXPORT \ void* GenericTypeHandler<TypeName>::GetMaybeArenaPointer( \ TypeName* value); |