From d1524f78fb618b9973a077bb5aa8c2593a826498 Mon Sep 17 00:00:00 2001 From: David Given Date: Tue, 19 Aug 2025 23:28:19 +0200 Subject: [PATCH] Apply the fix from #811 to make everything build against Protobuf 31. --- lib/config/proto.cc | 4 ++-- scripts/mkdocindex.cc | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/config/proto.cc b/lib/config/proto.cc index ab2e121f..a8cf51f4 100644 --- a/lib/config/proto.cc +++ b/lib/config/proto.cc @@ -439,7 +439,7 @@ std::string ProtoField::get() const case google::protobuf::FieldDescriptor::TYPE_ENUM: { const auto* enumvalue = reflection->GetEnum(*_message, _field); - return enumvalue->name(); + return (std::string)enumvalue->name(); } case google::protobuf::FieldDescriptor::TYPE_MESSAGE: @@ -534,7 +534,7 @@ findAllPossibleProtoFields(const google::protobuf::Descriptor* descriptor) for (int i = 0; i < d->field_count(); i++) { const google::protobuf::FieldDescriptor* f = d->field(i); - std::string n = s + f->name(); + std::string n = s + (std::string)f->name(); if (f->label() == google::protobuf::FieldDescriptor::LABEL_REPEATED) n += "[]"; diff --git a/scripts/mkdocindex.cc b/scripts/mkdocindex.cc index 43d3fb69..7a3bb716 100644 --- a/scripts/mkdocindex.cc +++ b/scripts/mkdocindex.cc @@ -19,7 +19,7 @@ static std::string supportStatus(SupportStatus status) return ""; } - return ""; + return ""; } int main(int argc, const char* argv[]) @@ -43,7 +43,8 @@ int main(int argc, const char* argv[]) { const auto* descriptor = FilesystemProto::FilesystemType_descriptor(); - auto name = descriptor->FindValueByNumber(fs.type())->name(); + std::string name = + descriptor->FindValueByNumber(fs.type())->name(); filesystems.insert(name); }