diff options
author | 2015-05-21 10:20:14 -0700 | |
---|---|---|
committer | 2015-05-21 10:20:14 -0700 | |
commit | efad2ae67478ca70c064683af42c7f4bcfca5908 (patch) | |
tree | 6175f899f7aada229ab1df0a9373fa6e559bd8f0 /src/objective-c/ProtoRPC/ProtoRPC.m | |
parent | ccced5389de0258b9f1d37681efcb8be57a6ef10 (diff) | |
parent | 72b0f3a99e82d58778846278cde2770ffdadc278 (diff) |
Merge branch 'master' into poisson
Diffstat (limited to 'src/objective-c/ProtoRPC/ProtoRPC.m')
-rw-r--r-- | src/objective-c/ProtoRPC/ProtoRPC.m | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/objective-c/ProtoRPC/ProtoRPC.m b/src/objective-c/ProtoRPC/ProtoRPC.m index 6520b3af59..96608f2898 100644 --- a/src/objective-c/ProtoRPC/ProtoRPC.m +++ b/src/objective-c/ProtoRPC/ProtoRPC.m @@ -36,7 +36,7 @@ #import <gRPC/GRXWriteable.h> #import <gRPC/GRXWriter.h> #import <gRPC/GRXWriter+Transformations.h> -#import <ProtocolBuffers/ProtocolBuffers.h> +#import <Protobuf/GPBProtocolBuffers.h> @implementation ProtoRPC { id<GRXWriteable> _responseWriteable; @@ -65,15 +65,15 @@ } // A writer that serializes the proto messages to send. id<GRXWriter> bytesWriter = - [[[GRXWriter alloc] initWithWriter:requestsWriter] map:^id(PBGeneratedMessage *proto) { + [[[GRXWriter alloc] initWithWriter:requestsWriter] map:^id(GPBMessage *proto) { return [proto data]; }]; if ((self = [super initWithHost:host method:method requestsWriter:bytesWriter])) { // A writeable that parses the proto messages received. _responseWriteable = [[GRXWriteable alloc] initWithValueHandler:^(NSData *value) { - [responsesWriteable didReceiveValue:[responseClass parseFromData:value]]; + [responsesWriteable writeValue:[responseClass parseFromData:value]]; } completionHandler:^(NSError *errorOrNil) { - [responsesWriteable didFinishWithError:errorOrNil]; + [responsesWriteable writesFinishedWithError:errorOrNil]; }]; } return self; |