diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2011-02-22 13:49:00 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2011-02-22 13:49:00 +0000 |
| commit | 2c9f966600da37ea87a1497a7c0d71f51d953760 (patch) | |
| tree | 5dd52c92d6ba5e3488cdcc6c96a90e72457d2412 /clang/lib/Lex/Pragma.cpp | |
| parent | e16dc2a6e7641b228f6b41d01a62f93f77f86457 (diff) | |
| download | bcm5719-llvm-2c9f966600da37ea87a1497a7c0d71f51d953760.tar.gz bcm5719-llvm-2c9f966600da37ea87a1497a7c0d71f51d953760.zip | |
Make TokenLexer capable of storing preprocessor directive tokens
llvm-svn: 126220
Diffstat (limited to 'clang/lib/Lex/Pragma.cpp')
| -rw-r--r-- | clang/lib/Lex/Pragma.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Lex/Pragma.cpp b/clang/lib/Lex/Pragma.cpp index f0475bc0cb2..31e777604eb 100644 --- a/clang/lib/Lex/Pragma.cpp +++ b/clang/lib/Lex/Pragma.cpp @@ -110,7 +110,8 @@ void Preprocessor::HandlePragmaDirective(unsigned Introducer) { PragmaHandlers->HandlePragma(*this, PragmaIntroducerKind(Introducer), Tok); // If the pragma handler didn't read the rest of the line, consume it now. - if (CurPPLexer && CurPPLexer->ParsingPreprocessorDirective) + if ((CurTokenLexer && CurTokenLexer->isParsingPreprocessorDirective()) + || (CurPPLexer && CurPPLexer->ParsingPreprocessorDirective)) DiscardUntilEndOfDirective(); } |
