diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2010-03-19 21:25:51 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2010-03-19 21:25:51 +0000 |
| commit | 5140920a489c398c959c1720072afa8e959ccfbb (patch) | |
| tree | 802fe4d37f8955af56a2190eb72d7f88359af46e | |
| parent | da4a3ed75e781acb35062390d165433b53352682 (diff) | |
| download | bcm5719-llvm-5140920a489c398c959c1720072afa8e959ccfbb.tar.gz bcm5719-llvm-5140920a489c398c959c1720072afa8e959ccfbb.zip | |
More coherent diagnostics when ivar is placed n categories.
(related to radar 7538989).
llvm-svn: 98993
| -rw-r--r-- | clang/include/clang/Basic/DiagnosticSemaKinds.td | 3 | ||||
| -rw-r--r-- | clang/test/SemaObjC/ivar-in-class-extension.m | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 5a95c0f8527..752be5df7a1 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -1537,8 +1537,7 @@ def err_forward_ref_enum : Error< "ISO C++ forbids forward references to 'enum' types">; def err_redefinition_of_enumerator : Error<"redefinition of enumerator %0">; def err_duplicate_member : Error<"duplicate member %0">; -def err_misplaced_ivar : Error<"ivar may be placed in a class extension " - "in non-fragile-abi2 mode only">; +def err_misplaced_ivar : Error<"ivars may not be placed in categories">; def ext_enum_value_not_int : Extension< "ISO C restricts enumerator values to range of 'int' (%0 is too " "%select{small|large}1)">; diff --git a/clang/test/SemaObjC/ivar-in-class-extension.m b/clang/test/SemaObjC/ivar-in-class-extension.m index 683a78feef2..e1a649cd478 100644 --- a/clang/test/SemaObjC/ivar-in-class-extension.m +++ b/clang/test/SemaObjC/ivar-in-class-extension.m @@ -31,12 +31,12 @@ int fn3(SomeClass *obj) { @end @interface SomeClass (Category) - { // expected-error {{ivar may be placed in a class extension}} + { // expected-error {{ivars may not be placed in categories}} int categoryIvar; } @end @interface SomeClass (Category1) - { // expected-error {{ivar may be placed in a class extension}} + { // expected-error {{ivars may not be placed in categories}} } @end |
