diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-14 13:14:10 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-14 13:14:10 -0700 |
| commit | 2c6f63731c7ddc761eac80be7609a9e80116ddee (patch) | |
| tree | 02896c6cbbacb3e8931a347166abf7538187d255 /src/objective-c/GRPCClient | |
| parent | 694cd708313945c31e4b2c1b518d3cff80f8b031 (diff) | |
| parent | e412a180602753972ac496560322e224a5db987f (diff) | |
Merge github.com:grpc/grpc into cpparena
Diffstat (limited to 'src/objective-c/GRPCClient')
| -rw-r--r-- | src/objective-c/GRPCClient/private/GRPCCompletionQueue.m | 2 | ||||
| -rw-r--r-- | src/objective-c/GRPCClient/private/version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/objective-c/GRPCClient/private/GRPCCompletionQueue.m b/src/objective-c/GRPCClient/private/GRPCCompletionQueue.m index 539b5ab83c..5ff77eac4c 100644 --- a/src/objective-c/GRPCClient/private/GRPCCompletionQueue.m +++ b/src/objective-c/GRPCClient/private/GRPCCompletionQueue.m @@ -48,7 +48,7 @@ - (instancetype)init { if ((self = [super init])) { - _unmanagedQueue = grpc_completion_queue_create(NULL); + _unmanagedQueue = grpc_completion_queue_create_for_next(NULL); // This is for the following block to capture the pointer by value (instead // of retaining self and doing self->_unmanagedQueue). This is essential diff --git a/src/objective-c/GRPCClient/private/version.h b/src/objective-c/GRPCClient/private/version.h index 09155ee4d4..c846f4214c 100644 --- a/src/objective-c/GRPCClient/private/version.h +++ b/src/objective-c/GRPCClient/private/version.h @@ -38,4 +38,4 @@ // `tools/buildgen/generate_projects.sh`. -#define GRPC_OBJC_VERSION_STRING @"1.3.0-dev" +#define GRPC_OBJC_VERSION_STRING @"1.4.0-dev" |