Auto-generate files after cl/568651768

pull/14190/head
Protobuf Team Bot 1 year ago
parent 501ececd39
commit 06310353a2
  1. 8
      php/ext/google/protobuf/php-upb.c
  2. 36
      php/ext/google/protobuf/php-upb.h
  3. 8
      ruby/ext/google/protobuf_c/ruby-upb.c
  4. 36
      ruby/ext/google/protobuf_c/ruby-upb.h
  5. 6
      upb/cmake/google/protobuf/descriptor.upb.h
  6. 6
      upb/cmake/google/protobuf/descriptor.upb_minitable.c
  7. 6
      upb/cmake/google/protobuf/descriptor.upb_minitable.h

@ -8,17 +8,17 @@
*
* The correct usage is:
*
* #include "upb/upb/foobar.h"
* #include "upb/upb/baz.h"
* #include "upb/foobar.h"
* #include "upb/baz.h"
*
* // MUST be last included header.
* #include "upb/upb/port/def.inc"
* #include "upb/port/def.inc"
*
* // Code for this file.
* // <...>
*
* // Can be omitted for .c files, required for .h.
* #include "upb/upb/port/undef.inc"
* #include "upb/port/undef.inc"
*
* This file is private and must not be included by users!
*/

@ -7,17 +7,17 @@
*
* The correct usage is:
*
* #include "upb/upb/foobar.h"
* #include "upb/upb/baz.h"
* #include "upb/foobar.h"
* #include "upb/baz.h"
*
* // MUST be last included header.
* #include "upb/upb/port/def.inc"
* #include "upb/port/def.inc"
*
* // Code for this file.
* // <...>
*
* // Can be omitted for .c files, required for .h.
* #include "upb/upb/port/undef.inc"
* #include "upb/port/undef.inc"
*
* This file is private and must not be included by users!
*/
@ -639,7 +639,7 @@ UPB_API_INLINE upb_Arena* upb_Arena_New(void) {
#endif /* UPB_MEM_ARENA_H_ */
// Users should include array.h or map.h instead.
// IWYU pragma: private, include "upb/upb/collections/array.h"
// IWYU pragma: private, include "upb/collections/array.h"
#ifndef UPB_MESSAGE_VALUE_H_
#define UPB_MESSAGE_VALUE_H_
@ -3791,13 +3791,13 @@ extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout;
// IWYU pragma: begin_exports
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_DEF_POOL_H_
#define UPB_REFLECTION_DEF_POOL_H_
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
// Declarations common to all public def types.
@ -10354,7 +10354,7 @@ const upb_FieldDef** upb_DefPool_GetAllExtensions(const upb_DefPool* s,
#endif /* UPB_REFLECTION_DEF_POOL_H_ */
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_ENUM_DEF_H_
#define UPB_REFLECTION_ENUM_DEF_H_
@ -10404,7 +10404,7 @@ UPB_API int upb_EnumDef_ValueCount(const upb_EnumDef* e);
#endif /* UPB_REFLECTION_ENUM_DEF_H_ */
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_ENUM_VALUE_DEF_H_
#define UPB_REFLECTION_ENUM_VALUE_DEF_H_
@ -10432,7 +10432,7 @@ const UPB_DESC(EnumValueOptions) *
#endif /* UPB_REFLECTION_ENUM_VALUE_DEF_H_ */
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_EXTENSION_RANGE_H_
#define UPB_REFLECTION_EXTENSION_RANGE_H_
@ -10458,7 +10458,7 @@ const UPB_DESC(ExtensionRangeOptions) *
#endif /* UPB_REFLECTION_EXTENSION_RANGE_H_ */
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_FIELD_DEF_H_
#define UPB_REFLECTION_FIELD_DEF_H_
@ -10522,7 +10522,7 @@ UPB_API upb_FieldType upb_FieldDef_Type(const upb_FieldDef* f);
#endif /* UPB_REFLECTION_FIELD_DEF_H_ */
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_FILE_DEF_H_
#define UPB_REFLECTION_FILE_DEF_H_
@ -10570,7 +10570,7 @@ int upb_FileDef_WeakDependencyCount(const upb_FileDef* f);
#endif /* UPB_REFLECTION_FILE_DEF_H_ */
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_MESSAGE_DEF_H_
#define UPB_REFLECTION_MESSAGE_DEF_H_
@ -10716,7 +10716,7 @@ UPB_API upb_WellKnown upb_MessageDef_WellKnownType(const upb_MessageDef* m);
#endif /* UPB_REFLECTION_MESSAGE_DEF_H_ */
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_METHOD_DEF_H_
#define UPB_REFLECTION_METHOD_DEF_H_
@ -10746,7 +10746,7 @@ const upb_ServiceDef* upb_MethodDef_Service(const upb_MethodDef* m);
#endif /* UPB_REFLECTION_METHOD_DEF_H_ */
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_ONEOF_DEF_H_
#define UPB_REFLECTION_ONEOF_DEF_H_
@ -10784,7 +10784,7 @@ const UPB_DESC(OneofOptions) * upb_OneofDef_Options(const upb_OneofDef* o);
#endif /* UPB_REFLECTION_ONEOF_DEF_H_ */
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_SERVICE_DEF_H_
#define UPB_REFLECTION_SERVICE_DEF_H_
@ -12831,7 +12831,7 @@ bool _upb_DescState_Grow(upb_DescState* d, upb_Arena* a);
#define UPB_REFLECTION_ENUM_RESERVED_RANGE_INTERNAL_H_
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_ENUM_RESERVED_RANGE_H_
#define UPB_REFLECTION_ENUM_RESERVED_RANGE_H_
@ -12955,7 +12955,7 @@ size_t _upb_OneofDefs_Finalize(upb_DefBuilder* ctx, upb_MessageDef* m);
#define UPB_REFLECTION_MESSAGE_RESERVED_RANGE_INTERNAL_H_
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_MESSAGE_RESERVED_RANGE_H_
#define UPB_REFLECTION_MESSAGE_RESERVED_RANGE_H_

@ -8,17 +8,17 @@
*
* The correct usage is:
*
* #include "upb/upb/foobar.h"
* #include "upb/upb/baz.h"
* #include "upb/foobar.h"
* #include "upb/baz.h"
*
* // MUST be last included header.
* #include "upb/upb/port/def.inc"
* #include "upb/port/def.inc"
*
* // Code for this file.
* // <...>
*
* // Can be omitted for .c files, required for .h.
* #include "upb/upb/port/undef.inc"
* #include "upb/port/undef.inc"
*
* This file is private and must not be included by users!
*/

@ -9,17 +9,17 @@
*
* The correct usage is:
*
* #include "upb/upb/foobar.h"
* #include "upb/upb/baz.h"
* #include "upb/foobar.h"
* #include "upb/baz.h"
*
* // MUST be last included header.
* #include "upb/upb/port/def.inc"
* #include "upb/port/def.inc"
*
* // Code for this file.
* // <...>
*
* // Can be omitted for .c files, required for .h.
* #include "upb/upb/port/undef.inc"
* #include "upb/port/undef.inc"
*
* This file is private and must not be included by users!
*/
@ -641,7 +641,7 @@ UPB_API_INLINE upb_Arena* upb_Arena_New(void) {
#endif /* UPB_MEM_ARENA_H_ */
// Users should include array.h or map.h instead.
// IWYU pragma: private, include "upb/upb/collections/array.h"
// IWYU pragma: private, include "upb/collections/array.h"
#ifndef UPB_MESSAGE_VALUE_H_
#define UPB_MESSAGE_VALUE_H_
@ -4266,13 +4266,13 @@ void upb_inttable_removeiter(upb_inttable* t, intptr_t* iter);
// IWYU pragma: begin_exports
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_DEF_POOL_H_
#define UPB_REFLECTION_DEF_POOL_H_
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
// Declarations common to all public def types.
@ -10829,7 +10829,7 @@ const upb_FieldDef** upb_DefPool_GetAllExtensions(const upb_DefPool* s,
#endif /* UPB_REFLECTION_DEF_POOL_H_ */
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_ENUM_DEF_H_
#define UPB_REFLECTION_ENUM_DEF_H_
@ -10879,7 +10879,7 @@ UPB_API int upb_EnumDef_ValueCount(const upb_EnumDef* e);
#endif /* UPB_REFLECTION_ENUM_DEF_H_ */
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_ENUM_VALUE_DEF_H_
#define UPB_REFLECTION_ENUM_VALUE_DEF_H_
@ -10907,7 +10907,7 @@ const UPB_DESC(EnumValueOptions) *
#endif /* UPB_REFLECTION_ENUM_VALUE_DEF_H_ */
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_EXTENSION_RANGE_H_
#define UPB_REFLECTION_EXTENSION_RANGE_H_
@ -10933,7 +10933,7 @@ const UPB_DESC(ExtensionRangeOptions) *
#endif /* UPB_REFLECTION_EXTENSION_RANGE_H_ */
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_FIELD_DEF_H_
#define UPB_REFLECTION_FIELD_DEF_H_
@ -10997,7 +10997,7 @@ UPB_API upb_FieldType upb_FieldDef_Type(const upb_FieldDef* f);
#endif /* UPB_REFLECTION_FIELD_DEF_H_ */
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_FILE_DEF_H_
#define UPB_REFLECTION_FILE_DEF_H_
@ -11045,7 +11045,7 @@ int upb_FileDef_WeakDependencyCount(const upb_FileDef* f);
#endif /* UPB_REFLECTION_FILE_DEF_H_ */
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_MESSAGE_DEF_H_
#define UPB_REFLECTION_MESSAGE_DEF_H_
@ -11191,7 +11191,7 @@ UPB_API upb_WellKnown upb_MessageDef_WellKnownType(const upb_MessageDef* m);
#endif /* UPB_REFLECTION_MESSAGE_DEF_H_ */
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_METHOD_DEF_H_
#define UPB_REFLECTION_METHOD_DEF_H_
@ -11221,7 +11221,7 @@ const upb_ServiceDef* upb_MethodDef_Service(const upb_MethodDef* m);
#endif /* UPB_REFLECTION_METHOD_DEF_H_ */
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_ONEOF_DEF_H_
#define UPB_REFLECTION_ONEOF_DEF_H_
@ -11259,7 +11259,7 @@ const UPB_DESC(OneofOptions) * upb_OneofDef_Options(const upb_OneofDef* o);
#endif /* UPB_REFLECTION_ONEOF_DEF_H_ */
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_SERVICE_DEF_H_
#define UPB_REFLECTION_SERVICE_DEF_H_
@ -12648,7 +12648,7 @@ bool _upb_DescState_Grow(upb_DescState* d, upb_Arena* a);
#define UPB_REFLECTION_ENUM_RESERVED_RANGE_INTERNAL_H_
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_ENUM_RESERVED_RANGE_H_
#define UPB_REFLECTION_ENUM_RESERVED_RANGE_H_
@ -12772,7 +12772,7 @@ size_t _upb_OneofDefs_Finalize(upb_DefBuilder* ctx, upb_MessageDef* m);
#define UPB_REFLECTION_MESSAGE_RESERVED_RANGE_INTERNAL_H_
// IWYU pragma: private, include "upb/upb/reflection/def.h"
// IWYU pragma: private, include "upb/reflection/def.h"
#ifndef UPB_REFLECTION_MESSAGE_RESERVED_RANGE_H_
#define UPB_REFLECTION_MESSAGE_RESERVED_RANGE_H_

@ -9,12 +9,12 @@
#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_
#include "upb/upb/generated_code_support.h"
#include "upb/generated_code_support.h"
#include "google/protobuf/descriptor.upb_minitable.h"
// Must be last.
#include "upb/upb/port/def.inc"
#include "upb/port/def.inc"
#ifdef __cplusplus
extern "C" {
@ -6391,6 +6391,6 @@ UPB_INLINE void google_protobuf_GeneratedCodeInfo_Annotation_set_semantic(google
} /* extern "C" */
#endif
#include "upb/upb/port/undef.inc"
#include "upb/port/undef.inc"
#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_H_ */

@ -7,11 +7,11 @@
* regenerated. */
#include <stddef.h>
#include "upb/upb/generated_code_support.h"
#include "upb/generated_code_support.h"
#include "google/protobuf/descriptor.upb_minitable.h"
// Must be last.
#include "upb/upb/port/def.inc"
#include "upb/port/def.inc"
static const upb_MiniTableSub google_protobuf_FileDescriptorSet_submsgs[1] = {
{.submsg = &google_protobuf_FileDescriptorProto_msg_init},
@ -1352,5 +1352,5 @@ const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout = {
0,
};
#include "upb/upb/port/undef.inc"
#include "upb/port/undef.inc"

@ -9,10 +9,10 @@
#ifndef GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_
#define GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_
#include "upb/upb/generated_code_support.h"
#include "upb/generated_code_support.h"
// Must be last.
#include "upb/upb/port/def.inc"
#include "upb/port/def.inc"
#ifdef __cplusplus
extern "C" {
@ -74,6 +74,6 @@ extern const upb_MiniTableFile google_protobuf_descriptor_proto_upb_file_layout;
} /* extern "C" */
#endif
#include "upb/upb/port/undef.inc"
#include "upb/port/undef.inc"
#endif /* GOOGLE_PROTOBUF_DESCRIPTOR_PROTO_UPB_MINITABLE_H_ */

Loading…
Cancel
Save