diff options
| author | Bob Wilson <bob.wilson@apple.com> | 2012-01-17 22:24:32 +0000 |
|---|---|---|
| committer | Bob Wilson <bob.wilson@apple.com> | 2012-01-17 22:24:32 +0000 |
| commit | 0af8049a0292ab79e3ccf9354170602e171742da (patch) | |
| tree | c316eecc9e8d537d575448080d9c70b938910f31 | |
| parent | f7b2d8b3b1971e73e2d2f0662520dc7693235a7f (diff) | |
Disable -Wduplicate-method-match by default. <rdar://problem/10663536>
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148343 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | include/clang/Basic/DiagnosticSemaKinds.td | 2 | ||||
| -rw-r--r-- | test/SemaObjC/DoubleMethod.m | 2 | ||||
| -rw-r--r-- | test/SemaObjC/check-dup-decl-methods-1.m | 2 | ||||
| -rw-r--r-- | test/SemaObjC/class-conforming-protocol-1.m | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index 049074d6e5..a13eedebfa 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -499,7 +499,7 @@ def err_setter_type_void : Error<"type of setter must be void">; def err_duplicate_method_decl : Error<"duplicate declaration of method %0">; def warn_duplicate_method_decl : Warning<"multiple declarations of method %0 found and ignored">, - InGroup<MethodDuplicate>; + InGroup<MethodDuplicate>, DefaultIgnore; def err_objc_var_decl_inclass : Error<"cannot declare variable inside @interface or @protocol">; def error_missing_method_context : Error< diff --git a/test/SemaObjC/DoubleMethod.m b/test/SemaObjC/DoubleMethod.m index 6c7e907cb5..3452dbedb5 100644 --- a/test/SemaObjC/DoubleMethod.m +++ b/test/SemaObjC/DoubleMethod.m @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fsyntax-only -verify %s +// RUN: %clang_cc1 -Wduplicate-method-match -fsyntax-only -verify %s @interface Subclass { diff --git a/test/SemaObjC/check-dup-decl-methods-1.m b/test/SemaObjC/check-dup-decl-methods-1.m index 667c381145..389566781d 100644 --- a/test/SemaObjC/check-dup-decl-methods-1.m +++ b/test/SemaObjC/check-dup-decl-methods-1.m @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fsyntax-only -verify %s +// RUN: %clang_cc1 -Wduplicate-method-match -fsyntax-only -verify %s @interface SUPER - (int) meth; diff --git a/test/SemaObjC/class-conforming-protocol-1.m b/test/SemaObjC/class-conforming-protocol-1.m index 5d4e86ddfe..115ddd231e 100644 --- a/test/SemaObjC/class-conforming-protocol-1.m +++ b/test/SemaObjC/class-conforming-protocol-1.m @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -fsyntax-only -verify %s +// RUN: %clang_cc1 -Wduplicate-method-match -fsyntax-only -verify %s @protocol P1 @end @protocol P2 @end |