Index: third_party/protobuf/src/google/protobuf/field_mask.pb.h |
diff --git a/third_party/protobuf/src/google/protobuf/field_mask.pb.h b/third_party/protobuf/src/google/protobuf/field_mask.pb.h |
index d7600c1b79efbb9af351c6b666d7d71f5121ad6e..f5e0b65533288db818c9871cbe5808e78ba63147 100644 |
--- a/third_party/protobuf/src/google/protobuf/field_mask.pb.h |
+++ b/third_party/protobuf/src/google/protobuf/field_mask.pb.h |
@@ -8,12 +8,12 @@ |
#include <google/protobuf/stubs/common.h> |
-#if GOOGLE_PROTOBUF_VERSION < 3001000 |
+#if GOOGLE_PROTOBUF_VERSION < 3000000 |
#error This file was generated by a newer version of protoc which is |
#error incompatible with your Protocol Buffer headers. Please update |
#error your headers. |
#endif |
-#if 3001000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION |
+#if 3000000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION |
#error This file was generated by an older version of protoc which is |
#error incompatible with your Protocol Buffer headers. Please |
#error regenerate this file with a newer version of protoc. |
@@ -24,28 +24,24 @@ |
#include <google/protobuf/generated_message_util.h> |
#include <google/protobuf/metadata.h> |
#include <google/protobuf/message.h> |
-#include <google/protobuf/repeated_field.h> // IWYU pragma: export |
-#include <google/protobuf/extension_set.h> // IWYU pragma: export |
+#include <google/protobuf/repeated_field.h> |
+#include <google/protobuf/extension_set.h> |
#include <google/protobuf/unknown_field_set.h> |
// @@protoc_insertion_point(includes) |
-namespace google { |
-namespace protobuf { |
-class FieldMask; |
-class FieldMaskDefaultTypeInternal; |
-LIBPROTOBUF_EXPORT extern FieldMaskDefaultTypeInternal _FieldMask_default_instance_; |
-} // namespace protobuf |
-} // namespace google |
namespace google { |
namespace protobuf { |
// Internal implementation detail -- do not call these. |
void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2ffield_5fmask_2eproto(); |
-void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2ffield_5fmask_2eproto(); |
+void protobuf_AssignDesc_google_2fprotobuf_2ffield_5fmask_2eproto(); |
+void protobuf_ShutdownFile_google_2fprotobuf_2ffield_5fmask_2eproto(); |
+ |
+class FieldMask; |
// =================================================================== |
-class LIBPROTOBUF_EXPORT FieldMask : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.FieldMask) */ { |
+class LIBPROTOBUF_EXPORT FieldMask : public ::google::protobuf::Message { |
public: |
FieldMask(); |
virtual ~FieldMask(); |
@@ -60,52 +56,42 @@ class LIBPROTOBUF_EXPORT FieldMask : public ::google::protobuf::Message /* @@pro |
static const ::google::protobuf::Descriptor* descriptor(); |
static const FieldMask& default_instance(); |
- static inline const FieldMask* internal_default_instance() { |
- return reinterpret_cast<const FieldMask*>( |
- &_FieldMask_default_instance_); |
- } |
- |
void Swap(FieldMask* other); |
// implements Message ---------------------------------------------- |
- inline FieldMask* New() const PROTOBUF_FINAL { return New(NULL); } |
+ inline FieldMask* New() const { return New(NULL); } |
- FieldMask* New(::google::protobuf::Arena* arena) const PROTOBUF_FINAL; |
- void CopyFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL; |
- void MergeFrom(const ::google::protobuf::Message& from) PROTOBUF_FINAL; |
+ FieldMask* New(::google::protobuf::Arena* arena) const; |
+ void CopyFrom(const ::google::protobuf::Message& from); |
+ void MergeFrom(const ::google::protobuf::Message& from); |
void CopyFrom(const FieldMask& from); |
void MergeFrom(const FieldMask& from); |
- void Clear() PROTOBUF_FINAL; |
- bool IsInitialized() const PROTOBUF_FINAL; |
+ void Clear(); |
+ bool IsInitialized() const; |
- size_t ByteSizeLong() const PROTOBUF_FINAL; |
+ int ByteSize() const; |
bool MergePartialFromCodedStream( |
- ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; |
+ ::google::protobuf::io::CodedInputStream* input); |
void SerializeWithCachedSizes( |
- ::google::protobuf::io::CodedOutputStream* output) const PROTOBUF_FINAL; |
- ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray( |
- bool deterministic, ::google::protobuf::uint8* target) const PROTOBUF_FINAL; |
- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) |
- const PROTOBUF_FINAL { |
- return InternalSerializeWithCachedSizesToArray(false, output); |
- } |
- int GetCachedSize() const PROTOBUF_FINAL { return _cached_size_; } |
+ ::google::protobuf::io::CodedOutputStream* output) const; |
+ ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; |
+ int GetCachedSize() const { return _cached_size_; } |
private: |
void SharedCtor(); |
void SharedDtor(); |
- void SetCachedSize(int size) const PROTOBUF_FINAL; |
+ void SetCachedSize(int size) const; |
void InternalSwap(FieldMask* other); |
private: |
inline ::google::protobuf::Arena* GetArenaNoVirtual() const { |
- return NULL; |
+ return _internal_metadata_.arena(); |
} |
inline void* MaybeArenaPtr() const { |
- return NULL; |
+ return _internal_metadata_.raw_arena_ptr(); |
} |
public: |
- ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL; |
+ ::google::protobuf::Metadata GetMetadata() const; |
// nested types ---------------------------------------------------- |
@@ -131,13 +117,15 @@ class LIBPROTOBUF_EXPORT FieldMask : public ::google::protobuf::Message /* @@pro |
private: |
::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; |
+ bool _is_default_instance_; |
::google::protobuf::RepeatedPtrField< ::std::string> paths_; |
mutable int _cached_size_; |
- friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2ffield_5fmask_2eproto_impl(); |
- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2ffield_5fmask_2eproto_impl(); |
- friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2ffield_5fmask_2eproto(); |
+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2ffield_5fmask_2eproto(); |
+ friend void protobuf_AssignDesc_google_2fprotobuf_2ffield_5fmask_2eproto(); |
friend void protobuf_ShutdownFile_google_2fprotobuf_2ffield_5fmask_2eproto(); |
+ void InitAsDefaultInstance(); |
+ static FieldMask* default_instance_; |
}; |
// =================================================================== |
@@ -206,7 +194,6 @@ FieldMask::mutable_paths() { |
// @@protoc_insertion_point(namespace_scope) |
- |
} // namespace protobuf |
} // namespace google |