aboutsummaryrefslogtreecommitdiff
path: root/Foundation/GTMValidatingContainers.m
diff options
context:
space:
mode:
authorGravatar thomasvl@gmail.com <thomasvl@gmail.com@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>2008-10-22 19:16:19 +0000
committerGravatar thomasvl@gmail.com <thomasvl@gmail.com@7dc7ac4e-7543-0410-b95c-c1676fc8e2a3>2008-10-22 19:16:19 +0000
commit11938e47355bfbf3b81f1ff5b15f1222b83d4f47 (patch)
tree3794c78559472e4b2efe5eabc0e094d7c14a9743 /Foundation/GTMValidatingContainers.m
parent90eba8f973c0b77f36dc7084163ff0d43675a1a8 (diff)
- GTM_INLINE will make sure a function gets inlined, and provides a consistent
way for all GTM code to do it. - Added GTMDebugThreadValidation to allow you to enforce the fact that your code must run in the main thread in DEBUG builds. - Updated some internals of the iPhone unittesting so it doesn't double print the test descriptions, file names, or lines numbers of a test failure line. Also includes the test names in the error output. - Changed the xcconfigs so that know it's easier to set different settings at the different levels and not accidentally overwrite settings set at lower levels in the "settings collapse". Also tightened up warnings significantly. - Changed how gtm_unitTestExposedBindingsTestValues works. If you have an implementation of gtm_unitTestExposedBindingsTestValues in your own code you will need to update to the new way of calling. See implementations in GTMNSObject+BindingUnitTesting.m for details. - Added support for grabbing the build number for a particular OS in GTMSystemVersion and easily comparing it to known build numbers, and switched some types from in GTMSystemVersion from "int" to SInt32 to make 64 bit work better. - Added support for SnowLeopard (10A96). We build cleanly with the 10.6 SDKs and all radar checks were updated accordingly. Build All script was also updated to build on SnowLeopard if you have the SDK available. - Turned off building ppc64 GTM because the SnowLeopard SDK currently doesn't have ppc64 support, so SenTestCase isn't defined. This makes it impossible to build the ppc64 10.5 config on SnowLeopard. We have left the setting in the xcconfig for those of you who need it, but have disabled it in the GTM project settings. - Turned on stack smashing protection on the debug builds for all Leopard and above. - Added ability to easily do leak checking by defining the GTM_ENABLE_LEAKS environment variable. It isn't on by default because several of Apple's frameworks leak. You can work around these false positives by using the GTM_LEAKS_SYMBOLS_TO_IGNORE environment variable. Also if you turn on leaks make sure to turn off zombies by defining the GTM_DISABLE_ZOMBIES variable, otherwise every memory allocation you do will look like a leak.
Diffstat (limited to 'Foundation/GTMValidatingContainers.m')
-rw-r--r--Foundation/GTMValidatingContainers.m38
1 files changed, 26 insertions, 12 deletions
diff --git a/Foundation/GTMValidatingContainers.m b/Foundation/GTMValidatingContainers.m
index f46ba3f..3b31356 100644
--- a/Foundation/GTMValidatingContainers.m
+++ b/Foundation/GTMValidatingContainers.m
@@ -34,10 +34,10 @@
#import <objc/objc-runtime.h>
#endif // GTM_IPHONE_SDK
-static inline BOOL VerifyObjectWithTargetAndSelectorForContainer(id anObject,
- id target,
- SEL selector,
- id container) {
+GTM_INLINE BOOL VerifyObjectWithTargetAndSelectorForContainer(id anObject,
+ id target,
+ SEL selector,
+ id container) {
// We must take care here, since Intel leaves junk in high bytes of return
// register for predicates that return BOOL.
// For details see:
@@ -59,7 +59,7 @@ static inline BOOL VerifyObjectWithTargetAndSelectorForContainer(id anObject,
return isGood;
}
-static inline void VerifySelectorOnTarget(SEL sel, id target) {
+GTM_INLINE void VerifySelectorOnTarget(SEL sel, id target) {
GTMAssertSelectorNilOrImplementedWithReturnTypeAndArguments(target,
sel,
@encode(BOOL),
@@ -207,7 +207,9 @@ void _GTMValidateContainer(id container, id target, SEL selector) {
- (id)initValidatingWithCapacity:(NSUInteger)capacity
target:(id)target
selector:(SEL)sel {
- [self release];
+ if ((self = [super init])) {
+ [self release];
+ }
return [[NSMutableArray alloc] initWithCapacity:capacity];
}
#endif // GTM_CONTAINERS_VALIDATE
@@ -282,7 +284,9 @@ void _GTMValidateContainer(id container, id target, SEL selector) {
- (id)initValidatingWithCapacity:(NSUInteger)capacity
target:(id)target
selector:(SEL)sel {
- [self release];
+ if ((self = [super init])) {
+ [self release];
+ }
return [[NSMutableDictionary alloc] initWithCapacity:capacity];
}
@@ -359,7 +363,9 @@ void _GTMValidateContainer(id container, id target, SEL selector) {
- (id)initValidatingWithCapacity:(NSUInteger)capacity
target:(id)target
selector:(SEL)sel {
- [self release];
+ if ((self = [super init])) {
+ [self release];
+ }
return [[NSMutableSet alloc] initWithCapacity:capacity];
}
#endif // GTM_CONTAINERS_VALIDATE
@@ -384,7 +390,9 @@ void _GTMValidateContainer(id container, id target, SEL selector) {
}
return self;
#else // GTM_CONTAINERS_VALIDATE
- [self release];
+ if ((self = [super init])) {
+ [self release];
+ }
return nil;
#endif // GTM_CONTAINERS_VALIDATE
}
@@ -411,7 +419,9 @@ void _GTMValidateContainer(id container, id target, SEL selector) {
}
return self;
#else // GTM_CONTAINERS_VALIDATE
- [self release];
+ if ((self = [super init])) {
+ [self release];
+ }
return nil;
#endif // GTM_CONTAINERS_VALIDATE
}
@@ -438,7 +448,9 @@ void _GTMValidateContainer(id container, id target, SEL selector) {
}
return self;
#else // GTM_CONTAINERS_VALIDATE
- [self release];
+ if ((self = [super init])) {
+ [self release];
+ }
return nil;
#endif // GTM_CONTAINERS_VALIDATE
}
@@ -465,7 +477,9 @@ void _GTMValidateContainer(id container, id target, SEL selector) {
}
return self;
#else // GTM_CONTAINERS_VALIDATE
- [self release];
+ if ((self = [super init])) {
+ [self release];
+ }
return nil;
#endif // GTM_CONTAINERS_VALIDATE
}