From 9a53c7f40d02a4d10411aae6e161a25a39512e72 Mon Sep 17 00:00:00 2001 From: Manuel Klimek Date: Thu, 5 Sep 2013 15:34:55 +0000 Subject: Fixes PR 17106 (explicitly typed enums are formatted differently). Before: enum X : int { A, B, C }; After: enum X : int { A, B, C }; llvm-svn: 190054 --- clang/lib/Format/UnwrappedLineParser.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'clang/lib/Format') diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp index 5029bd689bc..766e1d8d922 100644 --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -1035,9 +1035,7 @@ void UnwrappedLineParser::parseEnum() { if (FormatTok->Tok.is(tok::kw_class) || FormatTok->Tok.is(tok::kw_struct)) nextToken(); - if (FormatTok->Tok.is(tok::identifier) || - FormatTok->Tok.is(tok::kw___attribute) || - FormatTok->Tok.is(tok::kw___declspec)) { + while (FormatTok->Tok.getIdentifierInfo() || FormatTok->Tok.is(tok::colon)) { nextToken(); // We can have macros or attributes in between 'enum' and the enum name. if (FormatTok->Tok.is(tok::l_paren)) { -- cgit v1.2.3