diff options
| -rw-r--r-- | lib/Lex/PPMacroExpansion.cpp | 2 | ||||
| -rw-r--r-- | test/Lexer/has_feature_cxx0x.cpp | 9 | ||||
| -rw-r--r-- | www/cxx_status.html | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp index c7c8e00f40..007be3bed2 100644 --- a/lib/Lex/PPMacroExpansion.cpp +++ b/lib/Lex/PPMacroExpansion.cpp @@ -650,7 +650,7 @@ static bool HasFeature(const Preprocessor &PP, const IdentifierInfo *II) { .Case("cxx_delegating_constructors", LangOpts.CPlusPlus0x) .Case("cxx_deleted_functions", LangOpts.CPlusPlus0x) .Case("cxx_explicit_conversions", LangOpts.CPlusPlus0x) - //.Case("cxx_generalized_initializers", LangOpts.CPlusPlus0x) + .Case("cxx_generalized_initializers", LangOpts.CPlusPlus0x) .Case("cxx_implicit_moves", LangOpts.CPlusPlus0x) //.Case("cxx_inheriting_constructors", false) .Case("cxx_inline_namespaces", LangOpts.CPlusPlus0x) diff --git a/test/Lexer/has_feature_cxx0x.cpp b/test/Lexer/has_feature_cxx0x.cpp index d987a38d02..d520208d2e 100644 --- a/test/Lexer/has_feature_cxx0x.cpp +++ b/test/Lexer/has_feature_cxx0x.cpp @@ -226,3 +226,12 @@ int no_constexpr(); // CHECK-0X: has_constexpr // CHECK-NO-0X: no_constexpr + +#if __has_feature(cxx_generalized_initializers) +int has_generalized_initializers(); +#else +int no_generalized_initializers(); +#endif + +// CHECK-0X: has_generalized_initializers +// CHECK-NO-0X: no_generalized_initializers diff --git a/www/cxx_status.html b/www/cxx_status.html index 4b50c22532..ea1992a577 100644 --- a/www/cxx_status.html +++ b/www/cxx_status.html @@ -81,7 +81,7 @@ with clang; other versions have not been tested.</p> <tr> <td>Initializer lists</td> <td><a href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2008/n2672.htm">N2672</a></td> - <td class="none" align="center">In progress</td> + <td class="svn" align="center">SVN</td> </tr> <tr> <td>Static assertions</td> |