diff options
| author | Eli Bendersky <eliben@chromium.org> | 2013-07-15 16:08:08 -0700 |
|---|---|---|
| committer | Eli Bendersky <eliben@chromium.org> | 2013-07-15 16:08:08 -0700 |
| commit | e789858899a7b36caf11b371a97411a1582a482b (patch) | |
| tree | e8c28b178b32010f73b477b3c65b5ff74437530c /test/SemaObjC/gcc-cast-ext.m | |
| parent | 99a5501f5ae5b75017dfc386d4abf648234e85df (diff) | |
| parent | 20c7d45a4da9f58ad805ad1d37f92fe7dc232ec8 (diff) | |
Merge commit '20c7d45a4da9f58ad805ad1d37f92fe7dc232ec8'
Conflicts:
lib/CodeGen/ItaniumCXXABI.cpp
Diffstat (limited to 'test/SemaObjC/gcc-cast-ext.m')
| -rw-r--r-- | test/SemaObjC/gcc-cast-ext.m | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/SemaObjC/gcc-cast-ext.m b/test/SemaObjC/gcc-cast-ext.m index 30e0dce4bd..5858393b41 100644 --- a/test/SemaObjC/gcc-cast-ext.m +++ b/test/SemaObjC/gcc-cast-ext.m @@ -5,8 +5,8 @@ typedef struct _NSRange { } NSRange; @class PBXFileReference; @interface PBXDocBookmark -+ alloc; // expected-note {{method definition for 'alloc' not found}} -- autorelease; // expected-note {{method definition for 'autorelease' not found}} ++ alloc; // expected-note {{method 'alloc' declared here}} +- autorelease; // expected-note {{method 'autorelease' declared here}} @end // GCC allows pointer expressions in integer constant expressions. @@ -14,7 +14,8 @@ struct { char control[((int)(char *)2)]; } xx; -@implementation PBXDocBookmark // expected-warning {{incomplete implementation}} +@implementation PBXDocBookmark // expected-warning {{method definition for 'autorelease' not found}}\ + // expected-warning {{method definition for 'alloc' not found}} + (id)bookmarkWithFileReference:(PBXFileReference *)fileRef gylphRange:(NSRange)range anchor:(NSString *)htmlAnchor { |