diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2000-02-23 17:25:29 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2000-02-23 17:25:29 +0000 |
| commit | e867a179503c2f85996c6a25a493fa3c47a7960e (patch) | |
| tree | 44f50b74c87a774e1d5afa572d3611bdf1949863 /gcc | |
| parent | 2148624a44cb575edab51bf505687e4f8ca6445d (diff) | |
| download | gcc-e867a179503c2f85996c6a25a493fa3c47a7960e.zip gcc-e867a179503c2f85996c6a25a493fa3c47a7960e.tar.gz gcc-e867a179503c2f85996c6a25a493fa3c47a7960e.tar.bz2 | |
* decl.c (decls_match): Remove obsolete static member nadgering.
From-SVN: r32115
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 22 |
2 files changed, 5 insertions, 21 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index a6952c1..417ceea 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2000-02-23 Nathan Sidwell <nathan@codesourcery.com> + + * decl.c (decls_match): Remove obsolete static member nadgering. + 2000-02-21 Martin v. Löwis <loewis@informatik.hu-berlin.de> * decl.c (grokdeclarator): Change ANSI to ISO. diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index b23052c..e899d5f 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -2810,28 +2810,8 @@ decls_match (newdecl, olddecl) && DECL_LANGUAGE (olddecl) == lang_c)) return 0; - /* When we parse a static member function definition, - we put together a FUNCTION_DECL which thinks its type - is METHOD_TYPE. Change that to FUNCTION_TYPE, and - proceed. */ - if (TREE_CODE (f1) == METHOD_TYPE && DECL_STATIC_FUNCTION_P (olddecl)) - revert_static_member_fn (&newdecl, &f1, &p1); - else if (TREE_CODE (f2) == METHOD_TYPE - && DECL_STATIC_FUNCTION_P (newdecl)) - revert_static_member_fn (&olddecl, &f2, &p2); - - /* Here we must take care of the case where new default - parameters are specified. Also, warn if an old - declaration becomes ambiguous because default - parameters may cause the two to be ambiguous. */ if (TREE_CODE (f1) != TREE_CODE (f2)) - { - if (TREE_CODE (f1) == OFFSET_TYPE) - cp_compiler_error ("`%D' redeclared as member function", newdecl); - else - cp_compiler_error ("`%D' redeclared as non-member function", newdecl); - return 0; - } + return 0; if (same_type_p (TREE_TYPE (f1), TREE_TYPE (f2))) { |