Skip to content

Fix GOOGLE_PROTOBUF_VERSION comparisons #279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vitalybuka wants to merge 1 commit into from
Closed

Fix GOOGLE_PROTOBUF_VERSION comparisons #279

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions port/protobuf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

namespace google {
namespace protobuf {
#if GOOGLE_PROTOBUF_VERSION < 4025000
#if GOOGLE_PROTOBUF_VERSION <= 4025000

template <typename T>
const T* DownCastMessage(const Message* message) {
Expand All @@ -40,7 +40,7 @@ T* DownCastMessage(Message* message) {
return const_cast<T*>(DownCastMessage<T>(message_const));
}

#elif GOOGLE_PROTOBUF_VERSION < 5029000
#elif GOOGLE_PROTOBUF_VERSION <= 5028000

template <typename T>
const T* DownCastMessage(const Message* message) {
Expand All @@ -63,7 +63,7 @@ namespace protobuf = google::protobuf;
inline bool RequiresUtf8Validation(
const google::protobuf::FieldDescriptor& descriptor) {
// commit d8c2501b43c1b56e3efa74048a18f8ce06ba07fe of >= v3.22.0
#if GOOGLE_PROTOBUF_VERSION >= 4022000
#if GOOGLE_PROTOBUF_VERSION > 3021005
return descriptor.requires_utf8_validation();
#else
return descriptor.type() == google::protobuf::FieldDescriptor::TYPE_STRING &&
Expand All @@ -74,7 +74,7 @@ inline bool RequiresUtf8Validation(

inline bool HasPresence(const google::protobuf::FieldDescriptor& descriptor) {
// commit bb30225f06c36399757dc698b409d5f79738e8d1 of >=3.12.0
#if GOOGLE_PROTOBUF_VERSION >= 3012000
#if GOOGLE_PROTOBUF_VERSION > 3011004
return descriptor.has_presence();
#else
// NOTE: This mimics Protobuf 3.21.12 ("3021012")
Expand All @@ -89,20 +89,22 @@ inline bool HasPresence(const google::protobuf::FieldDescriptor& descriptor) {

inline void PrepareTextParser(google::protobuf::TextFormat::Parser& parser) {
// commit d8c2501b43c1b56e3efa74048a18f8ce06ba07fe of >=3.8.0
#if GOOGLE_PROTOBUF_VERSION >= 3008000
#if GOOGLE_PROTOBUF_VERSION > 3006001
parser.SetRecursionLimit(100);
#endif
#if GOOGLE_PROTOBUF_VERSION > 3007000
parser.AllowUnknownField(true);
#endif
}

constexpr bool TextParserCanSetRecursionLimit() {
// commit d8c2501b43c1b56e3efa74048a18f8ce06ba07fe of >=3.8.0
return GOOGLE_PROTOBUF_VERSION >= 3008000;
return GOOGLE_PROTOBUF_VERSION > 3006001;
}

constexpr bool TextParserCanAllowUnknownField() {
// commit 176f7db11d8242b36a3ea6abb1cc436fca5bf75d of >=3.8.0
return GOOGLE_PROTOBUF_VERSION >= 3008000;
return GOOGLE_PROTOBUF_VERSION > 3007000;
}

} // namespace protobuf_mutator
Expand Down
Loading