qiurui
/
qtgrpc
mirror of https://github.com/qt/qtgrpc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

QProtobufGenerator: Fix deprecation warning for 'has_optional_keyword()' 

... got deprecated in Protobuf v25.0-rc2

Warning states:
‘bool google::protobuf::FieldDescriptor::has_optional_keyword() const’
is deprecated: Syntax is deprecated in favor of editions, please use
FieldDescriptor::has_presence instead. [-Wdeprecated-declarations]

Change-Id: If33d214939ddf3f1018b875d0c47692690394f72
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Dennis Oberst 2023-10-18 16:23:54 +02:00 committed by Alexey Edelev
parent cea1abe16f
commit 8ebca7f46c
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/qtprotobufgen/qprotobufgenerator.cpp
View File

@ -196,12 +196,8 @@ void QProtobufGenerator::GenerateHeader(const FileDescriptor *file,
+ "/" + field->message_type()->name()); + "/" + field->message_type()->name());
qtTypesSet.insert(field->message_type()->file()->package()); qtTypesSet.insert(field->message_type()->file()->package());
} }
#ifdef HAVE_PROTOBUF_SYNC_PIPER
if (field->has_optional_keyword()) if (common::isOptionalField(field))
#else
if (file->syntax() == FileDescriptor::SYNTAX_PROTO2 && field->is_optional()
&& !field->containing_oneof())
#endif
hasOptionalFields = true; hasOptionalFields = true;
} }
}); });

2
src/tools/qtprotoccommon/generatorcommon.cpp
View File

@ -581,7 +581,7 @@ bool common::isOneofField(const FieldDescriptor *field)
bool common::isOptionalField(const FieldDescriptor *field) bool common::isOptionalField(const FieldDescriptor *field)
{ {
#ifdef HAVE_PROTOBUF_SYNC_PIPER #ifdef HAVE_PROTOBUF_SYNC_PIPER
bool hasOptional = field->has_optional_keyword(); bool hasOptional = field->has_presence() && !field->real_containing_oneof();
#else #else
bool hasOptional = file->syntax() == FileDescriptor::SYNTAX_PROTO2 && field->is_optional() bool hasOptional = file->syntax() == FileDescriptor::SYNTAX_PROTO2 && field->is_optional()
&& !field->containing_oneof(); && !field->containing_oneof();