Merge pull request from tsondergaard/3.1.x

Export fixed_address_empty_string
This commit is contained in:
Adam Cozzette 2016-11-29 09:27:32 -08:00 committed by GitHub
commit 9f69353562

View file

@ -111,7 +111,7 @@ class ExplicitlyConstructed {
// Default empty string object. Don't use this directly. Instead, call
// GetEmptyString() to get the reference.
extern ExplicitlyConstructed< ::std::string> fixed_address_empty_string;
LIBPROTOBUF_EXPORT extern ExplicitlyConstructed< ::std::string> fixed_address_empty_string;
LIBPROTOBUF_EXPORT extern ProtobufOnceType empty_string_once_init_;
LIBPROTOBUF_EXPORT void InitEmptyString();