maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clang-format] Fix build on gcc < 7 introduced in rG9363aa9. 

This fixes another bogus build error on gcc, e.g. https://lab.llvm.org/buildbot/#/builders/110/builds/2974.

/home/ssglocal/clang-cmake-x86_64-avx2-linux/clang-cmake-x86_64-avx2-linux/llvm/clang/lib/Format/TokenAnnotator.cpp:3412:34: error: binding ‘const clang::format::FormatStyle’ to reference of type ‘clang::format::FormatStyle&’ discards qualifiers
   auto ShouldAddSpacesInAngles = [&Style = this->Style,
                                  ^
This commit is contained in:
Marek Kurdej 2021-04-29 10:06:46 +02:00
parent d138e97c2a
commit 40c2d6188b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang/lib/Format/TokenAnnotator.cpp
View File

@ -3409,11 +3409,10 @@ bool TokenAnnotator::spaceRequiredBefore(const AnnotatedLine &Line,
return Style.SpaceAfterCStyleCast ||
Right.isOneOf(TT_BinaryOperator, TT_SelectorName);
auto ShouldAddSpacesInAngles = [&Style = this->Style,
&HasExistingWhitespace]() {
if (Style.SpacesInAngles == FormatStyle::SIAS_Always)
auto ShouldAddSpacesInAngles = [this, &HasExistingWhitespace]() {
if (this->Style.SpacesInAngles == FormatStyle::SIAS_Always)
return true;
if (Style.SpacesInAngles == FormatStyle::SIAS_Leave)
if (this->Style.SpacesInAngles == FormatStyle::SIAS_Leave)
return HasExistingWhitespace();
return false;
};