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

Improve diagnostic for redeclaring static member function. Fixes PR16382. 

llvm-svn: 184378
This commit is contained in:
Eli Friedman 2013-06-19 22:43:55 +00:00
parent 30f93859a9
commit f26b81b62a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2499,7 +2499,7 @@ bool Sema::MergeFunctionDecl(FunctionDecl *New, Decl *OldD, Scope *S) {
// -- Member function declarations with the same name and the // -- Member function declarations with the same name and the
// same parameter types cannot be overloaded if any of them // same parameter types cannot be overloaded if any of them
// is a static member function declaration. // is a static member function declaration.
if (OldMethod->isStatic() || NewMethod->isStatic()) { if (OldMethod->isStatic() != NewMethod->isStatic()) {
Diag(New->getLocation(), diag::err_ovl_static_nonstatic_member); Diag(New->getLocation(), diag::err_ovl_static_nonstatic_member);
Diag(Old->getLocation(), PrevDiag) << Old << Old->getType(); Diag(Old->getLocation(), PrevDiag) << Old << Old->getType();
return true; return true;

3
clang/test/SemaCXX/overload-decl.cpp
View File

@ -26,8 +26,9 @@ class X {
void g(int, float); // expected-note {{previous declaration is here}} void g(int, float); // expected-note {{previous declaration is here}}
int g(int, Float); // expected-error {{functions that differ only in their return type cannot be overloaded}} int g(int, Float); // expected-error {{functions that differ only in their return type cannot be overloaded}}
static void g(float); static void g(float); // expected-note {{previous declaration is here}}
static void g(int); // expected-error {{static and non-static member functions with the same parameter types cannot be overloaded}} static void g(int); // expected-error {{static and non-static member functions with the same parameter types cannot be overloaded}}
static void g(float); // expected-error {{class member cannot be redeclared}}
}; };
int main() {} // expected-note {{previous definition is here}} int main() {} // expected-note {{previous definition is here}}