diff options
author | Bob Wilson <bob.wilson@apple.com> | 2014-08-08 23:46:25 +0000 |
---|---|---|
committer | Bob Wilson <bob.wilson@apple.com> | 2014-08-08 23:46:25 +0000 |
commit | 7400e596a39ce5252056a9f63113c42b2c172d3c (patch) | |
tree | 63dc7e6c4eac47395ab184a671278ec64f664de2 /clang | |
parent | f2cf38e0208d880e99dbf680060704d8c4a2bcae (diff) | |
download | bcm5719-llvm-7400e596a39ce5252056a9f63113c42b2c172d3c.tar.gz bcm5719-llvm-7400e596a39ce5252056a9f63113c42b2c172d3c.zip |
Predefine IB_DESIGNABLE and IBInspectable macros. <rdar://problem/17441860>
These macros are used as markers for Interface Builder and need to be defined
to empty strings since they have no impact on the code.
Patch by Ted Kremenek.
llvm-svn: 215259
Diffstat (limited to 'clang')
-rw-r--r-- | clang/lib/Frontend/InitPreprocessor.cpp | 2 | ||||
-rw-r--r-- | clang/test/SemaObjC/iboutlet.m | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp index 7a9d09a5e7a..32794f92123 100644 --- a/clang/lib/Frontend/InitPreprocessor.cpp +++ b/clang/lib/Frontend/InitPreprocessor.cpp @@ -530,6 +530,8 @@ static void InitializePredefinedMacros(const TargetInfo &TI, Builder.defineMacro("IBOutletCollection(ClassName)", "__attribute__((iboutletcollection(ClassName)))"); Builder.defineMacro("IBAction", "void)__attribute__((ibaction)"); + Builder.defineMacro("IBInspectable", ""); + Builder.defineMacro("IB_DESIGNABLE", ""); } if (LangOpts.CPlusPlus) diff --git a/clang/test/SemaObjC/iboutlet.m b/clang/test/SemaObjC/iboutlet.m index 63eac9af8a5..7d656a51684 100644 --- a/clang/test/SemaObjC/iboutlet.m +++ b/clang/test/SemaObjC/iboutlet.m @@ -6,12 +6,10 @@ @class NSView; -#define IBOutlet __attribute__((iboutlet)) - -@interface I +IB_DESIGNABLE @interface I @property (getter = MyGetter, readonly, assign) IBOutlet NSView *myView; // expected-warning {{readonly IBOutlet property 'myView' when auto-synthesized may not work correctly with 'nib' loader}} expected-note {{property should be changed to be readwrite}} -@property (readonly) IBOutlet NSView *myView1; // expected-warning {{readonly IBOutlet property 'myView1' when auto-synthesized may not work correctly with 'nib' loader}} expected-note {{property should be changed to be readwrite}} +IBInspectable @property (readonly) IBOutlet NSView *myView1; // expected-warning {{readonly IBOutlet property 'myView1' when auto-synthesized may not work correctly with 'nib' loader}} expected-note {{property should be changed to be readwrite}} @property (getter = MyGetter, READONLY) IBOutlet NSView *myView2; // expected-warning {{readonly IBOutlet property 'myView2' when auto-synthesized may not work correctly with 'nib' loader}} |