From ca575b28487343e93367e86a0d7264fb9f09e4f9 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Tue, 21 Apr 2026 22:48:06 -0700 Subject: [PATCH] Internal change PiperOrigin-RevId: 903621539 --- src/google/protobuf/arena_unittest.cc | 4 ++-- src/google/protobuf/descriptor_database.cc | 8 ++++---- src/google/protobuf/descriptor_database.h | 2 +- src/google/protobuf/descriptor_database_unittest.cc | 8 ++++---- src/google/protobuf/lite_arena_unittest.cc | 4 +++- src/google/protobuf/map_test.inc | 2 +- src/google/protobuf/message_lite.h | 2 +- src/google/protobuf/service.cc | 6 +++--- src/google/protobuf/service.h | 6 +++--- 9 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/google/protobuf/arena_unittest.cc b/src/google/protobuf/arena_unittest.cc index 4a959f634ec7e..c21de8242bb76 100644 --- a/src/google/protobuf/arena_unittest.cc +++ b/src/google/protobuf/arena_unittest.cc @@ -222,7 +222,7 @@ void TestCtorAndDtorTraits(std::vector def, TraitsProber(Arena* arena, int) : Message(nullptr, nullptr) { actions.push_back("(Arena, int)"); } - ~TraitsProber() { actions.push_back("~()"); } + ~TraitsProber() override { actions.push_back("~()"); } TraitsProber* New(Arena*) const { ABSL_LOG(FATAL); @@ -2500,7 +2500,7 @@ TEST(ArenaPtrTest, ClassIsABIEfficient) { // using clang. #if ABSL_HAVE_BUILTIN(__is_trivially_relocatable) struct ABSL_ATTRIBUTE_TRIVIAL_ABI Probe { - ~Probe() {} + ~Probe() = default; std::unique_ptr p1; void* p2; }; diff --git a/src/google/protobuf/descriptor_database.cc b/src/google/protobuf/descriptor_database.cc index b5583972cf724..bf36c00d50d99 100644 --- a/src/google/protobuf/descriptor_database.cc +++ b/src/google/protobuf/descriptor_database.cc @@ -113,8 +113,8 @@ bool DescriptorDatabase::FindAllMessageNames( // =================================================================== -SimpleDescriptorDatabase::SimpleDescriptorDatabase() {} -SimpleDescriptorDatabase::~SimpleDescriptorDatabase() {} +SimpleDescriptorDatabase::SimpleDescriptorDatabase() = default; +SimpleDescriptorDatabase::~SimpleDescriptorDatabase() = default; template bool SimpleDescriptorDatabase::DescriptorIndex::AddFile( @@ -934,7 +934,7 @@ EncodedDescriptorDatabase::~EncodedDescriptorDatabase() { DescriptorPoolDatabase::DescriptorPoolDatabase( const DescriptorPool& pool, DescriptorPoolDatabaseOptions options) : pool_(pool), options_(std::move(options)) {} -DescriptorPoolDatabase::~DescriptorPoolDatabase() {} +DescriptorPoolDatabase::~DescriptorPoolDatabase() = default; bool DescriptorPoolDatabase::FindFileByName( absl::string_view filename, FileDescriptorProto* PROTOBUF_NONNULL output) { @@ -1005,7 +1005,7 @@ MergedDescriptorDatabase::MergedDescriptorDatabase( MergedDescriptorDatabase::MergedDescriptorDatabase( const std::vector& sources) : sources_(sources) {} -MergedDescriptorDatabase::~MergedDescriptorDatabase() {} +MergedDescriptorDatabase::~MergedDescriptorDatabase() = default; bool MergedDescriptorDatabase::FindFileByName( absl::string_view filename, FileDescriptorProto* PROTOBUF_NONNULL output) { diff --git a/src/google/protobuf/descriptor_database.h b/src/google/protobuf/descriptor_database.h index ff2bccd5df69b..a3c440f8cbe47 100644 --- a/src/google/protobuf/descriptor_database.h +++ b/src/google/protobuf/descriptor_database.h @@ -57,7 +57,7 @@ class PROTOBUF_EXPORT DescriptorDatabase { using StringViewArg ABSL_DEPRECATE_AND_INLINE() = absl::string_view; public: - inline DescriptorDatabase() {} + inline DescriptorDatabase() = default; DescriptorDatabase(const DescriptorDatabase&) = delete; DescriptorDatabase& operator=(const DescriptorDatabase&) = delete; virtual ~DescriptorDatabase(); diff --git a/src/google/protobuf/descriptor_database_unittest.cc b/src/google/protobuf/descriptor_database_unittest.cc index 7c5b09b026f39..af8c7c8a645b7 100644 --- a/src/google/protobuf/descriptor_database_unittest.cc +++ b/src/google/protobuf/descriptor_database_unittest.cc @@ -60,7 +60,7 @@ static void ExpectContainsType(const FileDescriptorProto& proto, // implementations for each of the three classes we want to test. class DescriptorDatabaseTestCase { public: - virtual ~DescriptorDatabaseTestCase() {} + virtual ~DescriptorDatabaseTestCase() = default; virtual DescriptorDatabase* GetDatabase() = 0; virtual bool AddToDatabase(const FileDescriptorProto& file) = 0; @@ -76,7 +76,7 @@ class SimpleDescriptorDatabaseTestCase : public DescriptorDatabaseTestCase { return new SimpleDescriptorDatabaseTestCase; } - ~SimpleDescriptorDatabaseTestCase() override {} + ~SimpleDescriptorDatabaseTestCase() override = default; DescriptorDatabase* GetDatabase() override { return &database_; } bool AddToDatabase(const FileDescriptorProto& file) override { @@ -94,7 +94,7 @@ class EncodedDescriptorDatabaseTestCase : public DescriptorDatabaseTestCase { return new EncodedDescriptorDatabaseTestCase; } - ~EncodedDescriptorDatabaseTestCase() override {} + ~EncodedDescriptorDatabaseTestCase() override = default; DescriptorDatabase* GetDatabase() override { return &database_; } bool AddToDatabase(const FileDescriptorProto& file) override { @@ -115,7 +115,7 @@ class DescriptorPoolDatabaseTestCase : public DescriptorDatabaseTestCase { } DescriptorPoolDatabaseTestCase() : database_(pool_) {} - ~DescriptorPoolDatabaseTestCase() override {} + ~DescriptorPoolDatabaseTestCase() override = default; DescriptorDatabase* GetDatabase() override { return &database_; } bool AddToDatabase(const FileDescriptorProto& file) override { diff --git a/src/google/protobuf/lite_arena_unittest.cc b/src/google/protobuf/lite_arena_unittest.cc index 1dd685b0c3a13..d69aea6eb0856 100644 --- a/src/google/protobuf/lite_arena_unittest.cc +++ b/src/google/protobuf/lite_arena_unittest.cc @@ -5,6 +5,8 @@ // license that can be found in the LICENSE file or at // https://developers.google.com/open-source/licenses/bsd +#include + #include "absl/log/absl_check.h" #include "google/protobuf/arena_test_util.h" #include "google/protobuf/map_lite_unittest.pb.h" @@ -23,7 +25,7 @@ class LiteArenaTest : public testing::Test { ArenaOptions options; options.start_block_size = 128 * 1024; options.max_block_size = 128 * 1024; - arena_.reset(new Arena(options)); + arena_ = std::make_unique(options); // Trigger the allocation of the first arena block, so that further use of // the arena will not require any heap allocations. (void)Arena::CreateArray(arena_.get(), 1); diff --git a/src/google/protobuf/map_test.inc b/src/google/protobuf/map_test.inc index e5b59509b54eb..b66b4b589cfd9 100644 --- a/src/google/protobuf/map_test.inc +++ b/src/google/protobuf/map_test.inc @@ -2414,7 +2414,7 @@ class MyMapEntry constexpr MyMapEntry() : MyMapEntry::MapEntry(static_cast(nullptr)) {} MyMapEntry(Arena* arena) : MyMapEntry::MapEntry(arena, nullptr) {} - const ClassData* GetClassData() const { + const ClassData* GetClassData() const override { ABSL_CHECK(false); return nullptr; } diff --git a/src/google/protobuf/message_lite.h b/src/google/protobuf/message_lite.h index ac44bb6995146..f5e9786d3c85b 100644 --- a/src/google/protobuf/message_lite.h +++ b/src/google/protobuf/message_lite.h @@ -1196,7 +1196,7 @@ class PROTOBUF_EXPORT MessageLite { explicit MessageLite(Arena* arena, const internal::ClassData* data) : _internal_metadata_(arena), _class_data_(data) {} #else // PROTOBUF_CUSTOM_VTABLE - constexpr MessageLite() {} + constexpr MessageLite() = default; explicit MessageLite(Arena* arena) : _internal_metadata_(arena) {} explicit constexpr MessageLite(const internal::ClassData*) {} explicit MessageLite(Arena* arena, const internal::ClassData*) diff --git a/src/google/protobuf/service.cc b/src/google/protobuf/service.cc index 7273a68b03681..05af4ce21b6ac 100644 --- a/src/google/protobuf/service.cc +++ b/src/google/protobuf/service.cc @@ -14,9 +14,9 @@ namespace google { namespace protobuf { -Service::~Service() {} -RpcChannel::~RpcChannel() {} -RpcController::~RpcController() {} +Service::~Service() = default; +RpcChannel::~RpcChannel() = default; +RpcController::~RpcController() = default; } // namespace protobuf } // namespace google diff --git a/src/google/protobuf/service.h b/src/google/protobuf/service.h index f90453da12bef..42d8fa5e847ba 100644 --- a/src/google/protobuf/service.h +++ b/src/google/protobuf/service.h @@ -111,7 +111,7 @@ class Message; // message.h // its exact type at compile time (analogous to Reflection). class PROTOBUF_EXPORT Service { public: - inline Service() {} + inline Service() = default; Service(const Service&) = delete; Service& operator=(const Service&) = delete; virtual ~Service(); @@ -183,7 +183,7 @@ class PROTOBUF_EXPORT Service { // advanced features (e.g. deadline propagation). class PROTOBUF_EXPORT RpcController { public: - inline RpcController() {} + inline RpcController() = default; RpcController(const RpcController&) = delete; RpcController& operator=(const RpcController&) = delete; virtual ~RpcController(); @@ -248,7 +248,7 @@ class PROTOBUF_EXPORT RpcController { // service->MyMethod(request, &response, callback); class PROTOBUF_EXPORT RpcChannel { public: - inline RpcChannel() {} + inline RpcChannel() = default; RpcChannel(const RpcChannel&) = delete; RpcChannel& operator=(const RpcChannel&) = delete; virtual ~RpcChannel();