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

Do not return true from MergeFunctionDecl for a warn_static_non_static warning in Microsoft mode. 

llvm-svn: 130010
This commit is contained in:
Francois Pichet 2011-04-22 19:50:06 +00:00
parent ad8b4d402e
commit 6841a12845
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
clang/lib/Sema/SemaDecl.cpp
View File

@ -1258,12 +1258,14 @@ bool Sema::MergeFunctionDecl(FunctionDecl *New, Decl *OldD) {
New->getStorageClass() == SC_Static &&
Old->getStorageClass() != SC_Static &&
!canRedefineFunction(Old, getLangOptions())) {
unsigned DiagID = diag::err_static_non_static;
if (getLangOptions().Microsoft)
DiagID = diag::warn_static_non_static;
Diag(New->getLocation(), DiagID) << New;
Diag(Old->getLocation(), PrevDiag);
return true;
if (getLangOptions().Microsoft) {
Diag(New->getLocation(), diag::warn_static_non_static) << New;
Diag(Old->getLocation(), PrevDiag);
} else {
Diag(New->getLocation(), diag::err_static_non_static) << New;
Diag(Old->getLocation(), PrevDiag);
return true;
}
}
// If a function is first declared with a calling convention, but is