diff options
| -rw-r--r-- | clang/lib/Frontend/InitPreprocessor.cpp | 3 | ||||
| -rw-r--r-- | clang/test/Lexer/cxx-features.cpp | 3 | ||||
| -rw-r--r-- | clang/www/cxx_status.html | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp index 1c3374f1f45..5da547e2b54 100644 --- a/clang/lib/Frontend/InitPreprocessor.cpp +++ b/clang/lib/Frontend/InitPreprocessor.cpp @@ -510,7 +510,6 @@ static void InitializeCPlusPlusFeatureTestMacros(const LangOptions &LangOpts, if (LangOpts.CPlusPlus1z) { Builder.defineMacro("__cpp_hex_float", "201603"); Builder.defineMacro("__cpp_inline_variables", "201606"); - //Builder.defineMacro("__cpp_aligned_new", "201606"); //Builder.defineMacro("__cpp_noexcept_function_type", "201510"); Builder.defineMacro("__cpp_capture_star_this", "201603"); Builder.defineMacro("__cpp_if_constexpr", "201606"); @@ -522,6 +521,8 @@ static void InitializeCPlusPlusFeatureTestMacros(const LangOptions &LangOpts, Builder.defineMacro("__cpp_nontype_template_args", "201411"); Builder.defineMacro("__cpp_fold_expressions", "201603"); } + if (LangOpts.AlignedAllocation) + Builder.defineMacro("__cpp_aligned_new", "201606"); // TS features. if (LangOpts.ConceptsTS) diff --git a/clang/test/Lexer/cxx-features.cpp b/clang/test/Lexer/cxx-features.cpp index 2f751acc816..c25ade3ffe7 100644 --- a/clang/test/Lexer/cxx-features.cpp +++ b/clang/test/Lexer/cxx-features.cpp @@ -30,8 +30,7 @@ #error "wrong value for __cpp_inline_variables" #endif -#if check(aligned_new, 0, 0, 0, 0) // FIXME: provisional name -// FIXME: value shuld be 201606 for cxx1z once implemented +#if check(aligned_new, 0, 0, 0, 201606) // FIXME: provisional name #error "wrong value for __cpp_aligned_new" #endif diff --git a/clang/www/cxx_status.html b/clang/www/cxx_status.html index 170fc6090ef..4f19c697146 100644 --- a/clang/www/cxx_status.html +++ b/clang/www/cxx_status.html @@ -679,7 +679,7 @@ as the draft C++1z standard evolves. <tr> <td>Dynamic memory allocation for over-aligned data</td> <td><a href="http://wg21.link/p0035r4">P0035R4</a></td> - <td class="none" align="center">No</td> + <td class="svn" align="center">SVN</td> </tr> <tr> <td>Template argument deduction for class templates</td> |
