diff options
| author | Daniel Jasper <djasper@google.com> | 2014-07-30 12:14:10 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2014-07-30 12:14:10 +0000 |
| commit | 71646ec206721c32cb10cd6f66c10a3709c54be0 (patch) | |
| tree | 13305cbf9dfcce36cced39c7630d13d2e01515e9 /clang/lib | |
| parent | e7532e59c057a07a27a569cc249cc3a27ff22194 (diff) | |
| download | bcm5719-llvm-71646ec206721c32cb10cd6f66c10a3709c54be0.tar.gz bcm5719-llvm-71646ec206721c32cb10cd6f66c10a3709c54be0.zip | |
clang-format: Understand 'typename' in placement new.
Before:
new (aaaaaaaaaaaaaaaaaaaaaaaaaa(
aaaaaaaaaaaaaaaaaaaaaaa)) typename aaaaaaaaaaaaaaaaaaaaaaaa();
After:
new (aaaaaaaaaaaaaaaaaaaaaaaaaa(aaaaaaaaaaaaaaaaaaaaaaa))
typename aaaaaaaaaaaaaaaaaaaaaaaa();
llvm-svn: 214300
Diffstat (limited to 'clang/lib')
| -rw-r--r-- | clang/lib/Format/TokenAnnotator.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp index 269e2fc28aa..6f77ae3d29b 100644 --- a/clang/lib/Format/TokenAnnotator.cpp +++ b/clang/lib/Format/TokenAnnotator.cpp @@ -1811,7 +1811,8 @@ bool TokenAnnotator::canBreakBefore(const AnnotatedLine &Line, Left.isOneOf(tok::comma, tok::coloncolon, tok::semi, tok::l_brace, tok::kw_class, tok::kw_struct) || Right.isMemberAccess() || - Right.isOneOf(tok::lessless, tok::colon, tok::l_square, tok::at) || + Right.isOneOf(tok::lessless, tok::colon, tok::l_square, tok::at, + tok::kw_typename) || (Left.is(tok::r_paren) && Right.isOneOf(tok::identifier, tok::kw_const)) || (Left.is(tok::l_paren) && !Right.is(tok::r_paren)); |
