From 71f35d6057eb65a217ebb8d2bfad365da27e537e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 21 Nov 2022 15:30:03 +0100 Subject: Remove QT_HAS_FOO() wrapper macros for __has_foo() Using wrappers for these macros is problematic when for example passing the -frewrite-includes flag to preprocess sources before shipping off to distcc or Icecream. It will also start producing warnings when compilers implement http://eel.is/c++draft/cpp.cond#7.sentence-2. See for example https://reviews.llvm.org/D49091 Now that all uses of the macros are gone, we can follow up c3bd5ffdc8a3b459f18ba6e35fca93e29f3b0ab0 and remove the wrappers. Change-Id: I764aea17dcdabd420097a7f4bc0b987a53a345eb Reviewed-by: Marc Mutz --- src/corelib/global/qcompilerdetection.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src') diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 461b6a5c210..0c27d6ca798 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -445,14 +445,6 @@ # define __has_include_next(x) 0 #endif -// Kept around until all submodules have transitioned -#define QT_HAS_BUILTIN(x) __has_builtin(x) -#define QT_HAS_FEATURE(x) __has_feature(x) -#define QT_HAS_ATTRIBUTE(x) __has_attribute(x) -#define QT_HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x) -#define QT_HAS_INCLUDE(x) __has_include(x) -#define QT_HAS_INCLUDE_NEXT(x) __has_include_next(x) - #ifdef __cplusplus # if __has_include() /* remove this check once Integrity, QNX have caught up */ # include -- cgit v1.2.3