aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/duration.pb.h
diff options
context:
space:
mode:
authorGravatar Feng Xiao <xfxyjwf@gmail.com>2016-09-22 17:46:22 -0700
committerGravatar Bo Yang <teboring@google.com>2016-10-10 11:44:21 -0700
commit460e7dd7c47b5a3fc290008317c044fac741916a (patch)
tree07ba6084281627598eff9afeeafe4a381bd90569 /src/google/protobuf/duration.pb.h
parent4cf072248fc39d1c63dcb1600ff9e73df8757779 (diff)
Fix Visual Studio compile issues.
Change-Id: I6a5078b6bcdf4637e11c1cb9da1f74298e6fc26e
Diffstat (limited to 'src/google/protobuf/duration.pb.h')
-rw-r--r--src/google/protobuf/duration.pb.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h
index 4d0e405f..3ed1a6d3 100644
--- a/src/google/protobuf/duration.pb.h
+++ b/src/google/protobuf/duration.pb.h
@@ -61,9 +61,7 @@ class LIBPROTOBUF_EXPORT Duration : public ::google::protobuf::Message /* @@prot
static const ::google::protobuf::Descriptor* descriptor();
static const Duration& default_instance();
- static inline const Duration* internal_default_instance() {
- return &default_instance_.get();
- }
+ static const Duration* internal_default_instance();
void UnsafeArenaSwap(Duration* other);
void Swap(Duration* other);
@@ -145,8 +143,9 @@ class LIBPROTOBUF_EXPORT Duration : public ::google::protobuf::Message /* @@prot
friend void protobuf_ShutdownFile_google_2fprotobuf_2fduration_2eproto();
void InitAsDefaultInstance();
- static ::google::protobuf::internal::ExplicitlyConstructed<Duration> default_instance_;
};
+extern ::google::protobuf::internal::ExplicitlyConstructed<Duration> Duration_default_instance_;
+
// ===================================================================
@@ -183,6 +182,9 @@ inline void Duration::set_nanos(::google::protobuf::int32 value) {
// @@protoc_insertion_point(field_set:google.protobuf.Duration.nanos)
}
+inline const Duration* Duration::internal_default_instance() {
+ return &Duration_default_instance_.get();
+}
#endif // !PROTOBUF_INLINE_NOT_IN_HEADERS
// @@protoc_insertion_point(namespace_scope)