summaryrefslogtreecommitdiffstats
path: root/clang/lib/Parse/ParseDeclCXX.cpp
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@mac.com>2011-03-25 14:31:08 +0000
committerAnders Carlsson <andersca@mac.com>2011-03-25 14:31:08 +0000
commit30f29444c0af378a943e5ca59bd511237338aadd (patch)
tree6462248a0ab7cf45438ed24675ccce52e477468a /clang/lib/Parse/ParseDeclCXX.cpp
parent843c69119b69b0d34ebfe31819c73dda46705814 (diff)
downloadbcm5719-llvm-30f29444c0af378a943e5ca59bd511237338aadd.tar.gz
bcm5719-llvm-30f29444c0af378a943e5ca59bd511237338aadd.zip
Get rid of handling of the 'explicit' keyword from class-head. We still parse it though, although that will change shortly.
llvm-svn: 128277
Diffstat (limited to 'clang/lib/Parse/ParseDeclCXX.cpp')
-rw-r--r--clang/lib/Parse/ParseDeclCXX.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp
index c50ff4c9dbf..988ac842235 100644
--- a/clang/lib/Parse/ParseDeclCXX.cpp
+++ b/clang/lib/Parse/ParseDeclCXX.cpp
@@ -1777,8 +1777,11 @@ void Parser::ParseCXXMemberSpecification(SourceLocation RecordLoc,
SourceLocation LBraceLoc = ConsumeBrace();
+ SourceLocation FinalLoc =
+ CVS.isFinalSpecified() ? CVS.getFinalLoc() : SourceLocation();
+
if (TagDecl)
- Actions.ActOnStartCXXMemberDeclarations(getCurScope(), TagDecl, CVS,
+ Actions.ActOnStartCXXMemberDeclarations(getCurScope(), TagDecl, FinalLoc,
LBraceLoc);
// C++ 11p3: Members of a class defined with the keyword class are private
OpenPOWER on IntegriCloud