diff options
| author | Richard Smith <richard@metafoo.co.uk> | 2021-03-01 12:17:10 -0800 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2021-03-02 20:04:41 -0800 |
| commit | 344216979213d841b72e44891871c031db622f5d (patch) | |
| tree | a393a74c76d9f7589345b8fe72a7482fc926fbb6 | |
| parent | f73ba0f3582ba33984ad996c124d106a9737cd90 (diff) | |
| download | llvm-relese/12.x.tar.gz | |
Revert "[c++20] Mark class type NTTPs as done and start defining the feature test macro."relese/12.x
Some of the parts of this work were reverted; stop defining the feature
test macro for now.
This reverts commit b4c63ef6dd90dba9af26a111c9a78b121c5284b1.
(cherry picked from commit 564f5b0734bd5d265a0046e5ca9d08ae5bc303eb)
| -rw-r--r-- | clang/lib/Frontend/InitPreprocessor.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Lexer/cxx-features.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp index d47ad1b74649..c64a912ce919 100644 --- a/clang/lib/Frontend/InitPreprocessor.cpp +++ b/clang/lib/Frontend/InitPreprocessor.cpp @@ -565,7 +565,7 @@ static void InitializeCPlusPlusFeatureTestMacros(const LangOptions &LangOpts, Builder.defineMacro("__cpp_aggregate_bases", "201603L"); Builder.defineMacro("__cpp_structured_bindings", "201606L"); Builder.defineMacro("__cpp_nontype_template_args", - LangOpts.CPlusPlus20 ? "201911L" : "201411L"); + "201411L"); // (not latest) Builder.defineMacro("__cpp_fold_expressions", "201603L"); Builder.defineMacro("__cpp_guaranteed_copy_elision", "201606L"); Builder.defineMacro("__cpp_nontype_template_parameter_auto", "201606L"); diff --git a/clang/test/Lexer/cxx-features.cpp b/clang/test/Lexer/cxx-features.cpp index f57faed4ed90..2f46f354ee83 100644 --- a/clang/test/Lexer/cxx-features.cpp +++ b/clang/test/Lexer/cxx-features.cpp @@ -181,7 +181,8 @@ #error "wrong value for __cpp_structured_bindings" #endif -#if check(nontype_template_args, 0, 0, 0, 201411, 201911, 201911) +#if check(nontype_template_args, 0, 0, 0, 201411, 201411, 201411) +// FIXME: 201911 in C++20 #error "wrong value for __cpp_nontype_template_args" #endif |