]> granicus.if.org Git - clang/commitdiff
Fix a thinko in my __is_empty/__is_pod commit.
authorDouglas Gregor <dgregor@apple.com>
Sat, 30 Jul 2011 07:08:19 +0000 (07:08 +0000)
committerDouglas Gregor <dgregor@apple.com>
Sat, 30 Jul 2011 07:08:19 +0000 (07:08 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@136561 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Lex/PPMacroExpansion.cpp

index 58ba42e49a345567478bc7bd9a529421c5c48479..7046c5f2fdaf5fc69549e2e6b4b30dd18df7d4de 100644 (file)
@@ -640,12 +640,16 @@ static bool HasFeature(const Preprocessor &PP, const IdentifierInfo *II) {
            .Case("is_class", LangOpts.CPlusPlus)
            .Case("is_convertible_to", LangOpts.CPlusPlus)
            .Case("is_empty", 
-                 LangOpts.CPlusPlus && II->getTokenID() != tok::identifier)
+                 LangOpts.CPlusPlus && 
+                 PP.getIdentifierInfo("__is_empty")->getTokenID()
+                                                            != tok::identifier)
            .Case("is_enum", LangOpts.CPlusPlus)
            .Case("is_literal", LangOpts.CPlusPlus)
            .Case("is_standard_layout", LangOpts.CPlusPlus)
            .Case("is_pod", 
-                 LangOpts.CPlusPlus && II->getTokenID() != tok::identifier)
+                 LangOpts.CPlusPlus && 
+                 PP.getIdentifierInfo("__is_pod")->getTokenID()
+                                                            != tok::identifier)
            .Case("is_polymorphic", LangOpts.CPlusPlus)
            .Case("is_trivial", LangOpts.CPlusPlus)
            .Case("is_trivially_copyable", LangOpts.CPlusPlus)