summaryrefslogtreecommitdiff
path: root/gcc/testsuite/objc.dg/method-1.m
diff options
context:
space:
mode:
authorzack <zack@138bc75d-0d04-0410-961f-82ee72b054a4>2004-01-11 01:18:58 +0000
committerzack <zack@138bc75d-0d04-0410-961f-82ee72b054a4>2004-01-11 01:18:58 +0000
commit679bf1777e6c54577ce4c39010bc0074e9008a6c (patch)
treec27f7a971534ddc43e590439ef9efa353e830bbf /gcc/testsuite/objc.dg/method-1.m
parentb0effe67f3808898f0e6ed4207c077faf120d81e (diff)
downloadgcc-679bf1777e6c54577ce4c39010bc0074e9008a6c.tar.gz
* c-decl.c (duplicate_decls): Break apart into...
(diagnose_arglist_conflict, validate_proto_after_old_defn) (locate_old_defn, diagnose_mismatched_decls, merge_decls): ... these new functions. Restructure for comprehensibility. Remove various archaic special cases. Always report the location of the previous declaration when a diagnostic is issued. (redeclaration_error_message): Fold into diagnose_mismatched_decls. (match_builtin_function_types): Delete unnecessary forward declaration. testsuite: * gcc.dg/Wshadow-1.c, gcc.dg/attr-noinline.c, gcc.dg/decl3.c * gcc.dg/redecl-1.c, gcc.dg/visibility-7.c, gcc.dg/wtr-static-1.c * gcc.dg/noncompile/20020220-1.c, objc.dg/method-1.m: Update dg-error regexps. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@75667 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/testsuite/objc.dg/method-1.m')
-rw-r--r--gcc/testsuite/objc.dg/method-1.m6
1 files changed, 2 insertions, 4 deletions
diff --git a/gcc/testsuite/objc.dg/method-1.m b/gcc/testsuite/objc.dg/method-1.m
index 391ee629c70..a73a0f4921d 100644
--- a/gcc/testsuite/objc.dg/method-1.m
+++ b/gcc/testsuite/objc.dg/method-1.m
@@ -16,9 +16,8 @@
@end
@implementation class3
-- (int) meth1 { return 0; }
+- (int) meth1 { return 0; } /* { dg-error "previous definition" } */
- (int) meth1 { return 0; } /* { dg-error "redefinition of" } */
-/* { dg-error "previously defined here" "" { target *-*-* } 19 } */
@end
@interface class4
@@ -26,7 +25,6 @@
@end
@implementation class4
-+ (void) meth1 {}
++ (void) meth1 {} /* { dg-error "previous definition" } */
+ (void) meth1 {} /* { dg-error "redefinition of" } */
-/* { dg-error "previously defined here" "" { target *-*-* } 29 } */
@end