diff options
| -rw-r--r-- | docs/LanguageExtensions.html | 8 | ||||
| -rw-r--r-- | lib/Lex/PPMacroExpansion.cpp | 1 | ||||
| -rw-r--r-- | test/Lexer/has_feature_cxx0x.cpp | 10 |
3 files changed, 1 insertions, 18 deletions
diff --git a/docs/LanguageExtensions.html b/docs/LanguageExtensions.html index e080aef3c3..879089ed6c 100644 --- a/docs/LanguageExtensions.html +++ b/docs/LanguageExtensions.html @@ -385,11 +385,6 @@ attribute parsing with C++0x's square bracket notation is enabled.</p> <p>Use <tt>__has_feature(cxx_deleted_functions)</tt> to determine if support for deleted function definitions (with <tt>= delete</tt>) is enabled.</p> -<h3 id="cxx_concepts">C++ TR concepts</h3> - -<p>Use <tt>__has_feature(cxx_concepts)</tt> to determine if support for -concepts is enabled. clang does not currently implement this feature.</p> - <h3 id="cxx_lambdas">C++0x lambdas</h3> <p>Use <tt>__has_feature(cxx_lambdas)</tt> to determine if support for @@ -421,8 +416,7 @@ is supported using the <tt>auto</tt> specifier. If this is disabled, <h3 id="cxx_variadic_templates">C++0x variadic templates</h3> <p>Use <tt>__has_feature(cxx_variadic_templates)</tt> to determine if support -for templates taking any number of arguments with the ellipsis notation is -enabled. clang does not yet fully implement this feature.</p> +for variadic templates is enabled.</p> <h3 id="cxx_inline_namespaces">C++0x inline namespaces</h3> diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp index 54e4691392..0bfadad439 100644 --- a/lib/Lex/PPMacroExpansion.cpp +++ b/lib/Lex/PPMacroExpansion.cpp @@ -556,7 +556,6 @@ static bool HasFeature(const Preprocessor &PP, const IdentifierInfo *II) { .Case("ownership_returns", true) .Case("ownership_takes", true) .Case("cxx_inline_namespaces", true) - //.Case("cxx_concepts", false) //.Case("cxx_lambdas", false) //.Case("cxx_nullptr", false) //.Case("cxx_rvalue_references", false) diff --git a/test/Lexer/has_feature_cxx0x.cpp b/test/Lexer/has_feature_cxx0x.cpp index 5b0f79834e..dcd46b7514 100644 --- a/test/Lexer/has_feature_cxx0x.cpp +++ b/test/Lexer/has_feature_cxx0x.cpp @@ -21,16 +21,6 @@ int no_nullptr(); // CHECK-NO-0X: no_nullptr -#if __has_feature(cxx_concepts) -int concepts(); -#else -int no_concepts(); -#endif - -// CHECK-0X: no_concepts -// CHECK-NO-0X: no_concepts - - #if __has_feature(cxx_decltype) int has_decltype(); #else |