aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Sondergaard <thomas.sondergaard@karoshealth.com>2016-11-28 12:06:34 +0100
committerThomas Sondergaard <thomas.sondergaard@karoshealth.com>2016-11-28 12:13:04 +0100
commitc6997885739bc9c71e467199c0034b01d36d4b5f (patch)
tree5523e609212e5d3d7fc0e43624afdd1327ba84fb
parent0c34e86a51daaf267c2170a6da9c82fa1cb4f5f8 (diff)
downloadprotobuf-c6997885739bc9c71e467199c0034b01d36d4b5f.tar.gz
protobuf-c6997885739bc9c71e467199c0034b01d36d4b5f.tar.bz2
protobuf-c6997885739bc9c71e467199c0034b01d36d4b5f.zip
Export fixed_address_empty_string
commit 98835fb8f8 broke use of protobuf as shared library on Windows. Example error message: error LNK2001: unresolved external symbol "class google::protobuf::internal::ExplicitlyConstructed<class std::basic_string<char,struct std::char_traits<char>,class std::allocator<char> > > google::protobuf::internal::fixed_address_empty_string"
-rw-r--r--src/google/protobuf/generated_message_util.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/google/protobuf/generated_message_util.h b/src/google/protobuf/generated_message_util.h
index 8dc64c49..28ed495c 100644
--- a/src/google/protobuf/generated_message_util.h
+++ b/src/google/protobuf/generated_message_util.h
@@ -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();