From 75cc1d8f758f37f167d6325f10febe70d459ef73 Mon Sep 17 00:00:00 2001 From: Paolo Tranquilli Date: Thu, 17 Aug 2023 12:19:28 +0200 Subject: [PATCH] Swift: fix version check macro to be lexicographic --- swift/extractor/infra/SwiftTagTraits.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/swift/extractor/infra/SwiftTagTraits.h b/swift/extractor/infra/SwiftTagTraits.h index b58a6f4ef83..5066205db6e 100644 --- a/swift/extractor/infra/SwiftTagTraits.h +++ b/swift/extractor/infra/SwiftTagTraits.h @@ -27,8 +27,9 @@ namespace codeql { using type = TAG; \ }; -#define CODEQL_SWIFT_VERSION_GE(MAJOR, MINOR) \ - CODEQL_SWIFT_VERSION_MAJOR >= (MAJOR) && CODEQL_SWIFT_VERSION_MINOR >= (MINOR) +#define CODEQL_SWIFT_VERSION_GE(MAJOR, MINOR) \ + (CODEQL_SWIFT_VERSION_MAJOR == (MAJOR) && CODEQL_SWIFT_VERSION_MINOR >= (MINOR)) || \ + CODEQL_SWIFT_VERSION_MAJOR > (MAJOR) // clang-format off // use indentation to recreate all involved type hierarchies