[cfe-commits] r136561 - /cfe/trunk/lib/Lex/PPMacroExpansion.cpp

[Douglas Gregor]

Author: dgregor
Date: Sat Jul 30 02:08:19 2011
New Revision: 136561

URL: http://llvm.org/viewvc/llvm-project?rev=136561&view=rev
Log:
Fix a thinko in my __is_empty/__is_pod commit.

Modified:
    cfe/trunk/lib/Lex/PPMacroExpansion.cpp

Modified: cfe/trunk/lib/Lex/PPMacroExpansion.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/PPMacroExpansion.cpp?rev=136561&r1=136560&r2=136561&view=diff
==============================================================================
--- cfe/trunk/lib/Lex/PPMacroExpansion.cpp (original)
+++ cfe/trunk/lib/Lex/PPMacroExpansion.cpp Sat Jul 30 02:08:19 2011
@@ -640,12 +640,16 @@
            .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)