diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2015-09-29 11:41:53 -0400 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2015-09-29 17:18:09 -0400 |
commit | 1383d53e67dac1d005fb3f8659e695b0be7e2718 (patch) | |
tree | 24b6f67087dc984bd5b1237c0e3964c34971604f /objectivec/Tests/GPBTestUtilities.m | |
parent | 0e5686a70768a289782eb1e1aa86646e56897e4d (diff) | |
download | protobuf-1383d53e67dac1d005fb3f8659e695b0be7e2718.tar.gz protobuf-1383d53e67dac1d005fb3f8659e695b0be7e2718.tar.bz2 protobuf-1383d53e67dac1d005fb3f8659e695b0be7e2718.zip |
Cleanups for newer Xcodes
- Move up to 8.4 as the high simulator (assuming Xcode 6.4).
- Add cast to NSMutableDictionary so clang and resolve the selector.
- Add case for the newer static analyzer so it won't trigger a false warning.
- Update the "dictionary" interface to use "object" naming. Xcode 7+ has gotten
more strict on the use of nonnull/nullable; combining that with the generic
collection support; and the "dictionary" classes we created now collide with
what the generic KeyValueCoding in the system headers triggering
warnings/errors. Fix this and hopefully all future issue by renaming the
methods to use "object" for the classes that have data types as objects
instead of PODs. Taking this renaming hit now while ObjC is still in beta
because it is a breaking change for any existing code.
Diffstat (limited to 'objectivec/Tests/GPBTestUtilities.m')
-rw-r--r-- | objectivec/Tests/GPBTestUtilities.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/objectivec/Tests/GPBTestUtilities.m b/objectivec/Tests/GPBTestUtilities.m index 3d85c744..726761a7 100644 --- a/objectivec/Tests/GPBTestUtilities.m +++ b/objectivec/Tests/GPBTestUtilities.m @@ -1110,7 +1110,7 @@ const uint32_t kGPBDefaultRepeatCount = 2; [dataStr release]; NSData *data = [[NSData alloc] initWithUint32_gpbtu:i + 1]; - [message.mapInt32Bytes setValue:data forKey:113 + i * 100]; + [message.mapInt32Bytes setObject:data forKey:113 + i * 100]; [data release]; [message.mapInt32Enum @@ -1119,7 +1119,7 @@ const uint32_t kGPBDefaultRepeatCount = 2; ForeignMessage *subMsg = [[ForeignMessage alloc] init]; subMsg.c = i + 1; - [message.mapInt32ForeignMessage setValue:subMsg forKey:115 + i * 100]; + [message.mapInt32ForeignMessage setObject:subMsg forKey:115 + i * 100]; [subMsg release]; } } |