From cfca06d7963fa0909f90483b42a6d7d194d01e08 Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sun, 26 Jul 2020 19:36:28 +0000 Subject: Vendor import of llvm-project master 2e10b7a39b9, the last commit before the llvmorg-12-init tag, from which release/11.x was branched. --- clang/lib/Lex/TokenConcatenation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'clang/lib/Lex/TokenConcatenation.cpp') diff --git a/clang/lib/Lex/TokenConcatenation.cpp b/clang/lib/Lex/TokenConcatenation.cpp index e626cfcc927f5..f6b005d9e19cf 100644 --- a/clang/lib/Lex/TokenConcatenation.cpp +++ b/clang/lib/Lex/TokenConcatenation.cpp @@ -103,7 +103,7 @@ TokenConcatenation::TokenConcatenation(const Preprocessor &pp) : PP(pp) { TokenInfo[tok::utf8_char_constant] |= aci_custom; // These tokens have custom code in C++2a mode. - if (PP.getLangOpts().CPlusPlus2a) + if (PP.getLangOpts().CPlusPlus20) TokenInfo[tok::lessequal ] |= aci_custom_firstchar; // These tokens change behavior if followed by an '='. @@ -292,6 +292,6 @@ bool TokenConcatenation::AvoidConcat(const Token &PrevPrevTok, case tok::arrow: // ->* return PP.getLangOpts().CPlusPlus && FirstChar == '*'; case tok::lessequal: // <=> (C++2a) - return PP.getLangOpts().CPlusPlus2a && FirstChar == '>'; + return PP.getLangOpts().CPlusPlus20 && FirstChar == '>'; } } -- cgit v1.2.3