diff options
author | Daniel Jasper <djasper@google.com> | 2015-05-18 14:49:19 +0000 |
---|---|---|
committer | Daniel Jasper <djasper@google.com> | 2015-05-18 14:49:19 +0000 |
commit | 6219f10c6f7200df306c742957436912c2d53c0c (patch) | |
tree | 39e23a446161eefd0b709092cb66f6a84b3c2b3e /lib/Format/UnwrappedLineParser.h | |
parent | 513f0c09b40f4474ed6beb4427aa409c94a8e38b (diff) |
clang-format: Fix another regression caused by r237565.
Before:
class C : test {
class D : test{void f(){int i{2};
}
}
;
}
;
After:
class C : test {
class D : test {
void f() { int i{2}; }
};
};
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@237569 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Format/UnwrappedLineParser.h')
-rw-r--r-- | lib/Format/UnwrappedLineParser.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Format/UnwrappedLineParser.h b/lib/Format/UnwrappedLineParser.h index a75845f5d8..c2fa029576 100644 --- a/lib/Format/UnwrappedLineParser.h +++ b/lib/Format/UnwrappedLineParser.h @@ -82,7 +82,7 @@ private: void parsePPEndIf(); void parsePPUnknown(); void parseStructuralElement(); - bool tryToParseBracedList(bool ExpectClassBody = false); + bool tryToParseBracedList(); bool parseBracedList(bool ContinueOnSemicolons = false); void parseParens(); void parseSquare(); @@ -113,7 +113,7 @@ private: void readToken(); void flushComments(bool NewlineBeforeNext); void pushToken(FormatToken *Tok); - void calculateBraceTypes(bool ExpectClassBody); + void calculateBraceTypes(bool ExpectClassBody = false); // Marks a conditional compilation edge (for example, an '#if', '#ifdef', // '#else' or merge conflict marker). If 'Unreachable' is true, assumes |