salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-24 11:11:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #820 from davidgiven/protobuf

Browse Source 
Apply the fix from #811 to make everything build against Protobuf 31.
This commit is contained in:
David Given
2025-08-19 23:43:26 +02:00
committed by GitHub
parent b26735d520 d1524f78fb
commit 8d7dd4867b
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/config/proto.cc
View File

@@ -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 += "[]";

5
scripts/mkdocindex.cc
View File

@@ -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);
}