diff options
-rw-r--r-- | third_party/ocmock/ocmock.gyp | 2 | ||||
-rw-r--r-- | third_party/ocmock/ocmock_extensions.h | 2 | ||||
-rw-r--r-- | third_party/ocmock/ocmock_extensions.mm | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/third_party/ocmock/ocmock.gyp b/third_party/ocmock/ocmock.gyp index 11e8a01..04a4a88 100644 --- a/third_party/ocmock/ocmock.gyp +++ b/third_party/ocmock/ocmock.gyp @@ -6,7 +6,7 @@ 'targets': [ ], 'conditions': [ - ['OS=="mac"', { + ['OS=="mac" or OS=="ios"', { 'targets' : [ { 'target_name' : 'ocmock', diff --git a/third_party/ocmock/ocmock_extensions.h b/third_party/ocmock/ocmock_extensions.h index 53e0c15..2ca182c 100644 --- a/third_party/ocmock/ocmock_extensions.h +++ b/third_party/ocmock/ocmock_extensions.h @@ -29,10 +29,12 @@ - (id)andReturnBool:(BOOL)value; - (id)andReturnInteger:(NSInteger)value; - (id)andReturnUnsignedInteger:(NSUInteger)value; +#if !TARGET_OS_IPHONE - (id)andReturnNSRect:(NSRect)rect; - (id)andReturnCGRect:(CGRect)rect; - (id)andReturnNSPoint:(NSPoint)point; - (id)andReturnCGPoint:(CGPoint)point; +#endif @end // A constraint for verifying that something conforms to a protocol. diff --git a/third_party/ocmock/ocmock_extensions.mm b/third_party/ocmock/ocmock_extensions.mm index 14c3a80..353012e 100644 --- a/third_party/ocmock/ocmock_extensions.mm +++ b/third_party/ocmock/ocmock_extensions.mm @@ -29,6 +29,7 @@ CR_OCMOCK_RETURN_IMPL(Bool, BOOL); CR_OCMOCK_RETURN_IMPL(Integer, NSInteger); CR_OCMOCK_RETURN_IMPL(UnsignedInteger, NSUInteger); +#if !TARGET_OS_IPHONE - (id)andReturnNSRect:(NSRect)rect { return [self andReturnValue:[NSValue valueWithRect:rect]]; } @@ -44,6 +45,7 @@ CR_OCMOCK_RETURN_IMPL(UnsignedInteger, NSUInteger); - (id)andReturnCGPoint:(CGPoint)point { return [self andReturnNSPoint:NSPointFromCGPoint(point)]; } +#endif // !TARGET_OS_IPHONE @end |