diff options
| author | Daniel Jasper <djasper@google.com> | 2015-05-26 07:26:26 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2015-05-26 07:26:26 +0000 |
| commit | 0843434e742e1a7b48f9307b175af42c6840295d (patch) | |
| tree | aae6e0dddfac03d5d3063328ea0f7cd1132c03ab /clang/lib/Format/FormatToken.cpp | |
| parent | 0805199185ef27e3ebd87acb95bbf5a794ee7efe (diff) | |
| download | bcm5719-llvm-0843434e742e1a7b48f9307b175af42c6840295d.tar.gz bcm5719-llvm-0843434e742e1a7b48f9307b175af42c6840295d.zip | |
clang-format: Guard the bin-packing in braced lists on BinPackArguments
instead of BinPackParameters. Braced lists are used as constructor
calls in many places and so the bin-packing should follow what is done
for other calls and not what is done for function declarations.
llvm-svn: 238184
Diffstat (limited to 'clang/lib/Format/FormatToken.cpp')
| -rw-r--r-- | clang/lib/Format/FormatToken.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/Format/FormatToken.cpp b/clang/lib/Format/FormatToken.cpp index 42036666b0b..88678ca1abe 100644 --- a/clang/lib/Format/FormatToken.cpp +++ b/clang/lib/Format/FormatToken.cpp @@ -134,9 +134,9 @@ void CommaSeparatedList::precomputeFormattingInfos(const FormatToken *Token) { return; // In C++11 braced list style, we should not format in columns unless they - // have many items (20 or more) or we allow bin-packing of function - // parameters. - if (Style.Cpp11BracedListStyle && !Style.BinPackParameters && + // have many items (20 or more) or we allow bin-packing of function call + // arguments. + if (Style.Cpp11BracedListStyle && !Style.BinPackArguments && Commas.size() < 19) return; |
