Keep GTM building after clang r251041 when targeting 10.6

11 files changed, 18 insertions, 14 deletions

diff --git a/Foundation/GTMAbstractDOListener.h b/Foundation/GTMAbstractDOListener.h
index 38e8db4..104ec05 100644
--- a/Foundation/GTMAbstractDOListener.h
+++ b/Foundation/GTMAbstractDOListener.h
@@ -35,7 +35,7 @@
 @interface GTMAbstractDOListener : NSObject <NSConnectionDelegate> {
  @protected
   NSString *registeredName_;
-  __weak Protocol *protocol_;
+  GTM_WEAK Protocol *protocol_;
   NSConnection *connection_;
   BOOL isRunningInNewThread_;
   BOOL shouldShutdown_;
diff --git a/Foundation/GTMAbstractDOListener.m b/Foundation/GTMAbstractDOListener.m
index 0e221a8..4ac69bd 100644
--- a/Foundation/GTMAbstractDOListener.m
+++ b/Foundation/GTMAbstractDOListener.m
@@ -29,7 +29,7 @@
 // message.  This is only need on Tiger.
 #if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
 @interface GTMReceivePortDelegate : NSObject {
-  __weak id delegate_;
+  GTM_WEAK id delegate_;
 }
 - (id)initWithDelegate:(id)delegate;
 - (void)handlePortMessage:(NSPortMessage *)message;
diff --git a/Foundation/GTMAbstractDOListenerTest.m b/Foundation/GTMAbstractDOListenerTest.m
index d26d4fc..6a5a90a 100644
--- a/Foundation/GTMAbstractDOListenerTest.m
+++ b/Foundation/GTMAbstractDOListenerTest.m
@@ -57,7 +57,7 @@ enum {
 
 @interface TestServer : GTMAbstractDOListener<TestServerDOProtocol> {
  @private
-  __weak id delegate_;
+  GTM_WEAK id delegate_;
 }
 - (void)setDelegate:(id)delegate;
 @end
diff --git a/Foundation/GTMFileSystemKQueue.h b/Foundation/GTMFileSystemKQueue.h
index a81d433..c167eea 100644
--- a/Foundation/GTMFileSystemKQueue.h
+++ b/Foundation/GTMFileSystemKQueue.h
@@ -17,6 +17,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "GTMDefines.h"
 
 #import <sys/event.h>  // for kqueue() and kevent and the NOTE_* constants
 
@@ -50,7 +51,7 @@ typedef unsigned int GTMFileSystemKQueueEvents;
   int fd_;
   GTMFileSystemKQueueEvents events_;
   BOOL acrossReplace_;
-  __weak id target_;
+  GTM_WEAK id target_;
   SEL action_;
 }
 
diff --git a/Foundation/GTMFileSystemKQueueTest.m b/Foundation/GTMFileSystemKQueueTest.m
index a8eec37..3919b86 100644
--- a/Foundation/GTMFileSystemKQueueTest.m
+++ b/Foundation/GTMFileSystemKQueueTest.m
@@ -39,7 +39,7 @@
 @interface GTMFSKQTestHelper : NSObject {
  @private
   int writes_, renames_, deletes_;
-  __weak GTMFileSystemKQueue *queue_;
+  GTM_WEAK GTMFileSystemKQueue *queue_;
 }
 @end
 
diff --git a/Foundation/GTMLightweightProxy.h b/Foundation/GTMLightweightProxy.h
index 2e2a748..76ef66b 100644
--- a/Foundation/GTMLightweightProxy.h
+++ b/Foundation/GTMLightweightProxy.h
@@ -17,6 +17,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "GTMDefines.h"
 
 //
 // GTMLightweightProxy
@@ -31,7 +32,7 @@
 //
 @interface GTMLightweightProxy : NSProxy {
  @private
-  __weak id representedObject_;
+  GTM_WEAK id representedObject_;
 }
 
 // Initializes the object to represent |object|.
diff --git a/Foundation/GTMLogger+ASL.h b/Foundation/GTMLogger+ASL.h
index 87a513d..3b41e68 100644
--- a/Foundation/GTMLogger+ASL.h
+++ b/Foundation/GTMLogger+ASL.h
@@ -52,7 +52,7 @@
 //
 @interface GTMLogASLWriter : NSObject <GTMLogWriter> {
  @private
-  __weak Class aslClientClass_;
+  GTM_WEAK Class aslClientClass_;
   NSString *facility_;
 }
 
diff --git a/Foundation/GTMNSObject+KeyValueObserving.m b/Foundation/GTMNSObject+KeyValueObserving.m
index 814419b..70f5310 100644
--- a/Foundation/GTMNSObject+KeyValueObserving.m
+++ b/Foundation/GTMNSObject+KeyValueObserving.m
@@ -62,10 +62,10 @@
 
 @interface GTMKeyValueObservingHelper : NSObject {
  @private
-  __weak id observer_;
+  GTM_WEAK id observer_;
   SEL selector_;
   id userInfo_;
-  __weak id target_;
+  GTM_WEAK id target_;
   NSString* keyPath_;
 }
 
diff --git a/Foundation/GTMNSObject+KeyValueObservingTest.m b/Foundation/GTMNSObject+KeyValueObservingTest.m
index be3041b..ba59a96 100644
--- a/Foundation/GTMNSObject+KeyValueObservingTest.m
+++ b/Foundation/GTMNSObject+KeyValueObservingTest.m
@@ -34,7 +34,7 @@
 @interface GTMNSObject_KeyValueObservingTest : GTMTestCase  {
   int32_t count_;
   NSMutableDictionary *dict_;
-  __weak NSString *expectedValue_;
+  GTM_WEAK NSString *expectedValue_;
 }
 
 - (void)observeValueChange:(GTMKeyValueChangeNotification *)notification;
@@ -133,8 +133,8 @@
  @private
   id value_;
   id _value2;
-  __weak NSArray *value3_;
-  __weak NSString *value4;
+  GTM_WEAK NSArray *value3_;
+  GTM_WEAK NSString *value4;
 }
 - (NSString *)value4;
 @end
diff --git a/Foundation/GTMSignalHandler.h b/Foundation/GTMSignalHandler.h
index 6297197..ec21507 100644
--- a/Foundation/GTMSignalHandler.h
+++ b/Foundation/GTMSignalHandler.h
@@ -17,6 +17,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "GTMDefines.h"
 
 // GTMSignalHandler.
 //
@@ -60,7 +61,7 @@
 @interface GTMSignalHandler : NSObject {
  @private
   int signo_;
-  __weak id target_;
+  GTM_WEAK id target_;
   SEL action_;
 }
 
diff --git a/Foundation/GTMTransientRootProxy.h b/Foundation/GTMTransientRootProxy.h
index b5aa78a..3ebb501 100644
--- a/Foundation/GTMTransientRootProxy.h
+++ b/Foundation/GTMTransientRootProxy.h
@@ -17,6 +17,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "GTMDefines.h"
 
 // Handle (re-)connecting to a transient root proxy object via DO.
 //
@@ -68,7 +69,7 @@
 //
 @interface GTMTransientRootProxy : NSProxy {
  @protected
-  __weak Protocol *protocol_;
+  GTM_WEAK Protocol *protocol_;
   NSDistantObject *realProxy_;
 
   NSString *registeredName_;