third_party/ocmock/ocmock_extensions.mm - Issue 10834362: Support for iOS in OCMock

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/ocmock/ocmock_extensions.mm

Issue 10834362: Support for iOS in OCMock (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Remove extra line Created 8 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/ocmock/ocmock_extensions.mm

diff --git a/third_party/ocmock/ocmock_extensions.mm b/third_party/ocmock/ocmock_extensions.mm

index 14c3a8058e517927eec3413e6f277d7aa2ab7fc3..353012e0dec71c571c6a977d6ffd5f356f57e6ac 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

« no previous file with comments | « third_party/ocmock/ocmock_extensions.h ('k') | no next file » | no next file with comments »