From 33a6db18eac2a3ef1262f5c99c55d7c7b471d314 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Wed, 11 Dec 2024 14:32:26 -0800 Subject: [PATCH] IWYU & clang-tidy fixes in reflection_internal.h PiperOrigin-RevId: 705243129 --- src/google/protobuf/reflection_internal.h | 38 ++++++++++++++--------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/src/google/protobuf/reflection_internal.h b/src/google/protobuf/reflection_internal.h index 6d8008801977..4ae8d34cfae3 100644 --- a/src/google/protobuf/reflection_internal.h +++ b/src/google/protobuf/reflection_internal.h @@ -8,14 +8,20 @@ #ifndef GOOGLE_PROTOBUF_REFLECTION_INTERNAL_H__ #define GOOGLE_PROTOBUF_REFLECTION_INTERNAL_H__ +#include +#include + +#include "absl/log/absl_check.h" #include "absl/strings/cord.h" #include "google/protobuf/map_field.h" #include "google/protobuf/reflection.h" #include "google/protobuf/repeated_field.h" +#include "google/protobuf/repeated_ptr_field.h" namespace google { namespace protobuf { namespace internal { + // A base class for RepeatedFieldAccessor implementations that can support // random-access efficiently. All iterator methods delegates the work to // corresponding random-access methods. @@ -64,7 +70,7 @@ class RandomAccessRepeatedFieldAccessor : public RepeatedFieldAccessor { template class RepeatedFieldWrapper : public RandomAccessRepeatedFieldAccessor { public: - RepeatedFieldWrapper() {} + RepeatedFieldWrapper() = default; bool IsEmpty(const Field* data) const override { return GetRepeatedField(data)->empty(); } @@ -188,7 +194,7 @@ class RepeatedPtrFieldWrapper : public RandomAccessRepeatedFieldAccessor { // MapFieldBase. class MapFieldAccessor final : public RandomAccessRepeatedFieldAccessor { public: - MapFieldAccessor() {} + MapFieldAccessor() = default; virtual ~MapFieldAccessor() {} bool IsEmpty(const Field* data) const override { return GetRepeatedField(data)->empty(); @@ -227,10 +233,11 @@ class MapFieldAccessor final : public RandomAccessRepeatedFieldAccessor { } protected: - typedef RepeatedPtrField RepeatedFieldType; + using RepeatedFieldType = RepeatedPtrField; + static const RepeatedFieldType* GetRepeatedField(const Field* data) { return reinterpret_cast( - (&reinterpret_cast(data)->GetRepeatedField())); + &(reinterpret_cast(data)->GetRepeatedField())); } static RepeatedFieldType* MutableRepeatedField(Field* data) { return reinterpret_cast( @@ -255,12 +262,13 @@ class MapFieldAccessor final : public RandomAccessRepeatedFieldAccessor { // Default implementations of RepeatedFieldAccessor for primitive types. template class RepeatedFieldPrimitiveAccessor final : public RepeatedFieldWrapper { - typedef void Field; - typedef void Value; + using Field = void; + using Value = void; + using RepeatedFieldWrapper::MutableRepeatedField; public: - RepeatedFieldPrimitiveAccessor() {} + RepeatedFieldPrimitiveAccessor() = default; void Swap(Field* data, const internal::RepeatedFieldAccessor* other_mutator, Field* other_data) const override { // Currently RepeatedFieldPrimitiveAccessor is the only implementation of @@ -284,12 +292,13 @@ class RepeatedFieldPrimitiveAccessor final : public RepeatedFieldWrapper { // ctype=STRING. class RepeatedPtrFieldStringAccessor final : public RepeatedPtrFieldWrapper { - typedef void Field; - typedef void Value; + using Field = void; + using Value = void; + using RepeatedFieldAccessor::Add; public: - RepeatedPtrFieldStringAccessor() {} + RepeatedPtrFieldStringAccessor() = default; void Swap(Field* data, const internal::RepeatedFieldAccessor* other_mutator, Field* other_data) const override { if (this == other_mutator) { @@ -323,14 +332,14 @@ class RepeatedPtrFieldStringAccessor final class RepeatedPtrFieldMessageAccessor final : public RepeatedPtrFieldWrapper { - typedef void Field; - typedef void Value; + using Field = void; + using Value = void; public: - RepeatedPtrFieldMessageAccessor() {} + RepeatedPtrFieldMessageAccessor() = default; void Swap(Field* data, const internal::RepeatedFieldAccessor* other_mutator, Field* other_data) const override { - ABSL_CHECK(this == other_mutator); + ABSL_CHECK_EQ(this, other_mutator); MutableRepeatedField(data)->Swap(MutableRepeatedField(other_data)); } @@ -346,6 +355,7 @@ class RepeatedPtrFieldMessageAccessor final return static_cast(&value); } }; + } // namespace internal } // namespace protobuf } // namespace google