aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Lex/PPMacroExpansion.cpp2
-rw-r--r--test/Lexer/has_feature_cxx0x.cpp3
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp
index cc294ee266..ba92614910 100644
--- a/lib/Lex/PPMacroExpansion.cpp
+++ b/lib/Lex/PPMacroExpansion.cpp
@@ -553,7 +553,7 @@ static bool HasFeature(const Preprocessor &PP, const IdentifierInfo *II) {
.Case("ownership_takes", true)
// C++0x features
.Case("cxx_attributes", LangOpts.CPlusPlus0x)
- //.Case("cxx_auto_type", false)
+ .Case("cxx_auto_type", LangOpts.CPlusPlus0x)
.Case("cxx_decltype", LangOpts.CPlusPlus0x)
.Case("cxx_default_function_template_args", LangOpts.CPlusPlus0x)
.Case("cxx_deleted_functions", LangOpts.CPlusPlus0x)
diff --git a/test/Lexer/has_feature_cxx0x.cpp b/test/Lexer/has_feature_cxx0x.cpp
index 21950148cf..07a3ebd38d 100644
--- a/test/Lexer/has_feature_cxx0x.cpp
+++ b/test/Lexer/has_feature_cxx0x.cpp
@@ -37,8 +37,7 @@ int has_auto_type();
int no_auto_type();
#endif
-// FIXME: We don't implement "auto" well enough to turn on this feature test
-// CHECK-0X: no_auto_type
+// CHECK-0X: has_auto_type
// CHECK-NO-0X: no_auto_type