Merge pull request #960 from audun/master
Fixed a few minor compilation errors when using ObjC++
This commit is contained in:
commit
613ef3489d
1 changed files with 3 additions and 3 deletions
|
|
@ -693,7 +693,7 @@ static void AFNetworkReachabilityReleaseCallback(const void *info) {
|
||||||
}
|
}
|
||||||
|
|
||||||
self.stringEncoding = [aDecoder decodeIntegerForKey:@"stringEncoding"];
|
self.stringEncoding = [aDecoder decodeIntegerForKey:@"stringEncoding"];
|
||||||
self.parameterEncoding = [aDecoder decodeIntegerForKey:@"parameterEncoding"];
|
self.parameterEncoding = (AFHTTPClientParameterEncoding) [aDecoder decodeIntegerForKey:@"parameterEncoding"];
|
||||||
self.registeredHTTPOperationClassNames = [aDecoder decodeObjectForKey:@"registeredHTTPOperationClassNames"];
|
self.registeredHTTPOperationClassNames = [aDecoder decodeObjectForKey:@"registeredHTTPOperationClassNames"];
|
||||||
self.defaultHeaders = [aDecoder decodeObjectForKey:@"defaultHeaders"];
|
self.defaultHeaders = [aDecoder decodeObjectForKey:@"defaultHeaders"];
|
||||||
|
|
||||||
|
|
@ -1072,7 +1072,7 @@ static const NSUInteger AFMultipartBodyStreamProviderDefaultBufferLength = 4096;
|
||||||
- (void)handleOutputStreamSpaceAvailable {
|
- (void)handleOutputStreamSpaceAvailable {
|
||||||
while ([_outputStream hasSpaceAvailable]) {
|
while ([_outputStream hasSpaceAvailable]) {
|
||||||
if ([_buffer length] > 0) {
|
if ([_buffer length] > 0) {
|
||||||
NSInteger numberOfBytesWritten = [_outputStream write:[_buffer bytes] maxLength:[_buffer length]];
|
NSInteger numberOfBytesWritten = [_outputStream write:(uint8_t const *)[_buffer bytes] maxLength:[_buffer length]];
|
||||||
if (numberOfBytesWritten < 0) {
|
if (numberOfBytesWritten < 0) {
|
||||||
[self close];
|
[self close];
|
||||||
return;
|
return;
|
||||||
|
|
@ -1094,7 +1094,7 @@ static const NSUInteger AFMultipartBodyStreamProviderDefaultBufferLength = 4096;
|
||||||
|
|
||||||
[_buffer setLength:self.bufferLength];
|
[_buffer setLength:self.bufferLength];
|
||||||
|
|
||||||
NSInteger numberOfBytesRead = [self.currentHTTPBodyPart read:[_buffer mutableBytes] maxLength:[_buffer length]];
|
NSInteger numberOfBytesRead = [self.currentHTTPBodyPart read:(uint8_t *)[_buffer mutableBytes] maxLength:[_buffer length]];
|
||||||
if (numberOfBytesRead < 0) {
|
if (numberOfBytesRead < 0) {
|
||||||
[self close];
|
[self close];
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue