aboutsummaryrefslogtreecommitdiff
path: root/lib/Parse/ParseDeclCXX.cpp
diff options
context:
space:
mode:
authorRichard Smith <richard-llvm@metafoo.co.uk>2011-10-15 03:38:41 +0000
committerRichard Smith <richard-llvm@metafoo.co.uk>2011-10-15 03:38:41 +0000
commit29e3a31b7cbd9f9cdf2cc857a3a805871b6f3f62 (patch)
tree91dd5d42f320f275516129da004922825eeb0430 /lib/Parse/ParseDeclCXX.cpp
parentc8645e38bfe5ab46e424b7aaca53c064105c4265 (diff)
Don't warn about use of 'final' in ill-formed C++98 code which didn't use
'final', and don't accept (then silently discard) braced init lists in C++98 new-expressions. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@142048 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseDeclCXX.cpp')
-rw-r--r--lib/Parse/ParseDeclCXX.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp
index 4339047f1f..358aec62ec 100644
--- a/lib/Parse/ParseDeclCXX.cpp
+++ b/lib/Parse/ParseDeclCXX.cpp
@@ -2080,11 +2080,12 @@ void Parser::ParseCXXMemberSpecification(SourceLocation RecordLoc,
Ident_override = &PP.getIdentifierTable().get("override");
}
- if (II == Ident_final)
+ if (II == Ident_final) {
FinalLoc = ConsumeToken();
- if (!getLang().CPlusPlus0x)
- Diag(FinalLoc, diag::ext_override_control_keyword) << "final";
+ if (!getLang().CPlusPlus0x)
+ Diag(FinalLoc, diag::ext_override_control_keyword) << "final";
+ }
}
if (Tok.is(tok::colon)) {