diff options
| author | Faisal Vali <faisalv@yahoo.com> | 2017-10-03 01:33:36 +0000 |
|---|---|---|
| committer | Faisal Vali <faisalv@yahoo.com> | 2017-10-03 01:33:36 +0000 |
| commit | 03b7b15f8e879b53148279bcf2dcdda5400d355d (patch) | |
| tree | e4fa109c82d710c57425fc2ca79ecd62aa75c1ea /clang/lib/Lex/TokenLexer.cpp | |
| parent | a8ff3b3528a0027e0b937d8c2a03c31c66f6a970 (diff) | |
| download | bcm5719-llvm-03b7b15f8e879b53148279bcf2dcdda5400d355d.tar.gz bcm5719-llvm-03b7b15f8e879b53148279bcf2dcdda5400d355d.zip | |
Add parens around the boolean condition of one of the added asserts in r314747 ...
... in the hopes of teaching the bots the gift of silence ;)
For quick reference: https://reviews.llvm.org/rL314747
llvm-svn: 314753
Diffstat (limited to 'clang/lib/Lex/TokenLexer.cpp')
| -rw-r--r-- | clang/lib/Lex/TokenLexer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clang/lib/Lex/TokenLexer.cpp b/clang/lib/Lex/TokenLexer.cpp index f8f9400db90..df6ad5276ac 100644 --- a/clang/lib/Lex/TokenLexer.cpp +++ b/clang/lib/Lex/TokenLexer.cpp @@ -531,9 +531,9 @@ bool TokenLexer::pasteTokens(Token &Tok) { bool TokenLexer::pasteTokens(Token &LHSTok, ArrayRef<Token> TokenStream, unsigned int &CurIdx) { assert(CurIdx > 0 && "## can not be the first token within tokens"); - assert(TokenStream[CurIdx].is(tok::hashhash) || + assert((TokenStream[CurIdx].is(tok::hashhash) || (PP.getLangOpts().MSVCCompat && - isWideStringLiteralFromMacro(LHSTok, TokenStream[CurIdx])) && + isWideStringLiteralFromMacro(LHSTok, TokenStream[CurIdx]))) && "Token at this Index must be ## or part of the MSVC 'L " "#macro-arg' pasting pair"); |
