From 9eaeeb7844a748c1d34a276080e1aa26bc89012c Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Mon, 29 Aug 2022 20:13:53 +0300 Subject: [PATCH 1/2] Use __clang_patchlevel__ % 100, because __clang_patchlevel__ is 300080 for Android NDK r16b (refs boostorg/assert#28) --- include/boost/config/compiler/clang_version.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/config/compiler/clang_version.hpp b/include/boost/config/compiler/clang_version.hpp index 9e5b408a..97765118 100644 --- a/include/boost/config/compiler/clang_version.hpp +++ b/include/boost/config/compiler/clang_version.hpp @@ -4,10 +4,10 @@ #if !defined(__APPLE__) -# define BOOST_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) +# define BOOST_CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__ % 100) #else -# define BOOST_CLANG_REPORTED_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) +# define BOOST_CLANG_REPORTED_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__ % 100) // https://en.wikipedia.org/wiki/Xcode#Toolchain_versions From 5d6cf7a2eb6c3960790e1d830d6904982cc870e4 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Mon, 29 Aug 2022 20:18:02 +0300 Subject: [PATCH 2/2] Update Apple Clang versions --- include/boost/config/compiler/clang_version.hpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/boost/config/compiler/clang_version.hpp b/include/boost/config/compiler/clang_version.hpp index 97765118..70c5507c 100644 --- a/include/boost/config/compiler/clang_version.hpp +++ b/include/boost/config/compiler/clang_version.hpp @@ -11,7 +11,13 @@ // https://en.wikipedia.org/wiki/Xcode#Toolchain_versions -# if BOOST_CLANG_REPORTED_VERSION >= 130000 +# if BOOST_CLANG_REPORTED_VERSION >= 140000 +# define BOOST_CLANG_VERSION 140000 + +# elif BOOST_CLANG_REPORTED_VERSION >= 130100 +# define BOOST_CLANG_VERSION 130000 + +# elif BOOST_CLANG_REPORTED_VERSION >= 130000 # define BOOST_CLANG_VERSION 120000 # elif BOOST_CLANG_REPORTED_VERSION >= 120005