diff options
| author |  Adam Cozzette <acozzette@gmail.com> | 2018-07-02 10:50:51 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-02 10:50:51 -0700 |
| commit | e0579ac645df504dd80163e00bce997f470cc5ab (patch) | |
| tree | 2ec7254aba6732fc34bd63eb66686a8ff6088798 | |
| parent | 00f118f0c3105a8fad3482881439c5a62202880a (diff) | |
| parent | f2bcc7aca8797ed95d285f596c5f26b72a318a39 (diff) | |
Merge pull request #4854 from nehaljwani/win-exports
Missing symbol exports for Windows DLL
| -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); |