From adc87181508d7a66d056a60a2b7896d18fd20613 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Wed, 30 Oct 2024 15:37:23 +0000 Subject: [PATCH] Auto-generate files after cl/691426487 --- src/google/protobuf/struct.pb.h | 8 ++++--- src/google/protobuf/type.pb.cc | 41 --------------------------------- src/google/protobuf/type.pb.h | 24 +++++++++++-------- 3 files changed, 20 insertions(+), 53 deletions(-) diff --git a/src/google/protobuf/struct.pb.h b/src/google/protobuf/struct.pb.h index bdedab5774..34d457f9b5 100644 --- a/src/google/protobuf/struct.pb.h +++ b/src/google/protobuf/struct.pb.h @@ -94,9 +94,11 @@ enum NullValue : int { PROTOBUF_EXPORT bool NullValue_IsValid(int value); PROTOBUF_EXPORT extern const uint32_t NullValue_internal_data_[]; -constexpr NullValue NullValue_MIN = static_cast(0); -constexpr NullValue NullValue_MAX = static_cast(0); -constexpr int NullValue_ARRAYSIZE = 0 + 1; +inline constexpr NullValue NullValue_MIN = + static_cast(0); +inline constexpr NullValue NullValue_MAX = + static_cast(0); +inline constexpr int NullValue_ARRAYSIZE = 0 + 1; PROTOBUF_EXPORT const ::google::protobuf::EnumDescriptor* NullValue_descriptor(); template diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc index 8c61867bdf..f554b50827 100644 --- a/src/google/protobuf/type.pb.cc +++ b/src/google/protobuf/type.pb.cc @@ -380,34 +380,6 @@ PROTOBUF_CONSTINIT const uint32_t Field_Kind_internal_data_[] = { bool Field_Kind_IsValid(int value) { return 0 <= value && value <= 18; } -#if (__cplusplus < 201703) && \ - (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912)) - -constexpr Field_Kind Field::TYPE_UNKNOWN; -constexpr Field_Kind Field::TYPE_DOUBLE; -constexpr Field_Kind Field::TYPE_FLOAT; -constexpr Field_Kind Field::TYPE_INT64; -constexpr Field_Kind Field::TYPE_UINT64; -constexpr Field_Kind Field::TYPE_INT32; -constexpr Field_Kind Field::TYPE_FIXED64; -constexpr Field_Kind Field::TYPE_FIXED32; -constexpr Field_Kind Field::TYPE_BOOL; -constexpr Field_Kind Field::TYPE_STRING; -constexpr Field_Kind Field::TYPE_GROUP; -constexpr Field_Kind Field::TYPE_MESSAGE; -constexpr Field_Kind Field::TYPE_BYTES; -constexpr Field_Kind Field::TYPE_UINT32; -constexpr Field_Kind Field::TYPE_ENUM; -constexpr Field_Kind Field::TYPE_SFIXED32; -constexpr Field_Kind Field::TYPE_SFIXED64; -constexpr Field_Kind Field::TYPE_SINT32; -constexpr Field_Kind Field::TYPE_SINT64; -constexpr Field_Kind Field::Kind_MIN; -constexpr Field_Kind Field::Kind_MAX; -constexpr int Field::Kind_ARRAYSIZE; - -#endif // (__cplusplus < 201703) && - // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912)) const ::google::protobuf::EnumDescriptor* Field_Cardinality_descriptor() { ::google::protobuf::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2ftype_2eproto); return file_level_enum_descriptors_google_2fprotobuf_2ftype_2eproto[1]; @@ -417,19 +389,6 @@ PROTOBUF_CONSTINIT const uint32_t Field_Cardinality_internal_data_[] = { bool Field_Cardinality_IsValid(int value) { return 0 <= value && value <= 3; } -#if (__cplusplus < 201703) && \ - (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912)) - -constexpr Field_Cardinality Field::CARDINALITY_UNKNOWN; -constexpr Field_Cardinality Field::CARDINALITY_OPTIONAL; -constexpr Field_Cardinality Field::CARDINALITY_REQUIRED; -constexpr Field_Cardinality Field::CARDINALITY_REPEATED; -constexpr Field_Cardinality Field::Cardinality_MIN; -constexpr Field_Cardinality Field::Cardinality_MAX; -constexpr int Field::Cardinality_ARRAYSIZE; - -#endif // (__cplusplus < 201703) && - // (!defined(_MSC_VER) || (_MSC_VER >= 1900 && _MSC_VER < 1912)) const ::google::protobuf::EnumDescriptor* Syntax_descriptor() { ::google::protobuf::internal::AssignDescriptors(&descriptor_table_google_2fprotobuf_2ftype_2eproto); return file_level_enum_descriptors_google_2fprotobuf_2ftype_2eproto[2]; diff --git a/src/google/protobuf/type.pb.h b/src/google/protobuf/type.pb.h index 3a6f5efc3b..d78440d8ed 100644 --- a/src/google/protobuf/type.pb.h +++ b/src/google/protobuf/type.pb.h @@ -127,9 +127,11 @@ enum Field_Kind : int { PROTOBUF_EXPORT bool Field_Kind_IsValid(int value); PROTOBUF_EXPORT extern const uint32_t Field_Kind_internal_data_[]; -constexpr Field_Kind Field_Kind_Kind_MIN = static_cast(0); -constexpr Field_Kind Field_Kind_Kind_MAX = static_cast(18); -constexpr int Field_Kind_Kind_ARRAYSIZE = 18 + 1; +inline constexpr Field_Kind Field_Kind_Kind_MIN = + static_cast(0); +inline constexpr Field_Kind Field_Kind_Kind_MAX = + static_cast(18); +inline constexpr int Field_Kind_Kind_ARRAYSIZE = 18 + 1; PROTOBUF_EXPORT const ::google::protobuf::EnumDescriptor* Field_Kind_descriptor(); template @@ -162,9 +164,11 @@ enum Field_Cardinality : int { PROTOBUF_EXPORT bool Field_Cardinality_IsValid(int value); PROTOBUF_EXPORT extern const uint32_t Field_Cardinality_internal_data_[]; -constexpr Field_Cardinality Field_Cardinality_Cardinality_MIN = static_cast(0); -constexpr Field_Cardinality Field_Cardinality_Cardinality_MAX = static_cast(3); -constexpr int Field_Cardinality_Cardinality_ARRAYSIZE = 3 + 1; +inline constexpr Field_Cardinality Field_Cardinality_Cardinality_MIN = + static_cast(0); +inline constexpr Field_Cardinality Field_Cardinality_Cardinality_MAX = + static_cast(3); +inline constexpr int Field_Cardinality_Cardinality_ARRAYSIZE = 3 + 1; PROTOBUF_EXPORT const ::google::protobuf::EnumDescriptor* Field_Cardinality_descriptor(); template @@ -196,9 +200,11 @@ enum Syntax : int { PROTOBUF_EXPORT bool Syntax_IsValid(int value); PROTOBUF_EXPORT extern const uint32_t Syntax_internal_data_[]; -constexpr Syntax Syntax_MIN = static_cast(0); -constexpr Syntax Syntax_MAX = static_cast(2); -constexpr int Syntax_ARRAYSIZE = 2 + 1; +inline constexpr Syntax Syntax_MIN = + static_cast(0); +inline constexpr Syntax Syntax_MAX = + static_cast(2); +inline constexpr int Syntax_ARRAYSIZE = 2 + 1; PROTOBUF_EXPORT const ::google::protobuf::EnumDescriptor* Syntax_descriptor(); template