diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-20 23:33:17 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-20 23:33:17 +0000 |
| commit | 782e997e496d3c2369223a4ab043303a25088d7c (patch) | |
| tree | 6e61750ab38c20ffed0b4355c998471d22a0c8d9 /third_party/ocmock | |
| parent | f05ca87a5abe8952afba9259733850f754081779 (diff) | |
| download | chromium_src-782e997e496d3c2369223a4ab043303a25088d7c.zip chromium_src-782e997e496d3c2369223a4ab043303a25088d7c.tar.gz chromium_src-782e997e496d3c2369223a4ab043303a25088d7c.tar.bz2 | |
CGFloat is not a float in 64 bits.
BUG=222387
TEST=unit tests crashes less
Review URL: https://chromiumcodereview.appspot.com/12965006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189467 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ocmock')
| -rw-r--r-- | third_party/ocmock/ocmock_extensions.h | 1 | ||||
| -rw-r--r-- | third_party/ocmock/ocmock_extensions.mm | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/third_party/ocmock/ocmock_extensions.h b/third_party/ocmock/ocmock_extensions.h index 2ca182c..d817cbd 100644 --- a/third_party/ocmock/ocmock_extensions.h +++ b/third_party/ocmock/ocmock_extensions.h @@ -30,6 +30,7 @@ - (id)andReturnInteger:(NSInteger)value; - (id)andReturnUnsignedInteger:(NSUInteger)value; #if !TARGET_OS_IPHONE +- (id)andReturnCGFloat:(CGFloat)value; - (id)andReturnNSRect:(NSRect)rect; - (id)andReturnCGRect:(CGRect)rect; - (id)andReturnNSPoint:(NSPoint)point; diff --git a/third_party/ocmock/ocmock_extensions.mm b/third_party/ocmock/ocmock_extensions.mm index 353012e..bcf11b3 100644 --- a/third_party/ocmock/ocmock_extensions.mm +++ b/third_party/ocmock/ocmock_extensions.mm @@ -30,6 +30,8 @@ CR_OCMOCK_RETURN_IMPL(Integer, NSInteger); CR_OCMOCK_RETURN_IMPL(UnsignedInteger, NSUInteger); #if !TARGET_OS_IPHONE +CR_OCMOCK_RETURN_IMPL(CGFloat, CGFloat); + - (id)andReturnNSRect:(NSRect)rect { return [self andReturnValue:[NSValue valueWithRect:rect]]; } |