diff options
| author | Eric Liu <ioeric@google.com> | 2016-12-19 10:41:05 +0000 |
|---|---|---|
| committer | Eric Liu <ioeric@google.com> | 2016-12-19 10:41:05 +0000 |
| commit | 93459d3142e78bec125075c6b455b734fb7dfc5a (patch) | |
| tree | 785bc332794881335682b68885900ef5bc2e337b /clang/lib/Format | |
| parent | 9949ead55ad85698096af2fda29e8c6bb00a09b9 (diff) | |
| download | bcm5719-llvm-93459d3142e78bec125075c6b455b734fb7dfc5a.tar.gz bcm5719-llvm-93459d3142e78bec125075c6b455b734fb7dfc5a.zip | |
[clang-format] revert an unintended change in r288493 and add a test case.
llvm-svn: 290093
Diffstat (limited to 'clang/lib/Format')
| -rw-r--r-- | clang/lib/Format/Format.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/Format.cpp b/clang/lib/Format/Format.cpp index bd19b48db3f..ffe41c224ae 100644 --- a/clang/lib/Format/Format.cpp +++ b/clang/lib/Format/Format.cpp @@ -1545,7 +1545,7 @@ bool checkAndConsumeDirectiveWithName(Lexer &Lex, StringRef Name, Token &Tok) { bool Matched = Tok.is(tok::hash) && !Lex.LexFromRawLexer(Tok) && Tok.is(tok::raw_identifier) && Tok.getRawIdentifier() == Name && !Lex.LexFromRawLexer(Tok) && - tok::raw_identifier; + Tok.is(tok::raw_identifier); if (Matched) Lex.LexFromRawLexer(Tok); return Matched; |
