Merge branch 'hotfix/545-conditional-nsorderedset' into development

This commit is contained in:
Blake Watters
2012-02-25 12:03:48 -05:00
5 changed files with 16 additions and 6 deletions

View File

@@ -21,6 +21,8 @@
#import "RKDotNetDateFormatter.h"
#import "RestKit.h"
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 || __IPHONE_OS_VERSION_MAX_ALLOWED >= 40000
BOOL isValidRange(NSRange rangeOfMatch);
NSTimeInterval secondsFromMilliseconds(NSTimeInterval millisecs);
NSTimeInterval millisecondsFromSeconds(NSTimeInterval seconds);
@@ -113,3 +115,4 @@ NSTimeInterval millisecondsFromSeconds(NSTimeInterval seconds) {
return seconds * 1000.f;
}
#endif