aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2020-11-17 22:53:59 +0100
committerAlessandro Portale <alessandro.portale@qt.io>2020-11-18 15:40:15 +0000
commita1ff9d170f97a5e812b365b4b82b4d8cde638807 (patch)
treef5788920a78e69e7c80aaf6cb39e57dab3000eac
parentccf5daa16d8ef8f6da844a1d550963dd5e3f137d (diff)
CppTools: "CLANG-UPGRADE-CHECK: Update known language features macros."
Clang++ 11 has __cpp_constexpr_in_decltype Change-Id: I450a79f2af8cd6aca51b95b11b3c06b9682c0418 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--src/plugins/cpptools/compileroptionsbuilder.cpp1
-rw-r--r--tests/unit/unittest/projectupdater-test.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/cpptools/compileroptionsbuilder.cpp b/src/plugins/cpptools/compileroptionsbuilder.cpp
index 246298d98c..23837a8d0c 100644
--- a/src/plugins/cpptools/compileroptionsbuilder.cpp
+++ b/src/plugins/cpptools/compileroptionsbuilder.cpp
@@ -580,6 +580,7 @@ static QStringList languageFeatureMacros()
"__cpp_binary_literals",
"__cpp_capture_star_this",
"__cpp_constexpr",
+ "__cpp_constexpr_in_decltype",
"__cpp_decltype",
"__cpp_decltype_auto",
"__cpp_deduction_guides",
diff --git a/tests/unit/unittest/projectupdater-test.cpp b/tests/unit/unittest/projectupdater-test.cpp
index 536aa3044d..b74a90877a 100644
--- a/tests/unit/unittest/projectupdater-test.cpp
+++ b/tests/unit/unittest/projectupdater-test.cpp
@@ -435,6 +435,7 @@ TEST_F(ProjectUpdater, ToolChainArgumentsMSVC)
QString{"-U__cpp_binary_literals"},
QString{"-U__cpp_capture_star_this"},
QString{"-U__cpp_constexpr"},
+ QString{"-U__cpp_constexpr_in_decltype"},
QString{"-U__cpp_decltype"},
QString{"-U__cpp_decltype_auto"},
QString{"-U__cpp_deduction_guides"},