diff options
| author |  Thomas Van Lenten <thomasvl@google.com> | 2015-11-03 10:08:17 -0500 |
|---|---|---|
| committer | Thomas Van Lenten <thomasvl@google.com> | 2015-11-03 10:08:17 -0500 |
| commit | f2f8cc667b790dcd71709cb3a175944d38b1e78a (patch) | |
| tree | a1ee53015afcff9e74d0b696401b0514b8b609c6 /AppKit | |
| parent | d160301ee824d8c77bcef4af3f8265c8cb376a7c (diff) | |
Keep GTM building after clang r251041 when targeting 10.6
Diffstat (limited to 'AppKit')
| -rw-r--r-- | AppKit/GTMCarbonEvent.h | 2 | ||||
| -rw-r--r-- | AppKit/GTMWindowSheetController.h | 7 | ||||
| -rw-r--r-- | AppKit/GTMWindowSheetController.m | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/AppKit/GTMCarbonEvent.h b/AppKit/GTMCarbonEvent.h index a234532..364be3a 100644 --- a/AppKit/GTMCarbonEvent.h +++ b/AppKit/GTMCarbonEvent.h @@ -235,7 +235,7 @@ GTM_EXTERN NSUInteger GTMCarbonToCocoaKeyModifiers(UInt32 inCarbonModifiers); // handler we are wrapping // lazily created in the eventHandler method EventHandlerRef eventHandler_; - __weak id delegate_; // Our delegate + GTM_WEAK id delegate_; // Our delegate // Does our delegate respond to the gtm_eventHandler:receivedEvent:handler: // selector? Cached for performance reasons. BOOL delegateRespondsToHandleEvent_; diff --git a/AppKit/GTMWindowSheetController.h b/AppKit/GTMWindowSheetController.h index 7991112..2ef0198 100644 --- a/AppKit/GTMWindowSheetController.h +++ b/AppKit/GTMWindowSheetController.h @@ -17,6 +17,7 @@ // #import <Cocoa/Cocoa.h> +#import "GTMDefines.h" // A class to manage multiple sheets for a window. Use it for tab-style // interfaces, where each tab might need its own sheet. @@ -56,9 +57,9 @@ @interface GTMWindowSheetController : NSObject { @private - __weak NSWindow* window_; - __weak NSView* activeView_; - __weak id <GTMWindowSheetControllerDelegate> delegate_; + GTM_WEAK NSWindow* window_; + GTM_WEAK NSView* activeView_; + GTM_WEAK id <GTMWindowSheetControllerDelegate> delegate_; NSMutableDictionary* sheets_; // NSValue*(NSView*) -> SheetInfo* } diff --git a/AppKit/GTMWindowSheetController.m b/AppKit/GTMWindowSheetController.m index 7cfeaeb..8e2d13c 100644 --- a/AppKit/GTMWindowSheetController.m +++ b/AppKit/GTMWindowSheetController.m @@ -26,7 +26,7 @@ NSWindow* overlayWindow_; // delegate data - __weak id modalDelegate_; + GTM_WEAK id modalDelegate_; SEL didEndSelector_; void* contextInfo_; |