From 59b938b715ac662ae54d02113fe32babe4eb0361 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Mon, 8 Apr 2024 17:18:48 +0000 Subject: [PATCH] Auto-generate files after cl/622879398 --- php/ext/google/protobuf/php-upb.c | 6 +++--- php/ext/google/protobuf/php-upb.h | 20 ++++++-------------- ruby/ext/google/protobuf_c/ruby-upb.c | 6 +++--- ruby/ext/google/protobuf_c/ruby-upb.h | 20 ++++++-------------- 4 files changed, 18 insertions(+), 34 deletions(-) diff --git a/php/ext/google/protobuf/php-upb.c b/php/ext/google/protobuf/php-upb.c index 3e38b61d72..363da932e5 100644 --- a/php/ext/google/protobuf/php-upb.c +++ b/php/ext/google/protobuf/php-upb.c @@ -6352,9 +6352,9 @@ static upb_MiniTableEnum* upb_MtDecoder_BuildMiniTableEnum( return upb_MtDecoder_DoBuildMiniTableEnum(decoder, data, len); } -upb_MiniTableEnum* upb_MiniDescriptor_BuildEnum(const char* data, size_t len, - upb_Arena* arena, - upb_Status* status) { +upb_MiniTableEnum* upb_MiniTableEnum_Build(const char* data, size_t len, + upb_Arena* arena, + upb_Status* status) { upb_MdEnumDecoder decoder = { .base = { diff --git a/php/ext/google/protobuf/php-upb.h b/php/ext/google/protobuf/php-upb.h index 1ca36be00c..07339bd476 100644 --- a/php/ext/google/protobuf/php-upb.h +++ b/php/ext/google/protobuf/php-upb.h @@ -3661,6 +3661,7 @@ UPB_INLINE void _upb_msg_map_set_value(void* msg, const void* val, // Export the newer headers, for legacy users. New users should include the // more specific headers directly. // IWYU pragma: begin_exports + #ifndef UPB_MINI_DESCRIPTOR_BUILD_ENUM_H_ #define UPB_MINI_DESCRIPTOR_BUILD_ENUM_H_ @@ -3671,20 +3672,11 @@ UPB_INLINE void _upb_msg_map_set_value(void* msg, const void* val, extern "C" { #endif -// Builds a upb_MiniTableEnum from an enum MiniDescriptor. The MiniDescriptor -// must be for an enum, not a message. -UPB_API upb_MiniTableEnum* upb_MiniDescriptor_BuildEnum(const char* data, - size_t len, - upb_Arena* arena, - upb_Status* status); - -// TODO: Deprecated name; update callers. -UPB_API_INLINE upb_MiniTableEnum* upb_MiniTableEnum_Build(const char* data, - size_t len, - upb_Arena* arena, - upb_Status* status) { - return upb_MiniDescriptor_BuildEnum(data, len, arena, status); -} +// Builds a upb_MiniTableEnum from an enum mini descriptor. +// The mini descriptor must be for an enum, not a message. +UPB_API upb_MiniTableEnum* upb_MiniTableEnum_Build(const char* data, size_t len, + upb_Arena* arena, + upb_Status* status); #ifdef __cplusplus } /* extern "C" */ diff --git a/ruby/ext/google/protobuf_c/ruby-upb.c b/ruby/ext/google/protobuf_c/ruby-upb.c index 33b9de72c1..d83b238e22 100644 --- a/ruby/ext/google/protobuf_c/ruby-upb.c +++ b/ruby/ext/google/protobuf_c/ruby-upb.c @@ -5845,9 +5845,9 @@ static upb_MiniTableEnum* upb_MtDecoder_BuildMiniTableEnum( return upb_MtDecoder_DoBuildMiniTableEnum(decoder, data, len); } -upb_MiniTableEnum* upb_MiniDescriptor_BuildEnum(const char* data, size_t len, - upb_Arena* arena, - upb_Status* status) { +upb_MiniTableEnum* upb_MiniTableEnum_Build(const char* data, size_t len, + upb_Arena* arena, + upb_Status* status) { upb_MdEnumDecoder decoder = { .base = { diff --git a/ruby/ext/google/protobuf_c/ruby-upb.h b/ruby/ext/google/protobuf_c/ruby-upb.h index 11dfc38284..15fc3a73cf 100755 --- a/ruby/ext/google/protobuf_c/ruby-upb.h +++ b/ruby/ext/google/protobuf_c/ruby-upb.h @@ -3663,6 +3663,7 @@ UPB_INLINE void _upb_msg_map_set_value(void* msg, const void* val, // Export the newer headers, for legacy users. New users should include the // more specific headers directly. // IWYU pragma: begin_exports + #ifndef UPB_MINI_DESCRIPTOR_BUILD_ENUM_H_ #define UPB_MINI_DESCRIPTOR_BUILD_ENUM_H_ @@ -3673,20 +3674,11 @@ UPB_INLINE void _upb_msg_map_set_value(void* msg, const void* val, extern "C" { #endif -// Builds a upb_MiniTableEnum from an enum MiniDescriptor. The MiniDescriptor -// must be for an enum, not a message. -UPB_API upb_MiniTableEnum* upb_MiniDescriptor_BuildEnum(const char* data, - size_t len, - upb_Arena* arena, - upb_Status* status); - -// TODO: Deprecated name; update callers. -UPB_API_INLINE upb_MiniTableEnum* upb_MiniTableEnum_Build(const char* data, - size_t len, - upb_Arena* arena, - upb_Status* status) { - return upb_MiniDescriptor_BuildEnum(data, len, arena, status); -} +// Builds a upb_MiniTableEnum from an enum mini descriptor. +// The mini descriptor must be for an enum, not a message. +UPB_API upb_MiniTableEnum* upb_MiniTableEnum_Build(const char* data, size_t len, + upb_Arena* arena, + upb_Status* status); #ifdef __cplusplus } /* extern "C" */