Integrate internal changes

1 files changed, 23 insertions, 4 deletions

diff --git a/src/google/protobuf/duration.pb.h b/src/google/protobuf/duration.pb.h
index 44307347..fe135b1e 100644
--- a/src/google/protobuf/duration.pb.h
+++ b/src/google/protobuf/duration.pb.h
@@ -34,6 +34,7 @@ namespace protobuf {
 
 // Internal implementation detail -- do not call these.
 void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fduration_2eproto();
+void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fduration_2eproto();
 void protobuf_AssignDesc_google_2fprotobuf_2fduration_2eproto();
 void protobuf_ShutdownFile_google_2fprotobuf_2fduration_2eproto();
 
@@ -53,9 +54,18 @@ class LIBPROTOBUF_EXPORT Duration : public ::google::protobuf::Message /* @@prot
     return *this;
   }
 
+  inline ::google::protobuf::Arena* GetArena() const { return GetArenaNoVirtual(); }
+  inline void* GetMaybeArenaPointer() const {
+    return MaybeArenaPtr();
+  }
   static const ::google::protobuf::Descriptor* descriptor();
   static const Duration& default_instance();
 
+  static inline const Duration* internal_default_instance() {
+    return &default_instance_.get();
+  }
+
+  void UnsafeArenaSwap(Duration* other);
   void Swap(Duration* other);
 
   // implements Message ----------------------------------------------
@@ -70,7 +80,7 @@ class LIBPROTOBUF_EXPORT Duration : public ::google::protobuf::Message /* @@prot
   void Clear();
   bool IsInitialized() const;
 
-  int ByteSize() const;
+  size_t ByteSizeLong() const;
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input);
   void SerializeWithCachedSizes(
@@ -86,6 +96,12 @@ class LIBPROTOBUF_EXPORT Duration : public ::google::protobuf::Message /* @@prot
   void SharedDtor();
   void SetCachedSize(int size) const;
   void InternalSwap(Duration* other);
+  void UnsafeMergeFrom(const Duration& from);
+  protected:
+  explicit Duration(::google::protobuf::Arena* arena);
+  private:
+  static void ArenaDtor(void* object);
+  inline void RegisterArenaDtor(::google::protobuf::Arena* arena);
   private:
   inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
     return _internal_metadata_.arena();
@@ -117,16 +133,19 @@ class LIBPROTOBUF_EXPORT Duration : public ::google::protobuf::Message /* @@prot
  private:
 
   ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
-  bool _is_default_instance_;
+  friend class ::google::protobuf::Arena;
+  typedef void InternalArenaConstructable_;
+  typedef void DestructorSkippable_;
   ::google::protobuf::int64 seconds_;
   ::google::protobuf::int32 nanos_;
   mutable int _cached_size_;
-  friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fduration_2eproto();
+  friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fduration_2eproto_impl();
+  friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fduration_2eproto_impl();
   friend void protobuf_AssignDesc_google_2fprotobuf_2fduration_2eproto();
   friend void protobuf_ShutdownFile_google_2fprotobuf_2fduration_2eproto();
 
   void InitAsDefaultInstance();
-  static Duration* default_instance_;
+  static ::google::protobuf::internal::ExplicitlyConstructed<Duration> default_instance_;
 };
 // ===================================================================