diff options
| author | Joe George <joe@zeroc.com> | 2016-02-12 16:27:11 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-02-12 16:30:17 -0500 |
| commit | c7f45aca281068bd27850a7aeb9acad4e1799cab (patch) | |
| tree | 1542242e63c15b1467665bb9cc90934c937d78f4 /objective-c/include | |
| parent | workaround for compiler error in php7 with gcc 4.8 (diff) | |
| download | ice-c7f45aca281068bd27850a7aeb9acad4e1799cab.tar.bz2 ice-c7f45aca281068bd27850a7aeb9acad4e1799cab.tar.xz ice-c7f45aca281068bd27850a7aeb9acad4e1799cab.zip | |
Fix ICE-6987
Change writeOpt to writeOptional and readOpt to readOptional
Diffstat (limited to 'objective-c/include')
| -rw-r--r-- | objective-c/include/objc/Ice/Stream.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/objective-c/include/objc/Ice/Stream.h b/objective-c/include/objc/Ice/Stream.h index 500e704cba6..be7a1ddde60 100644 --- a/objective-c/include/objc/Ice/Stream.h +++ b/objective-c/include/objc/Ice/Stream.h @@ -216,9 +216,9 @@ ICE_API @protocol ICEStreamHelper +(id) readRetained:(id<ICEInputStream>)stream NS_RETURNS_RETAINED; +(id) read:(id<ICEInputStream>)stream; +(void) write:(id)obj stream:(id<ICEOutputStream>)stream; -+(id) readOptRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag; -+(id) readOpt:(id<ICEInputStream>)stream tag:(ICEInt)tag; -+(void) writeOpt:(id)obj stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag; ++(id) readOptionalRetained:(id<ICEInputStream>)stream tag:(ICEInt)tag; ++(id) readOptional:(id<ICEInputStream>)stream tag:(ICEInt)tag; ++(void) writeOptional:(id)obj stream:(id<ICEOutputStream>)stream tag:(ICEInt)tag; +(ICEInt) minWireSize; @end @@ -254,7 +254,7 @@ ICE_API @interface ICEStringHelper : ICEStreamHelper ICE_API @interface ICEObjectHelper : ICEStreamHelper +(void)read:(ICEObject**)v stream:(id<ICEInputStream>)stream; -+(void)readOpt:(id*)v stream:(id<ICEInputStream>)stream tag:(ICEInt)tag; ++(void)readOptional:(id*)v stream:(id<ICEInputStream>)stream tag:(ICEInt)tag; @end ICE_API @interface ICEProxyHelper : ICEStreamHelper |