commit c3fe01943ffbd9fbca08a73afc0cf1cef7acf58c
author Ted Kremenek <kremenek@apple.com> Thu Dec 03 01:31:28 2009 +0000
committer Ted Kremenek <kremenek@apple.com> Thu Dec 03 01:31:28 2009 +0000
tree 256e103e2a86f30251dd9a14ff17a7f785f61232
parent 236526dd1819920f114986ce08a6072bda845e6e

Rename has_feature(rtti) to has_feature(cxx_rtti) for clarity.

llvm-svn: 90376

clang/lib/Lex/PPMacroExpansion.cpp

diff --git a/clang/lib/Lex/PPMacroExpansion.cpp b/clang/lib/Lex/PPMacroExpansion.cpp
index 8ec8b9b..6181e17 100644
--- a/clang/lib/Lex/PPMacroExpansion.cpp
+++ b/clang/lib/Lex/PPMacroExpansion.cpp
@@ -483,12 +483,12 @@
 
   switch (II->getLength()) {
   default: return false;
-  case 4:
-    if (II->isStr("rtti")) return LangOpts.RTTI;
-    return false;  
   case 6:
     if (II->isStr("blocks")) return LangOpts.Blocks;
     return false;
+  case 8:
+    if (II->isStr("cxx_rtti")) return LangOpts.RTTI;
+    return false;      
   case 19:
     if (II->isStr("objc_nonfragile_abi")) return LangOpts.ObjCNonFragileABI;
     return false;

clang/test/Lexer/has_feature_rtti.cpp

diff --git a/clang/test/Lexer/has_feature_rtti.cpp b/clang/test/Lexer/has_feature_rtti.cpp
index 05bbd88..cc01f61 100644
--- a/clang/test/Lexer/has_feature_rtti.cpp
+++ b/clang/test/Lexer/has_feature_rtti.cpp
@@ -1,7 +1,7 @@
 // RUN: clang -E -frtti %s -o - | FileCheck --check-prefix=CHECK-RTTI %s
 // RUN: clang -E -fno-rtti %s -o - | FileCheck --check-prefix=CHECK-NO-RTTI %s
 
-#if __has_feature(rtti)
+#if __has_feature(cxx_rtti)
 int foo();
 #else
 int bar();