summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorDaniel Jasper <djasper@google.com>2014-01-08 15:41:13 +0000
committerDaniel Jasper <djasper@google.com>2014-01-08 15:41:13 +0000
commit7620b6628b5d99d8a0915c85814ba22b10cd305d (patch)
tree395c3d269b0097ca34ec2acbf93fadccad890cdc /clang/lib
parent95c864d9bd3a61305243c350d6875cb7f0f72dcb (diff)
downloadbcm5719-llvm-7620b6628b5d99d8a0915c85814ba22b10cd305d.tar.gz
bcm5719-llvm-7620b6628b5d99d8a0915c85814ba22b10cd305d.zip
clang-format: Fix spacing in Cpp11 braced lists:
Before: vector<int> foo{ ::SomeFunction()}; After: vector<int> foo{::SomeFunction()}; llvm-svn: 198769
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Format/TokenAnnotator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Format/TokenAnnotator.cpp b/clang/lib/Format/TokenAnnotator.cpp
index 00d404ba4c4..98cc0033429 100644
--- a/clang/lib/Format/TokenAnnotator.cpp
+++ b/clang/lib/Format/TokenAnnotator.cpp
@@ -1278,7 +1278,7 @@ bool TokenAnnotator::spaceRequiredBetween(const AnnotatedLine &Line,
return false;
if (Left.is(tok::coloncolon))
return false;
- if (Right.is(tok::coloncolon))
+ if (Right.is(tok::coloncolon) && Left.isNot(tok::l_brace))
return (Left.is(tok::less) && Style.Standard == FormatStyle::LS_Cpp03) ||
!Left.isOneOf(tok::identifier, tok::greater, tok::l_paren,
tok::r_paren, tok::less);
OpenPOWER on IntegriCloud