forked from msys2/MINGW-packages
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
a7d2278
commit 0df1750
Showing
15 changed files
with
90 additions
and
126 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,68 +1,40 @@ | ||
| diff --git a/src/tools/qtgrpcgen/clientdeclarationprinter.cpp b/src/tools/qtgrpcgen/clientdeclarationprinter.cpp | ||
| index 9bd57a1..eedb91f 100644 | ||
| --- a/src/tools/qtgrpcgen/clientdeclarationprinter.cpp | ||
| +++ b/src/tools/qtgrpcgen/clientdeclarationprinter.cpp | ||
| @@ -8,7 +8,6 @@ | ||
| #include <google/protobuf/io/printer.h> | ||
| #include <google/protobuf/io/zero_copy_stream.h> | ||
| #include <google/protobuf/stubs/common.h> | ||
| -#include <google/protobuf/stubs/logging.h> | ||
|
|
||
| #include <string> | ||
| #include <unordered_set> | ||
| diff --git a/src/tools/qtgrpcgen/qgrpcgenerator.cpp b/src/tools/qtgrpcgen/qgrpcgenerator.cpp | ||
| index 4cab74d..1d5e04d 100644 | ||
| index ace0b68..bf90e52 100644 | ||
| --- a/src/tools/qtgrpcgen/qgrpcgenerator.cpp | ||
| +++ b/src/tools/qtgrpcgen/qgrpcgenerator.cpp | ||
| @@ -12,7 +12,7 @@ | ||
|
|
||
| #include <set> | ||
| #include <google/protobuf/compiler/code_generator.h> | ||
| +#include <google/protobuf/descriptor_legacy.h> | ||
| -#include <google/protobuf/stubs/logging.h> | ||
| #include <google/protobuf/stubs/common.h> | ||
| #include <google/protobuf/io/printer.h> | ||
| #include <google/protobuf/io/zero_copy_stream.h> | ||
| @@ -35,7 +34,7 @@ bool QGrpcGenerator::Generate(const FileDescriptor *file, | ||
| std::string *error) const | ||
| @@ -30,13 +30,9 @@ QGrpcGenerator::~QGrpcGenerator() = default; | ||
| bool QGrpcGenerator::Generate(const FileDescriptor *file, | ||
| [[maybe_unused]] const std::string ¶meter, | ||
| GeneratorContext *generatorContext, | ||
| - std::string *error) const | ||
| + [[maybe_unused]] std::string *error) const | ||
| { | ||
| assert(file != nullptr && generatorContext != nullptr); | ||
| - if (file->syntax() != FileDescriptor::SYNTAX_PROTO3) { | ||
| + if (FileDescriptorLegacy(file).syntax() != FileDescriptorLegacy::SYNTAX_PROTO3) { | ||
| *error = "Invalid proto used. qtgrpcgen only supports 'proto3' syntax"; | ||
| return false; | ||
| } | ||
| - *error = "Invalid proto used. qtgrpcgen only supports 'proto3' syntax"; | ||
| - return false; | ||
| - } | ||
|
|
||
| // Check if .proto files contain client side or bidirectional streaming | ||
| // methods which are not supported. | ||
| diff --git a/src/tools/qtprotobufgen/qprotobufgenerator.cpp b/src/tools/qtprotobufgen/qprotobufgenerator.cpp | ||
| index 5a1ccc2..e0d8981 100644 | ||
| index 3969d1e..288ac64 100644 | ||
| --- a/src/tools/qtprotobufgen/qprotobufgenerator.cpp | ||
| +++ b/src/tools/qtprotobufgen/qprotobufgenerator.cpp | ||
| @@ -17,7 +17,7 @@ | ||
| #include <array> | ||
| #include <numeric> | ||
| #include <set> | ||
| +#include <google/protobuf/descriptor_legacy.h> | ||
| -#include <google/protobuf/stubs/logging.h> | ||
| #include <google/protobuf/stubs/common.h> | ||
| #include <google/protobuf/io/printer.h> | ||
| #include <google/protobuf/io/zero_copy_stream.h> | ||
| @@ -41,7 +40,7 @@ bool QProtobufGenerator::Generate(const FileDescriptor *file, | ||
| @@ -36,15 +36,10 @@ QProtobufGenerator::~QProtobufGenerator() = default; | ||
| bool QProtobufGenerator::Generate(const FileDescriptor *file, | ||
| [[maybe_unused]] const std::string ¶meter, | ||
| GeneratorContext *generatorContext, | ||
| - std::string *error) const | ||
| + [[maybe_unused]] std::string *error) const | ||
| { | ||
| assert(file != nullptr && generatorContext != nullptr); | ||
|
|
||
| - if (file->syntax() != FileDescriptor::SYNTAX_PROTO3) { | ||
| + if (FileDescriptorLegacy(file).syntax() != FileDescriptorLegacy::SYNTAX_PROTO3) { | ||
| *error = "Invalid proto used. qtprotobufgen only supports 'proto3' syntax"; | ||
| return false; | ||
| } | ||
| diff --git a/src/tools/qtprotoccommon/generatorbase.cpp b/src/tools/qtprotoccommon/generatorbase.cpp | ||
| index bc51206..1004c61 100644 | ||
| --- a/src/tools/qtprotoccommon/generatorbase.cpp | ||
| +++ b/src/tools/qtprotoccommon/generatorbase.cpp | ||
| @@ -5,7 +5,6 @@ | ||
| #include "generatorbase.h" | ||
| - *error = "Invalid proto used. qtprotobufgen only supports 'proto3' syntax"; | ||
| - return false; | ||
| - } | ||
| - | ||
| return GenerateMessages(file, generatorContext); | ||
| } | ||
|
|
||
| #include <google/protobuf/descriptor.h> | ||
| -#include <google/protobuf/stubs/logging.h> | ||
| #include <google/protobuf/stubs/common.h> | ||
| #include <google/protobuf/io/printer.h> | ||
| #include <google/protobuf/io/zero_copy_stream.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.