From db36b8055ea9d817a6c7a19130f625e5123b4803 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Thu, 20 Jan 2011 03:57:25 +0000 Subject: Pass the VirtSpecifiers along to Sema::ActOnCXXMemberDeclarator. llvm-svn: 123878 --- clang/include/clang/Sema/Sema.h | 2 +- clang/lib/Parse/ParseCXXInlineMethods.cpp | 3 ++- clang/lib/Parse/ParseDeclCXX.cpp | 2 +- clang/lib/Sema/SemaDeclCXX.cpp | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/clang/include/clang/Sema/Sema.h b/clang/include/clang/Sema/Sema.h index 36c406476e4..a7fe528f066 100644 --- a/clang/include/clang/Sema/Sema.h +++ b/clang/include/clang/Sema/Sema.h @@ -2538,7 +2538,7 @@ public: Decl *ActOnCXXMemberDeclarator(Scope *S, AccessSpecifier AS, Declarator &D, MultiTemplateParamsArg TemplateParameterLists, - Expr *BitfieldWidth, + Expr *BitfieldWidth, const VirtSpecifiers &VS, Expr *Init, bool IsDefinition, bool Deleted = false); diff --git a/clang/lib/Parse/ParseCXXInlineMethods.cpp b/clang/lib/Parse/ParseCXXInlineMethods.cpp index 2341ad39f07..0a5a586f738 100644 --- a/clang/lib/Parse/ParseCXXInlineMethods.cpp +++ b/clang/lib/Parse/ParseCXXInlineMethods.cpp @@ -37,7 +37,8 @@ Decl *Parser::ParseCXXInlineMethodDef(AccessSpecifier AS, Declarator &D, move(TemplateParams)); else // FIXME: pass template information through FnD = Actions.ActOnCXXMemberDeclarator(getCurScope(), AS, D, - move(TemplateParams), 0, 0, + move(TemplateParams), 0, + VirtSpecifiers(), 0, /*IsDefinition*/true); HandleMemberFunctionDefaultArgs(D, FnD); diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp index 0dc367c9fd3..998a4976d2b 100644 --- a/clang/lib/Parse/ParseDeclCXX.cpp +++ b/clang/lib/Parse/ParseDeclCXX.cpp @@ -1601,7 +1601,7 @@ void Parser::ParseCXXClassMemberDeclaration(AccessSpecifier AS, DeclaratorInfo, move(TemplateParams), BitfieldSize.release(), - Init.release(), + VS, Init.release(), /*IsDefinition*/Deleted, Deleted); } diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index a164e5c7b8f..c1523cffc14 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -859,7 +859,8 @@ Decl *Sema::ActOnAccessSpecifier(AccessSpecifier Access, Decl * Sema::ActOnCXXMemberDeclarator(Scope *S, AccessSpecifier AS, Declarator &D, MultiTemplateParamsArg TemplateParameterLists, - ExprTy *BW, ExprTy *InitExpr, bool IsDefinition, + ExprTy *BW, const VirtSpecifiers &VS, + ExprTy *InitExpr, bool IsDefinition, bool Deleted) { const DeclSpec &DS = D.getDeclSpec(); DeclarationNameInfo NameInfo = GetNameForDeclarator(D); -- cgit v1.2.3