From 02129eab7d58362ad5d187c73aff255710578e75 Mon Sep 17 00:00:00 2001 From: Sam McCall Date: Mon, 10 Oct 2022 17:08:10 +0200 Subject: [PATCH] [Syntax] avoid using c++17 features on 15.x branch --- clang/lib/Tooling/Syntax/Tokens.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/clang/lib/Tooling/Syntax/Tokens.cpp b/clang/lib/Tooling/Syntax/Tokens.cpp index 9a30e36..1fa73c6 100644 --- a/clang/lib/Tooling/Syntax/Tokens.cpp +++ b/clang/lib/Tooling/Syntax/Tokens.cpp @@ -460,8 +460,10 @@ TokenBuffer::spelledForExpanded(llvm::ArrayRef Expanded) const { return llvm::None; const syntax::Token *First = &Expanded.front(); const syntax::Token *Last = &Expanded.back(); - auto [FirstSpelled, FirstMapping] = spelledForExpandedToken(First); - auto [LastSpelled, LastMapping] = spelledForExpandedToken(Last); + const syntax::Token *FirstSpelled, *LastSpelled; + const TokenBuffer::Mapping *FirstMapping, *LastMapping; + std::tie(FirstSpelled, FirstMapping) = spelledForExpandedToken(First); + std::tie(LastSpelled, LastMapping) = spelledForExpandedToken(Last); FileID FID = SourceMgr->getFileID(FirstSpelled->location()); // FIXME: Handle multi-file changes by trying to map onto a common root. -- 2.7.4