Skip to content
Browse files

Bug fix

  • Loading branch information...
1 parent 5355463 commit e5447585c8337cb7a303e04a0989de1d40a315a3 Kevin Malakoff committed Aug 3, 2012
View
37 Lib/Helpers/SSArguments.h
@@ -28,6 +28,7 @@
//
#import "NSMutableArray+SS.h"
+#import "TargetConditionals.h"
// any number of arguments of type id or NSObject terminated with nil
#define ARGS_AO(_name, _lastNamedArg) \
@@ -38,7 +39,8 @@
for (NSO* arg = _lastNamedArg; arg != nil; arg = va_arg(argList, NSO*)) { [_name addObject:arg]; } \
va_end(argList); \
}
-
+
+#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
// any number of arguments of type NSInteger terminated with AI_END
#define AI_END (I)NSNotFound
#define ARGS_AI(_name, _lastNamedArg) \
@@ -49,6 +51,18 @@
for (I arg = _lastNamedArg; arg != AI_END; arg = va_arg(argList, I)) { [_name addObject:N.I(arg)]; } \
va_end(argList); \
}
+#elif TARGET_OS_MAC
+// any number of arguments of type NSInteger terminated with AI_END
+#define AI_END (int)NSNotFound
+#define ARGS_AI(_name, _lastNamedArg) \
+ A* _name = A.newArguments; \
+ { \
+ va_list argList; \
+ va_start(argList, _lastNamedArg); \
+ for (int arg = (int) _lastNamedArg; arg != AI_END; arg = va_arg(argList, int)) { [_name addObject:N.I((I)arg)]; } \
+ va_end(argList); \
+ }
+#endif
// one argument of type BOOL
#define ARG_B(_name, _lastNamedArg) \
@@ -60,6 +74,7 @@
va_end(argList); \
}
+#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
// one argument of type NSInteger
#define ARG_I(_name, _lastNamedArg) \
I _name; \
@@ -79,6 +94,26 @@
_name = va_arg(argList, UI); \
va_end(argList); \
}
+#elif TARGET_OS_MAC
+// one argument of type NSInteger
+#define ARG_I(_name, _lastNamedArg) \
+ I _name; \
+ { \
+ va_list argList; \
+ va_start(argList, _lastNamedArg); \
+ _name = (I) va_arg(argList, int); \
+ va_end(argList); \
+ }
+// one argument of type NSUInteger
+#define ARG_UI(_name, _lastNamedArg) \
+ UI _name; \
+ { \
+ va_list argList; \
+ va_start(argList, _lastNamedArg); \
+ _name = (UI) va_arg(argList, unsigned int); \
+ va_end(argList); \
+ }
+#endif
// one argument of type float
#define ARG_F(_name, _lastNamedArg) \
View
5 Lib/NSDictionary+NamedProperties.m
@@ -30,6 +30,7 @@
#import "NSDictionary+NamedProperties.h"
#import <objc/runtime.h>
+#import "TargetConditionals.h"
#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
#define BLOCK_TO_IMPL(_b) imp_implementationWithBlock((void*)CFBridgingRetain(_b))
#elif TARGET_OS_MAC
@@ -211,7 +212,7 @@ + (BOOL)resolveNamedProperties:(SEL)selector
implementation = BLOCK_TO_IMPL(^(NSDictionary* obj, id value) {
[obj.getPropertiesContainer setValue:value forKey:name];
});
- else if ((attrs[1]==_C_CHR) || (attrs[1]==_C_UCHR) || (attrs[1]==_C_USHT) || (attrs[1]==_C_INT) || (attrs[1]==_C_UINT) || (attrs[1]==_C_LNG) || (attrs[1]==_C_ULNG)|| (attrs[1]==_C_LNG_LNG) || (attrs[1]==_C_ULNG_LNG))
+ else if ((attrs[1]==_C_CHR) || (attrs[1]==_C_UCHR) || (attrs[1]==_C_USHT) || (attrs[1]==_C_INT) || (attrs[1]==_C_UINT) || (attrs[1]==_C_LNG) || (attrs[1]==_C_ULNG))
implementation = BLOCK_TO_IMPL(^(NSDictionary* obj, NSInteger value) {
[obj.getPropertiesContainer setValue:[NSNumber numberWithInteger:value] forKey:name];
});
@@ -237,7 +238,7 @@ + (BOOL)resolveNamedProperties:(SEL)selector
implementation = BLOCK_TO_IMPL(^(NSDictionary* obj) {
return [obj.getPropertiesContainer valueForKey:name];
});
- else if ((attrs[1]==_C_CHR) || (attrs[1]==_C_UCHR) || (attrs[1]==_C_USHT) || (attrs[1]==_C_INT) || (attrs[1]==_C_UINT) || (attrs[1]==_C_LNG) || (attrs[1]==_C_ULNG)|| (attrs[1]==_C_LNG_LNG) || (attrs[1]==_C_ULNG_LNG))
+ else if ((attrs[1]==_C_CHR) || (attrs[1]==_C_UCHR) || (attrs[1]==_C_USHT) || (attrs[1]==_C_INT) || (attrs[1]==_C_UINT) || (attrs[1]==_C_LNG) || (attrs[1]==_C_ULNG))
implementation = BLOCK_TO_IMPL(^(NSDictionary* obj) {
NSNumber* value = [obj.getPropertiesContainer valueForKey:name];
return value ? value.integerValue : 0;
View
4 Podfile
@@ -1,5 +1,5 @@
platform :ios
-pod 'QUnit.m', '~> 0.1.0'
+pod 'QUnit.m', '~> 0.1.1'
platform :osx
-pod 'QUnit.m', '~> 0.1.0'
+pod 'QUnit.m', '~> 0.1.1'
View
5 Pods/Pods.xcodeproj/project.pbxproj
@@ -205,7 +205,7 @@
A32159E9FF3D468F85654C2D /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0440;
};
buildConfigurationList = 36C027E7C55A4EE2A2E7E5F4 /* Build configuration list for PBXProject "Pods" */;
compatibilityVersion = "Xcode 3.2";
@@ -328,6 +328,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DSTROOT = /tmp/xcodeproj.dst;
@@ -356,6 +357,7 @@
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DSTROOT = /tmp/xcodeproj.dst;
FRAMEWORK_SEARCH_PATHS = (
@@ -403,6 +405,7 @@
0A14EEB115CB9D400098AC02 /* Release */,
);
defaultConfigurationIsVisible = 0;
+ defaultConfigurationName = Release;
};
36C027E7C55A4EE2A2E7E5F4 /* Build configuration list for PBXProject "Pods" */ = {
isa = XCConfigurationList;
View
2 Pods/build/Pods.build/Debug/QUnit.m_OSX.build/build-state.dat
@@ -203,7 +203,7 @@ r0
CCheck dependencies
r0
-lSLF05#21%IDEActivityLogSection1@2#32"com.apple.dt.IDE.BuildLogSection18"Check dependencies80b5bef79dcbb541^8c4dbff79dcbb541^---0#1#0#--18"Check dependencies36"C1357693-B169-489D-9534-744852DF920E-
+lSLF05#21%IDEActivityLogSection1@2#32"com.apple.dt.IDE.BuildLogSection18"Check dependenciesbce6e9abaccbb541^2deb36acaccbb541^---0#1#0#--18"Check dependencies36"38860926-D5EE-433A-B5C0-C932EC36E6A1-
CCompileC build/Pods.build/Debug/QUnit.m_OSX.build/Objects-normal/x86_64/PodsDummy_Pods.o /Users/kevin/Dev/OpenSourceProjects/Mine/Objective-C/SubjectiveScript.m/Pods/PodsDummy_Pods.m normal x86_64 objective-c com.apple.compilers.llvm.clang.1_0.compiler
s365665738.981003

0 comments on commit e544758

Please sign in to comment.
Something went wrong with that request. Please try again.