maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Avoid redundant error when redefining a function as deleted. 

Reviewed by Doug Gregor.

llvm-svn: 159442
This commit is contained in:
David Blaikie 2012-06-29 18:00:25 +00:00
parent 674acc12d0
commit af031a9af7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clang/lib/Sema/SemaDeclCXX.cpp
View File

@ -10318,8 +10318,8 @@ void Sema::SetDeclDeleted(Decl *Dcl, SourceLocation DelLoc) {
if (const FunctionDecl *Prev = Fn->getPreviousDecl()) {
// Don't consider the implicit declaration we generate for explicit
// specializations. FIXME: Do not generate these implicit declarations.
if (Prev->getTemplateSpecializationKind() != TSK_ExplicitSpecialization
|| Prev->getPreviousDecl()) {
if ((Prev->getTemplateSpecializationKind() != TSK_ExplicitSpecialization
|| Prev->getPreviousDecl()) && !Prev->isDefined()) {
Diag(DelLoc, diag::err_deleted_decl_not_first);
Diag(Prev->getLocation(), diag::note_previous_declaration);
}

3
clang/test/SemaCXX/deleted-function.cpp
View File

@ -63,3 +63,6 @@ template void test2<int>();
template<typename> void test3() = delete; // expected-note {{explicit instantiation refers here}}
template<typename> void test3();
template void test3<int>(); // expected-error {{explicit instantiation of undefined function template 'test3'}}
void test4() {} // expected-note {{previous definition is here}}
void test4() = delete; // expected-error {{redefinition of 'test4'}}