diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2016-09-22 17:46:22 -0700 |
|---|---|---|
| committer | Bo Yang <teboring@google.com> | 2016-10-10 11:44:21 -0700 |
| commit | 460e7dd7c47b5a3fc290008317c044fac741916a (patch) | |
| tree | 07ba6084281627598eff9afeeafe4a381bd90569 /src/google/protobuf/timestamp.pb.h | |
| parent | 4cf072248fc39d1c63dcb1600ff9e73df8757779 (diff) | |
| download | protobuf-460e7dd7c47b5a3fc290008317c044fac741916a.tar.gz protobuf-460e7dd7c47b5a3fc290008317c044fac741916a.tar.bz2 protobuf-460e7dd7c47b5a3fc290008317c044fac741916a.zip | |
Fix Visual Studio compile issues.
Change-Id: I6a5078b6bcdf4637e11c1cb9da1f74298e6fc26e
Diffstat (limited to 'src/google/protobuf/timestamp.pb.h')
| -rw-r--r-- | src/google/protobuf/timestamp.pb.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/google/protobuf/timestamp.pb.h b/src/google/protobuf/timestamp.pb.h index 8447f108..1abe8d0c 100644 --- a/src/google/protobuf/timestamp.pb.h +++ b/src/google/protobuf/timestamp.pb.h @@ -61,9 +61,7 @@ class LIBPROTOBUF_EXPORT Timestamp : public ::google::protobuf::Message /* @@pro static const ::google::protobuf::Descriptor* descriptor(); static const Timestamp& default_instance(); - static inline const Timestamp* internal_default_instance() { - return &default_instance_.get(); - } + static const Timestamp* internal_default_instance(); void UnsafeArenaSwap(Timestamp* other); void Swap(Timestamp* other); @@ -145,8 +143,9 @@ class LIBPROTOBUF_EXPORT Timestamp : public ::google::protobuf::Message /* @@pro friend void protobuf_ShutdownFile_google_2fprotobuf_2ftimestamp_2eproto(); void InitAsDefaultInstance(); - static ::google::protobuf::internal::ExplicitlyConstructed<Timestamp> default_instance_; }; +extern ::google::protobuf::internal::ExplicitlyConstructed<Timestamp> Timestamp_default_instance_; + // =================================================================== @@ -183,6 +182,9 @@ inline void Timestamp::set_nanos(::google::protobuf::int32 value) { // @@protoc_insertion_point(field_set:google.protobuf.Timestamp.nanos) } +inline const Timestamp* Timestamp::internal_default_instance() { + return &Timestamp_default_instance_.get(); +} #endif // !PROTOBUF_INLINE_NOT_IN_HEADERS // @@protoc_insertion_point(namespace_scope) |