Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

As discussed in #macdev #5

Merged
merged 2 commits into from over 2 years ago

2 participants

Matt Mower Mike Ash
Matt Mower

One commit adds the missing #import to fix the warnings.
The other wraps the iOS specific code in #if TARGET_OS_IPHONE > 0 to avoid OS X side errors.

Mike Ash mikeash merged commit 4b84c25 into from
Mike Ash mikeash closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.

Showing 3 changed files with 9 additions and 0 deletions. Show diff stats Hide diff stats

  1. +1 0  MACompoundFuture.m
  2. +4 0 MAFuture.h
  3. +4 0 MAFuture.m
1  MACompoundFuture.m
@@ -4,6 +4,7 @@
4 4 #import "MAFuture.h"
5 5 #import "MAFutureInternal.h"
6 6 #import "MAMethodSignatureCache.h"
  7 +#import "MACompoundFuture.h"
7 8
8 9
9 10 #define ENABLE_LOGGING 0
4 MAFuture.h
@@ -6,6 +6,8 @@ id MALazyFuture(id (^block)(void));
6 6 #define MALazyFuture(...) ((__typeof((__VA_ARGS__)()))MALazyFuture((id (^)(void))(__VA_ARGS__)))
7 7
8 8
  9 +#if TARGET_OS_IPHONE > 0
  10 +
9 11 #ifdef __IPHONE_4_0
10 12
11 13 #pragma mark -
@@ -30,3 +32,5 @@ id IKAutoArchivingMemoryAwareFutureCreate(id (^block)(void));
30 32 #define IKAutoArchivingMemoryAwareFutureCreate(...)((__typeof((__VA_ARGS__)()))IKAutoArchivingMemoryAwareFutureCreate((id (^)(void))(__VA_ARGS__)))
31 33
32 34 #endif // __IPHONE_4_0
  35 +
  36 +#endif
4 MAFuture.m
@@ -121,6 +121,8 @@ id MALazyFuture(id (^block)(void))
121 121 #pragma mark -
122 122 #pragma mark iOS Futures
123 123
  124 +#if TARGET_OS_IPHONE > 0
  125 +
124 126 #ifdef __IPHONE_4_0
125 127
126 128 @implementation _IKMemoryAwareFuture
@@ -374,3 +376,5 @@ id IKAutoArchivingMemoryAwareFuture(id (^block)(void)) {
374 376 }
375 377
376 378 #endif // __IPHONE_4_0
  379 +
  380 +#endif

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.