Index: third_party/protobuf/src/google/protobuf/any.pb.h |
diff --git a/third_party/protobuf/src/google/protobuf/any.pb.h b/third_party/protobuf/src/google/protobuf/any.pb.h |
index 100a67f61261bfa2da0ba7c351b238fd28c23595..0d8deab6ab7c26f7a99aa45645f3f8a5bb925565 100644 |
--- a/third_party/protobuf/src/google/protobuf/any.pb.h |
+++ b/third_party/protobuf/src/google/protobuf/any.pb.h |
@@ -8,12 +8,12 @@ |
#include <google/protobuf/stubs/common.h> |
-#if GOOGLE_PROTOBUF_VERSION < 3000000 |
+#if GOOGLE_PROTOBUF_VERSION < 3001000 |
#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 3000000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION |
+#if 3001000 < 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,25 +24,29 @@ |
#include <google/protobuf/generated_message_util.h> |
#include <google/protobuf/metadata.h> |
#include <google/protobuf/message.h> |
-#include <google/protobuf/repeated_field.h> |
-#include <google/protobuf/extension_set.h> |
+#include <google/protobuf/repeated_field.h> // IWYU pragma: export |
+#include <google/protobuf/extension_set.h> // IWYU pragma: export |
#include <google/protobuf/unknown_field_set.h> |
#include <google/protobuf/any.h> |
// @@protoc_insertion_point(includes) |
+namespace google { |
+namespace protobuf { |
+class Any; |
+class AnyDefaultTypeInternal; |
+LIBPROTOBUF_EXPORT extern AnyDefaultTypeInternal _Any_default_instance_; |
+} // namespace protobuf |
+} // namespace google |
namespace google { |
namespace protobuf { |
// Internal implementation detail -- do not call these. |
void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fany_2eproto(); |
-void protobuf_AssignDesc_google_2fprotobuf_2fany_2eproto(); |
-void protobuf_ShutdownFile_google_2fprotobuf_2fany_2eproto(); |
- |
-class Any; |
+void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fany_2eproto(); |
// =================================================================== |
-class LIBPROTOBUF_EXPORT Any : public ::google::protobuf::Message { |
+class LIBPROTOBUF_EXPORT Any : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:google.protobuf.Any) */ { |
public: |
Any(); |
virtual ~Any(); |
@@ -57,6 +61,11 @@ class LIBPROTOBUF_EXPORT Any : public ::google::protobuf::Message { |
static const ::google::protobuf::Descriptor* descriptor(); |
static const Any& default_instance(); |
+ static inline const Any* internal_default_instance() { |
+ return reinterpret_cast<const Any*>( |
+ &_Any_default_instance_); |
+ } |
+ |
// implements Any ----------------------------------------------- |
void PackFrom(const ::google::protobuf::Message& message); |
@@ -71,44 +80,49 @@ class LIBPROTOBUF_EXPORT Any : public ::google::protobuf::Message { |
// implements Message ---------------------------------------------- |
- inline Any* New() const { return New(NULL); } |
+ inline Any* New() const PROTOBUF_FINAL { return New(NULL); } |
- Any* New(::google::protobuf::Arena* arena) const; |
- void CopyFrom(const ::google::protobuf::Message& from); |
- void MergeFrom(const ::google::protobuf::Message& from); |
+ Any* 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; |
void CopyFrom(const Any& from); |
void MergeFrom(const Any& from); |
- void Clear(); |
- bool IsInitialized() const; |
+ void Clear() PROTOBUF_FINAL; |
+ bool IsInitialized() const PROTOBUF_FINAL; |
- int ByteSize() const; |
+ size_t ByteSizeLong() const PROTOBUF_FINAL; |
bool MergePartialFromCodedStream( |
- ::google::protobuf::io::CodedInputStream* input); |
+ ::google::protobuf::io::CodedInputStream* input) PROTOBUF_FINAL; |
void SerializeWithCachedSizes( |
- ::google::protobuf::io::CodedOutputStream* output) const; |
- ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const; |
- int GetCachedSize() const { return _cached_size_; } |
+ ::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_; } |
private: |
void SharedCtor(); |
void SharedDtor(); |
- void SetCachedSize(int size) const; |
+ void SetCachedSize(int size) const PROTOBUF_FINAL; |
void InternalSwap(Any* other); |
private: |
inline ::google::protobuf::Arena* GetArenaNoVirtual() const { |
- return _internal_metadata_.arena(); |
+ return NULL; |
} |
inline void* MaybeArenaPtr() const { |
- return _internal_metadata_.raw_arena_ptr(); |
+ return NULL; |
} |
public: |
- ::google::protobuf::Metadata GetMetadata() const; |
+ ::google::protobuf::Metadata GetMetadata() const PROTOBUF_FINAL; |
// nested types ---------------------------------------------------- |
// accessors ------------------------------------------------------- |
- // optional string type_url = 1; |
+ // string type_url = 1; |
void clear_type_url(); |
static const int kTypeUrlFieldNumber = 1; |
const ::std::string& type_url() const; |
@@ -119,7 +133,7 @@ class LIBPROTOBUF_EXPORT Any : public ::google::protobuf::Message { |
::std::string* release_type_url(); |
void set_allocated_type_url(::std::string* type_url); |
- // optional bytes value = 2; |
+ // bytes value = 2; |
void clear_value(); |
static const int kValueFieldNumber = 2; |
const ::std::string& value() const; |
@@ -134,17 +148,15 @@ class LIBPROTOBUF_EXPORT Any : public ::google::protobuf::Message { |
private: |
::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_; |
- bool _is_default_instance_; |
::google::protobuf::internal::ArenaStringPtr type_url_; |
::google::protobuf::internal::ArenaStringPtr value_; |
mutable int _cached_size_; |
::google::protobuf::internal::AnyMetadata _any_metadata_; |
- friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fany_2eproto(); |
- friend void protobuf_AssignDesc_google_2fprotobuf_2fany_2eproto(); |
+ friend void LIBPROTOBUF_EXPORT protobuf_InitDefaults_google_2fprotobuf_2fany_2eproto_impl(); |
+ friend void LIBPROTOBUF_EXPORT protobuf_AddDesc_google_2fprotobuf_2fany_2eproto_impl(); |
+ friend const ::google::protobuf::uint32* protobuf_Offsets_google_2fprotobuf_2fany_2eproto(); |
friend void protobuf_ShutdownFile_google_2fprotobuf_2fany_2eproto(); |
- void InitAsDefaultInstance(); |
- static Any* default_instance_; |
}; |
// =================================================================== |
@@ -154,13 +166,13 @@ class LIBPROTOBUF_EXPORT Any : public ::google::protobuf::Message { |
#if !PROTOBUF_INLINE_NOT_IN_HEADERS |
// Any |
-// optional string type_url = 1; |
+// string type_url = 1; |
inline void Any::clear_type_url() { |
type_url_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline const ::std::string& Any::type_url() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Any.type_url) |
- return type_url_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
+ return type_url_.GetNoArena(); |
} |
inline void Any::set_type_url(const ::std::string& value) { |
@@ -198,13 +210,13 @@ inline void Any::set_allocated_type_url(::std::string* type_url) { |
// @@protoc_insertion_point(field_set_allocated:google.protobuf.Any.type_url) |
} |
-// optional bytes value = 2; |
+// bytes value = 2; |
inline void Any::clear_value() { |
value_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
} |
inline const ::std::string& Any::value() const { |
// @@protoc_insertion_point(field_get:google.protobuf.Any.value) |
- return value_.GetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited()); |
+ return value_.GetNoArena(); |
} |
inline void Any::set_value(const ::std::string& value) { |
@@ -246,6 +258,7 @@ inline void Any::set_allocated_value(::std::string* value) { |
// @@protoc_insertion_point(namespace_scope) |
+ |
} // namespace protobuf |
} // namespace google |