diff options
| author | kushi.p@gmail.com <kushi.p@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 19:36:18 +0000 |
|---|---|---|
| committer | kushi.p@gmail.com <kushi.p@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-07 19:36:18 +0000 |
| commit | 5d8e991fa3a6838a7fb79d52c081bded0b1de891 (patch) | |
| tree | b24e9e4e63b5057745cfae60c6390bb4eec0a26f /third_party/ocmock/OCMock/OCMArg.m | |
| parent | b7e45c0bf261e570692d25203db304650ad95333 (diff) | |
| download | chromium_src-5d8e991fa3a6838a7fb79d52c081bded0b1de891.zip chromium_src-5d8e991fa3a6838a7fb79d52c081bded0b1de891.tar.gz chromium_src-5d8e991fa3a6838a7fb79d52c081bded0b1de891.tar.bz2 | |
Roll OCMOCK forward to 8b8793cf29a5bac0541421ea06c7dff071afb25e
BUG=113894
TEST=unit_tests
Review URL: http://codereview.chromium.org/9616059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ocmock/OCMock/OCMArg.m')
| -rw-r--r-- | third_party/ocmock/OCMock/OCMArg.m | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/third_party/ocmock/OCMock/OCMArg.m b/third_party/ocmock/OCMock/OCMArg.m index 6cf198f..a73e3df 100644 --- a/third_party/ocmock/OCMock/OCMArg.m +++ b/third_party/ocmock/OCMock/OCMArg.m @@ -3,6 +3,7 @@ // Copyright (c) 2009-2010 by Mulle Kybernetik. See License file for details. //--------------------------------------------------------------------------------------- +#import <objc/runtime.h> #import <OCMock/OCMArg.h> #import <OCMock/OCMConstraint.h> #import "OCMPassByRefSetter.h" @@ -64,7 +65,7 @@ void *pointer = [value pointerValue]; if(pointer == (void *)0x01234567) return [OCMArg any]; - if((pointer != NULL) && (((id)pointer)->isa == [OCMPassByRefSetter class])) + if((pointer != NULL) && (object_getClass((id)pointer) == [OCMPassByRefSetter class])) return (id)pointer; } return value; |