diff options
| author | Daniel Jasper <djasper@google.com> | 2013-09-13 09:20:45 +0000 |
|---|---|---|
| committer | Daniel Jasper <djasper@google.com> | 2013-09-13 09:20:45 +0000 |
| commit | 015ed028cf6922059f3da337a7fbfeb874a51051 (patch) | |
| tree | 9d6a6b46217bf7b13a366cfe5ad73208fbcc8a68 /clang/lib/Format/FormatToken.cpp | |
| parent | d816320809937e4e202e83e9e7b53d64b0521038 (diff) | |
| download | bcm5719-llvm-015ed028cf6922059f3da337a7fbfeb874a51051.tar.gz bcm5719-llvm-015ed028cf6922059f3da337a7fbfeb874a51051.zip | |
clang-format: Fix incorrect enum parsing / layouting.
Before:
enum {
Bar = Foo < int,
int > ::value
};
After:
enum {
Bar = Foo<int, int>::value
};
llvm-svn: 190674
Diffstat (limited to 'clang/lib/Format/FormatToken.cpp')
| -rw-r--r-- | clang/lib/Format/FormatToken.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/lib/Format/FormatToken.cpp b/clang/lib/Format/FormatToken.cpp index 49e0ce83375..7469216a147 100644 --- a/clang/lib/Format/FormatToken.cpp +++ b/clang/lib/Format/FormatToken.cpp @@ -36,6 +36,7 @@ unsigned CommaSeparatedList::format(LineState &State, // Ensure that we start on the opening brace. const FormatToken *LBrace = State.NextToken->Previous->Previous; if (LBrace->isNot(tok::l_brace) || + LBrace->BlockKind == BK_Block || LBrace->Next->Type == TT_DesignatedInitializerPeriod) return 0; |
