aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Naroff <snaroff@apple.com>2009-03-03 15:49:23 +0000
committerSteve Naroff <snaroff@apple.com>2009-03-03 15:49:23 +0000
commit184671beebcbf89ebae95a3edf1e5e29ea72569c (patch)
tree0a3f11ded0d5488cbf0aeea2bc083f0d9923e2e5
parent15edf0de6b5bc9ae227bcc9658a157ac30efd92e (diff)
Remove old/incorrect warnings.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@65950 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/SemaObjC/property-3.m2
-rw-r--r--test/SemaObjC/property-5.m10
-rw-r--r--test/SemaObjC/property-category-3.m2
3 files changed, 7 insertions, 7 deletions
diff --git a/test/SemaObjC/property-3.m b/test/SemaObjC/property-3.m
index ead61508d5..6e92f25302 100644
--- a/test/SemaObjC/property-3.m
+++ b/test/SemaObjC/property-3.m
@@ -10,5 +10,5 @@
@interface NOW : I
@property (readonly) id d1; // expected-warning {{attribute 'readonly' of property 'd1' restricts attribute 'readwrite' of property inherited from 'I'}} expected-warning {{property 'd1' 'copy' attribute does not match the property inherited from 'I'}}
-@property (readwrite, copy) I* d2; // expected-warning {{property type 'I *' does not match property type inherited from 'I'}}
+@property (readwrite, copy) I* d2;
@end
diff --git a/test/SemaObjC/property-5.m b/test/SemaObjC/property-5.m
index 70ef315b22..1a3124087a 100644
--- a/test/SemaObjC/property-5.m
+++ b/test/SemaObjC/property-5.m
@@ -16,17 +16,17 @@
@end
@interface Data : Base <P1, P2>
-@property(readonly) NSData *ref; // expected-warning {{property type 'NSData *' does not match property type inherited from 'Base'}}
-@property(readonly) Data *p_base; // expected-warning {{property type 'Data *' does not match property type inherited from 'Base'}}
-@property(readonly) MutableNSData * m_nsdata; // expected-warning {{property type 'MutableNSData *' does not match property type inherited from 'Base'}}
+@property(readonly) NSData *ref;
+@property(readonly) Data *p_base;
+@property(readonly) MutableNSData * m_nsdata;
@end
@interface MutedData: Data
-@property(readonly) id p_base; // expected-warning {{property type 'id' does not match property type inherited from 'Data'}}
+@property(readonly) id p_base;
@end
@interface ConstData : Data <P1, P2, P3>
-@property(readonly) ConstData *p_base; // expected-warning {{property type 'ConstData *' does not match property type inherited from 'Data'}}
+@property(readonly) ConstData *p_base;
@end
void foo(Base *b, id x) {
diff --git a/test/SemaObjC/property-category-3.m b/test/SemaObjC/property-category-3.m
index 84dc3ad7f7..fdf78315c6 100644
--- a/test/SemaObjC/property-category-3.m
+++ b/test/SemaObjC/property-category-3.m
@@ -12,7 +12,7 @@
@end
@interface I (Cat) <P>
-@property float X; // expected-warning {{property type 'float' does not match property type inherited from 'P'}}
+@property float X; // expected-warning {{property type 'float' is incompatible with type 'int' inherited from 'P'}}
@end
@interface I (Cat2) <P1>