summaryrefslogtreecommitdiffstats
path: root/lib/Parse/ParseDeclCXX.cpp
diff options
context:
space:
mode:
authorDavid Blaikie <dblaikie@gmail.com>2012-03-12 15:39:49 +0000
committerDavid Blaikie <dblaikie@gmail.com>2012-03-12 15:39:49 +0000
commit6f42669b7c0b81b07a15a0483aa5e897ce57cb45 (patch)
tree597045de7196910d95da45ff2f15818d7f3b26d9 /lib/Parse/ParseDeclCXX.cpp
parente45b9b71b9ead9873c50ccd149a10f554f71bd9f (diff)
Fix a crash-on-invalid found by -Wlogical-op-parentheses.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@152559 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseDeclCXX.cpp')
-rw-r--r--lib/Parse/ParseDeclCXX.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index 979b4dd18f..cf18a5b629 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -1136,7 +1136,7 @@ void Parser::ParseClassSpecifier(tok::TokenKind TagTokKind,
else if (Tok.is(tok::l_brace) ||
(getLangOpts().CPlusPlus && Tok.is(tok::colon)) ||
(isCXX0XFinalKeyword() &&
- NextToken().is(tok::l_brace) || NextToken().is(tok::colon))) {
+ (NextToken().is(tok::l_brace) || NextToken().is(tok::colon)))) {
if (DS.isFriendSpecified()) {
// C++ [class.friend]p2:
// A class shall not be defined in a friend declaration.