diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-20 09:42:01 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-20 09:42:01 +0000 |
| commit | 27a619097eb99a7c31028aa7077f18938760c549 (patch) | |
| tree | 9f9bb9bab73c287aba944c47e9281ca5c2f76d36 /third_party/ocmock | |
| parent | 73c982dc7f89551cd4f6f17cf14715f827312148 (diff) | |
| download | chromium_src-27a619097eb99a7c31028aa7077f18938760c549.zip chromium_src-27a619097eb99a7c31028aa7077f18938760c549.tar.gz chromium_src-27a619097eb99a7c31028aa7077f18938760c549.tar.bz2 | |
Fix OCMock's 64-bit compilation issues.
BUG=222047
TEST=no visible changes
Review URL: https://chromiumcodereview.appspot.com/12474010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189233 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/ocmock')
| -rw-r--r-- | third_party/ocmock/OCMock/OCMockObject.m | 4 | ||||
| -rw-r--r-- | third_party/ocmock/OCMock/OCObserverMockObject.m | 4 | ||||
| -rw-r--r-- | third_party/ocmock/README.chromium | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/third_party/ocmock/OCMock/OCMockObject.m b/third_party/ocmock/OCMock/OCMockObject.m index 198c683..6f2daf0 100644 --- a/third_party/ocmock/OCMock/OCMockObject.m +++ b/third_party/ocmock/OCMock/OCMockObject.m @@ -142,8 +142,8 @@ } if([expectations count] > 0) { - [NSException raise:NSInternalInconsistencyException format:@"%@ : %d expected methods were not invoked: %@", - [self description], [expectations count], [self _recorderDescriptions:YES]]; + [NSException raise:NSInternalInconsistencyException format:@"%@ : %ld expected methods were not invoked: %@", + [self description], (unsigned long)[expectations count], [self _recorderDescriptions:YES]]; } if([exceptions count] > 0) { diff --git a/third_party/ocmock/OCMock/OCObserverMockObject.m b/third_party/ocmock/OCMock/OCObserverMockObject.m index 8509856..74be80d 100644 --- a/third_party/ocmock/OCMock/OCObserverMockObject.m +++ b/third_party/ocmock/OCMock/OCObserverMockObject.m @@ -53,8 +53,8 @@ } if([recorders count] > 0) { - [NSException raise:NSInternalInconsistencyException format:@"%@ : %d expected notifications were not observed.", - [self description], [recorders count]]; + [NSException raise:NSInternalInconsistencyException format:@"%@ : %ld expected notifications were not observed.", + [self description], (unsigned long)[recorders count]]; } } diff --git a/third_party/ocmock/README.chromium b/third_party/ocmock/README.chromium index 6d3f1b3..436e321 100644 --- a/third_party/ocmock/README.chromium +++ b/third_party/ocmock/README.chromium @@ -16,4 +16,10 @@ This is only a partial inclusion of the OCMock tree. This only includes /Source/OCMock because the tests and other files are not necessary for Chromium. The License.txt and Changes.txt file are also present from /Source. +Chromium can no longer sync to the tip-of-tree because upstream OCMock requires +10.7 as of b5773084d56d2573caf6a2d98d5b56e301673de1. + Chromium adds gtest_support.h/.mm and ocmock_extensions.h/.mm. + +Chromium alters all NSLogging of -[NSArray count] to compile under both 32 and +64 bits. |