diff options
| author |  gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2009-06-03 15:30:21 +0000 |
|---|---|---|
| committer | gtm.daemon <gtm.daemon@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3> | 2009-06-03 15:30:21 +0000 |
| commit | af75496ff656f8b7ec5eca5507fcd1641c2a5ab9 (patch) | |
| tree | ce41681d2cc5db174aa45c7c09335d33090ddfa4 | |
| parent | c7f56d0f7ff41fdb99c1e97f447e5aa843e7d9ef (diff) | |
[Author: dmaclach]
Get rid of GTM_MACOS_WEAK as it is only used in one place and we can code around that.
DELTA=6 (1 added, 4 deleted, 1 changed)
R=thomasvl
| -rw-r--r-- | AddressBook/GTMABAddressBook.h | 2 | ||||
| -rw-r--r-- | AddressBook/GTMABAddressBook.m | 3 | ||||
| -rw-r--r-- | GTMDefines.h | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/AddressBook/GTMABAddressBook.h b/AddressBook/GTMABAddressBook.h index e6d6d54..a73f8b6 100644 --- a/AddressBook/GTMABAddressBook.h +++ b/AddressBook/GTMABAddressBook.h @@ -171,7 +171,7 @@ extern NSString* const kABGroupRecordType; // Wrapper for an AddressBook on iPhone @interface GTMABAddressBook : NSObject { @private - GTM_WEAK_ON_MACOS ABAddressBookRef addressBook_; + ABAddressBookRef addressBook_; } // Returns a new instance of an address book. diff --git a/AddressBook/GTMABAddressBook.m b/AddressBook/GTMABAddressBook.m index 0a87927..77642db 100644 --- a/AddressBook/GTMABAddressBook.m +++ b/AddressBook/GTMABAddressBook.m @@ -80,6 +80,7 @@ typedef struct { addressBook_ = ABAddressBookCreate(); #else // GTM_IPHONE_SDK addressBook_ = ABGetSharedAddressBook(); + CFRetain(addressBook_); #endif // GTM_IPHONE_SDK if (!addressBook_) { // COV_NF_START @@ -92,11 +93,9 @@ typedef struct { } - (void)dealloc { -#if GTM_IPHONE_SDK if (addressBook_) { CFRelease(addressBook_); } -#endif // GTM_IPHONE_SDK [super dealloc]; } diff --git a/GTMDefines.h b/GTMDefines.h index bd87b82..2bb4486 100644 --- a/GTMDefines.h +++ b/GTMDefines.h @@ -208,11 +208,9 @@ GTM_EXTERN void _GTMUnitTestDevLog(NSString *format, ...); // Some of our own availability macros #if GTM_MACOS_SDK -#define GTM_WEAK_ON_MACOS __weak #define GTM_AVAILABLE_ONLY_ON_IPHONE UNAVAILABLE_ATTRIBUTE #define GTM_AVAILABLE_ONLY_ON_MACOS #else -#define GTM_WEAK_ON_MACOS #define GTM_AVAILABLE_ONLY_ON_IPHONE #define GTM_AVAILABLE_ONLY_ON_MACOS UNAVAILABLE_ATTRIBUTE #endif |