From 0400cca3236de1ca303af38bf81eab332d042b7c Mon Sep 17 00:00:00 2001 From: Adam Cozzette Date: Tue, 13 Mar 2018 16:37:29 -0700 Subject: Integrated internal changes from Google --- src/google/protobuf/implicit_weak_message.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/google/protobuf/implicit_weak_message.h') diff --git a/src/google/protobuf/implicit_weak_message.h b/src/google/protobuf/implicit_weak_message.h index a822172e..3279bd17 100644 --- a/src/google/protobuf/implicit_weak_message.h +++ b/src/google/protobuf/implicit_weak_message.h @@ -50,6 +50,8 @@ class LIBPROTOBUF_EXPORT ImplicitWeakMessage : public MessageLite { ImplicitWeakMessage() : arena_(NULL) {} explicit ImplicitWeakMessage(Arena* arena) : arena_(arena) {} + static const ImplicitWeakMessage* default_instance(); + string GetTypeName() const { return ""; } MessageLite* New() const { return new ImplicitWeakMessage; } @@ -91,9 +93,7 @@ class ImplicitWeakTypeHandler { public: typedef ImplicitWeakType Type; typedef ::google::protobuf::MessageLite WeakType; -#if LANG_CXX11 static const bool Moveable = false; -#endif // With implicit weak fields, we need separate NewFromPrototype and // NewFromPrototypeWeak functions. The former is used when we want to create a @@ -128,9 +128,6 @@ class ImplicitWeakTypeHandler { } }; -extern ::google::protobuf::internal::ExplicitlyConstructed - implicit_weak_message_default_instance; - } // namespace internal } // namespace protobuf -- cgit v1.2.3