diff options
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"); |
