From 460e7dd7c47b5a3fc290008317c044fac741916a Mon Sep 17 00:00:00 2001 From: Feng Xiao Date: Thu, 22 Sep 2016 17:46:22 -0700 Subject: Fix Visual Studio compile issues. Change-Id: I6a5078b6bcdf4637e11c1cb9da1f74298e6fc26e --- src/google/protobuf/empty.pb.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/google/protobuf/empty.pb.h') diff --git a/src/google/protobuf/empty.pb.h b/src/google/protobuf/empty.pb.h index e7ede70b..29309366 100644 --- a/src/google/protobuf/empty.pb.h +++ b/src/google/protobuf/empty.pb.h @@ -61,9 +61,7 @@ class LIBPROTOBUF_EXPORT Empty : public ::google::protobuf::Message /* @@protoc_ static const ::google::protobuf::Descriptor* descriptor(); static const Empty& default_instance(); - static inline const Empty* internal_default_instance() { - return &default_instance_.get(); - } + static const Empty* internal_default_instance(); void UnsafeArenaSwap(Empty* other); void Swap(Empty* other); @@ -131,8 +129,9 @@ class LIBPROTOBUF_EXPORT Empty : public ::google::protobuf::Message /* @@protoc_ friend void protobuf_ShutdownFile_google_2fprotobuf_2fempty_2eproto(); void InitAsDefaultInstance(); - static ::google::protobuf::internal::ExplicitlyConstructed default_instance_; }; +extern ::google::protobuf::internal::ExplicitlyConstructed Empty_default_instance_; + // =================================================================== @@ -141,6 +140,9 @@ class LIBPROTOBUF_EXPORT Empty : public ::google::protobuf::Message /* @@protoc_ #if !PROTOBUF_INLINE_NOT_IN_HEADERS // Empty +inline const Empty* Empty::internal_default_instance() { + return &Empty_default_instance_.get(); +} #endif // !PROTOBUF_INLINE_NOT_IN_HEADERS // @@protoc_insertion_point(namespace_scope) -- cgit v1.2.3