From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Fri, 2 Dec 2016 02:02:23 +0000 (+0000)
Subject: p0012r1: define corresponding feature test macro
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de23535dfafd58bced63fbda42670a836b5df275;p=clang

p0012r1: define corresponding feature test macro


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@288452 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Frontend/InitPreprocessor.cpp b/lib/Frontend/InitPreprocessor.cpp
index 7e078fec92..b95741b320 100644
--- a/lib/Frontend/InitPreprocessor.cpp
+++ b/lib/Frontend/InitPreprocessor.cpp
@@ -510,7 +510,7 @@ static void InitializeCPlusPlusFeatureTestMacros(const LangOptions &LangOpts,
   if (LangOpts.CPlusPlus1z) {
     Builder.defineMacro("__cpp_hex_float", "201603");
     Builder.defineMacro("__cpp_inline_variables", "201606");
-    //Builder.defineMacro("__cpp_noexcept_function_type", "201510");
+    Builder.defineMacro("__cpp_noexcept_function_type", "201510");
     Builder.defineMacro("__cpp_capture_star_this", "201603");
     Builder.defineMacro("__cpp_if_constexpr", "201606");
     Builder.defineMacro("__cpp_template_auto", "201606");
diff --git a/test/Lexer/cxx-features.cpp b/test/Lexer/cxx-features.cpp
index c25ade3ffe..d38541f4db 100644
--- a/test/Lexer/cxx-features.cpp
+++ b/test/Lexer/cxx-features.cpp
@@ -34,8 +34,7 @@
 #error "wrong value for __cpp_aligned_new"
 #endif
 
-#if check(noexcept_function_type, 0, 0, 0, 0)
-// FIXME: value shuld be 201510 for cxx1z once implemented
+#if check(noexcept_function_type, 0, 0, 0, 201510)
 #error "wrong value for __cpp_noexcept_function_type"
 #endif