From c70145c6bf54cda9723cccdc7ca07f8d8fd321cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 7 Jun 2023 02:31:42 +0200 Subject: [PATCH] Opt out of standard library memory_resource on macOS < 14 and iOS < 17 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Although the header is available, and the compiler reports that the standard library supports memory_resource, the feature is only available on macOS 14 and iOS 17, as reported by https://developer.apple.com/xcode/cpp/ As long as our deployment target is lower we can't unconditionally use this feature. It's not clear whether the expectation is that consumers of the standard library on these platforms will have to runtime check their uses of these APIs. Includes e84c0df50f51c61aa49b47823582b0f8de406e3d for fixing missing line continuations. Task-number: QTBUG-114316 Change-Id: I50c1425334b9b9842b253442e2b3aade637783ea Reviewed-by: Thiago Macieira (cherry picked from commit f7c8ff511c30dc4310a72b3da4b4a345efe1fba0) Reviewed-by: Tor Arne Vestbø --- src/corelib/global/qcompilerdetection.h | 20 +++++++++++++------- src/corelib/tools/qduplicatetracker_p.h | 2 +- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index f1218934412..70fa7f6c9f7 100644 --- src/corelib/global/qcompilerdetection.h +++ src/corelib/global/qcompilerdetection.h @@ -895,16 +895,22 @@ # endif // !_HAS_CONSTEXPR # endif // !__GLIBCXX__ && !_LIBCPP_VERSION # endif // Q_OS_QNX -# if defined(Q_CC_CLANG) && defined(Q_OS_MAC) && defined(__GNUC_LIBSTD__) \ - && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402) +# if defined(Q_CC_CLANG) && defined(Q_OS_MAC) +# if defined(__GNUC_LIBSTD__) && ((__GNUC_LIBSTD__-0) * 100 + __GNUC_LIBSTD_MINOR__-0 <= 402) // Apple has not updated libstdc++ since 2007, which means it does not have // or std::move. Let's disable these features -# undef Q_COMPILER_INITIALIZER_LISTS -# undef Q_COMPILER_RVALUE_REFS -# undef Q_COMPILER_REF_QUALIFIERS +# undef Q_COMPILER_INITIALIZER_LISTS +# undef Q_COMPILER_RVALUE_REFS +# undef Q_COMPILER_REF_QUALIFIERS // Also disable , since it's clearly not there -# undef Q_COMPILER_ATOMICS -# endif +# undef Q_COMPILER_ATOMICS +# endif +# if defined(__cpp_lib_memory_resource) \ + && ((defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 140000) \ + || (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && __IPHONE_OS_VERSION_MIN_REQUIRED < 170000)) +# undef __cpp_lib_memory_resource // Only supported on macOS 14 and iOS 17 +# endif +# endif // defined(Q_CC_CLANG) && defined(Q_OS_DARWIN) #endif // Don't break code that is already using Q_COMPILER_DEFAULT_DELETE_MEMBERS diff --git a/src/corelib/tools/qduplicatetracker_p.h b/src/corelib/tools/qduplicatetracker_p.h index 950220184f8..23465ecffed 100644 --- src/corelib/tools/qduplicatetracker_p.h +++ src/corelib/tools/qduplicatetracker_p.h @@ -16,7 +16,7 @@ #include -#if __has_include() +#ifdef __cpp_lib_memory_resource # include # include # include // for the hashing helpers