diff options
| -rw-r--r-- | docs/LanguageExtensions.html | 2 | ||||
| -rw-r--r-- | lib/Lex/PPMacroExpansion.cpp | 2 | ||||
| -rw-r--r-- | test/Lexer/has_feature_cxx0x.cpp | 9 |
3 files changed, 11 insertions, 2 deletions
diff --git a/docs/LanguageExtensions.html b/docs/LanguageExtensions.html index 7693d24154..09832db1ca 100644 --- a/docs/LanguageExtensions.html +++ b/docs/LanguageExtensions.html @@ -668,7 +668,7 @@ parsing with C++11's square bracket notation is enabled.</p> <p>Use <tt>__has_feature(cxx_constexpr)</tt> to determine if support for generalized constant expressions (e.g., <tt>constexpr</tt>) is -enabled. Clang does not currently implement this feature.</p> +enabled.</p> <h4 id="cxx_decltype">C++11 <tt>decltype()</tt></h4> diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp index 3fe3ab3b19..a285c30d5c 100644 --- a/lib/Lex/PPMacroExpansion.cpp +++ b/lib/Lex/PPMacroExpansion.cpp @@ -638,7 +638,7 @@ static bool HasFeature(const Preprocessor &PP, const IdentifierInfo *II) { .Case("cxx_atomic", LangOpts.CPlusPlus0x) .Case("cxx_attributes", LangOpts.CPlusPlus0x) .Case("cxx_auto_type", LangOpts.CPlusPlus0x) - //.Case("cxx_constexpr", false); + .Case("cxx_constexpr", LangOpts.CPlusPlus0x) .Case("cxx_decltype", LangOpts.CPlusPlus0x) .Case("cxx_default_function_template_args", LangOpts.CPlusPlus0x) .Case("cxx_defaulted_functions", LangOpts.CPlusPlus0x) diff --git a/test/Lexer/has_feature_cxx0x.cpp b/test/Lexer/has_feature_cxx0x.cpp index f02f1031ad..17ed6fbfaf 100644 --- a/test/Lexer/has_feature_cxx0x.cpp +++ b/test/Lexer/has_feature_cxx0x.cpp @@ -217,3 +217,12 @@ int no_unicode_literals(); // CHECK-0X: has_unicode_literals // CHECK-NO-0X: no_unicode_literals + +#if __has_feature(cxx_constexpr) +int has_constexpr(); +#else +int no_constexpr(); +#endif + +// CHECK-0X: has_constexpr +// CHECK-NO-0X: no_constexpr |