[cfe-commits] r38700 - /cfe/cfe/trunk/Lex/Preprocessor.cpp

[sabre at cs.uiuc.edu]

Author: sabre
Date: Wed Jul 11 11:23:55 2007
New Revision: 38700

URL: http://llvm.org/viewvc/llvm-project?rev=38700&view=rev
Log:
Fix a regression on Preprocessor/hash_space.c

Modified:
    cfe/cfe/trunk/Lex/Preprocessor.cpp

Modified: cfe/cfe/trunk/Lex/Preprocessor.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/cfe/trunk/Lex/Preprocessor.cpp?rev=38700&r1=38699&r2=38700&view=diff

==============================================================================
--- cfe/cfe/trunk/Lex/Preprocessor.cpp (original)
+++ cfe/cfe/trunk/Lex/Preprocessor.cpp Wed Jul 11 11:23:55 2007
@@ -1735,8 +1735,8 @@
     MI->AddTokenToBody(Tok);
 
     // Check C99 6.10.3.2p1: ensure that # operators are followed by macro
-    // parameters.
-    if (Tok.getKind() != tok::hash) {
+    // parameters in function-like macro expansions.
+    if (Tok.getKind() != tok::hash || MI->isObjectLike()) {
       // Get the next token of the macro.
       LexUnexpandedToken(Tok);
       continue;