summaryrefslogtreecommitdiffstats
path: root/third_party/ocmock
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/ocmock')
-rw-r--r--third_party/ocmock/Changes.txt14
-rw-r--r--third_party/ocmock/OCMock/OCPartialMockObject.m2
-rw-r--r--third_party/ocmock/README.chromium2
3 files changed, 14 insertions, 4 deletions
diff --git a/third_party/ocmock/Changes.txt b/third_party/ocmock/Changes.txt
index 8ff09c3..87aa9ee 100644
--- a/third_party/ocmock/Changes.txt
+++ b/third_party/ocmock/Changes.txt
@@ -1,5 +1,11 @@
-Chronological listing of changes. If a particular SVN revision has no entry, that
-check-in did not involve any code or feature changes.
+Chronological listing of changes. More detail is usually found in the Git commit messages
+and/or the pull requests.
+
+
+2012-01-23
+
+* Avoiding deprecated method to convert to a C string (thanks to Kushal Pisavadia)
+
2011-11-03
@@ -10,6 +16,10 @@ check-in did not involve any code or feature changes.
* Arguments only need to be equal, don't have to have same class
+
+
+Chronological listing of changes in the original Subversion code repository. If a particular
+SVN revision has no entry, that check-in did not involve any code or feature changes.
2011-02-15 (r74)
diff --git a/third_party/ocmock/OCMock/OCPartialMockObject.m b/third_party/ocmock/OCMock/OCPartialMockObject.m
index ebb889f..fb0b8bd 100644
--- a/third_party/ocmock/OCMock/OCPartialMockObject.m
+++ b/third_party/ocmock/OCMock/OCPartialMockObject.m
@@ -91,7 +91,7 @@ static NSMutableDictionary *mockTable;
{
Class realClass = [anObject class];
double timestamp = [NSDate timeIntervalSinceReferenceDate];
- const char *className = [[NSString stringWithFormat:@"%@-%p-%f", realClass, anObject, timestamp] cString];
+ const char *className = [[NSString stringWithFormat:@"%@-%p-%f", realClass, anObject, timestamp] UTF8String];
Class subclass = objc_allocateClassPair(realClass, className, 0);
objc_registerClassPair(subclass);
object_setClass(anObject, subclass);
diff --git a/third_party/ocmock/README.chromium b/third_party/ocmock/README.chromium
index fafe83b..f586f4f 100644
--- a/third_party/ocmock/README.chromium
+++ b/third_party/ocmock/README.chromium
@@ -1,7 +1,7 @@
Name: ocmock
URL: https://github.com/erikdoe/ocmock
Version: unknown
-Revision: 7f521db0628086185123666b0979e48d6ecaeac1
+Revision: dbdb233ae84498077f7e946abb49731968333f0b
License: BSD with advertising clause
License File: License.txt
Security Critical: no