diff options
author | Dan Albert <danalbert@google.com> | 2016-02-24 13:48:45 -0800 |
---|---|---|
committer | Dan Albert <danalbert@google.com> | 2016-02-24 13:51:18 -0800 |
commit | b9de1157289455b0ca26daff519d4a0ddcd1fa13 (patch) | |
tree | 4c56cc0a34b91f17033a40a455f26652304f7b8d /gcc-4.8.1/gcc/testsuite/obj-c++.dg/method-conflict-1.mm | |
parent | 098157a754787181cfa10e71325832448ddcea98 (diff) | |
download | toolchain_gcc-b9de1157289455b0ca26daff519d4a0ddcd1fa13.tar.gz toolchain_gcc-b9de1157289455b0ca26daff519d4a0ddcd1fa13.tar.bz2 toolchain_gcc-b9de1157289455b0ca26daff519d4a0ddcd1fa13.zip |
Update 4.8.1 to 4.8.3.
My previous drop was the wrong version. The platform mingw is
currently using 4.8.3, not 4.8.1 (not sure how I got that wrong).
From ftp://ftp.gnu.org/gnu/gcc/gcc-4.8.3/gcc-4.8.3.tar.bz2.
Bug: http://b/26523949
Change-Id: Id85f1bdcbbaf78c7d0b5a69e74c798a08f341c35
Diffstat (limited to 'gcc-4.8.1/gcc/testsuite/obj-c++.dg/method-conflict-1.mm')
-rw-r--r-- | gcc-4.8.1/gcc/testsuite/obj-c++.dg/method-conflict-1.mm | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/gcc-4.8.1/gcc/testsuite/obj-c++.dg/method-conflict-1.mm b/gcc-4.8.1/gcc/testsuite/obj-c++.dg/method-conflict-1.mm deleted file mode 100644 index 2cc96e4fd..000000000 --- a/gcc-4.8.1/gcc/testsuite/obj-c++.dg/method-conflict-1.mm +++ /dev/null @@ -1,26 +0,0 @@ -/* Contributed by Nicola Pero <nicola.pero@meta-innovation.com>, December 2010. */ -/* { dg-do compile } */ - -#include <objc/objc.h> - -/* Test that you can not declare two methods, in the same protocol, - with the same name but conflicting method signatures. */ - -@protocol MyProtocol -+ (int) method1: (int)x; /* { dg-message "previous declaration" } */ -+ (float) method1: (int)x; /* { dg-error "duplicate declaration of method .\\+method1." } */ - -- (int) method2: (int)x; /* { dg-message "previous declaration" } */ -- (int) method2: (float)x; /* { dg-error "duplicate declaration of method .\\-method2." } */ - -@optional -+ (int *) method3: (int)x; /* { dg-message "previous declaration" } */ -+ (int *) method3: (int **)x; /* { dg-error "duplicate declaration of method .\\+method3." } */ - -- (id) method4: (id)x; /* { dg-message "previous declaration" } */ -- (void) method4: (id)x; /* { dg-error "duplicate declaration of method .\\-method4." } */ -@end - -/* We don't test conflicting types between @required and @optional - methods, as that is tested in method-conflict-2. */ - |