From 0607bae87e0f3417972bc221a5c4f8dc6bec5fef Mon Sep 17 00:00:00 2001
From: Jorge Canizales <jcanizales@google.com>
Date: Wed, 5 Aug 2015 16:36:10 -0700
Subject: [PATCH] Forward-declare grpc_channel and specify ownership semantics
---
src/objective-c/GRPCClient/private/GRPCChannel.h | 8 +++++---
src/objective-c/GRPCClient/private/GRPCChannel.m | 2 ++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/objective-c/GRPCClient/private/GRPCChannel.h b/src/objective-c/GRPCClient/private/GRPCChannel.h
index de0b58ffe4..2a7b701576 100644
--- a/src/objective-c/GRPCClient/private/GRPCChannel.h
+++ b/src/objective-c/GRPCClient/private/GRPCChannel.h
@@ -33,12 +33,14 @@
#import <Foundation/Foundation.h>
-#include <grpc/grpc.h>
+struct grpc_channel;
// Each separate instance of this class represents at least one TCP connection to the provided host.
// Create them using one of the subclasses |GRPCSecureChannel| and |GRPCUnsecuredChannel|.
@interface GRPCChannel : NSObject
-@property(nonatomic, readonly) grpc_channel *unmanagedChannel;
+@property(nonatomic, readonly) struct grpc_channel *unmanagedChannel;
-- (instancetype)initWithChannel:(grpc_channel *)unmanagedChannel NS_DESIGNATED_INITIALIZER;
+// This initializer takes ownership of the passed channel, and will destroy it when this object is
+// deallocated. It's illegal to pass the same grpc_channel to two different GRPCChannel objects.
+- (instancetype)initWithChannel:(struct grpc_channel *)unmanagedChannel NS_DESIGNATED_INITIALIZER;
@end
diff --git a/src/objective-c/GRPCClient/private/GRPCChannel.m b/src/objective-c/GRPCClient/private/GRPCChannel.m
index 49d6008fd4..4366e63320 100644
--- a/src/objective-c/GRPCClient/private/GRPCChannel.m
+++ b/src/objective-c/GRPCClient/private/GRPCChannel.m
@@ -33,6 +33,8 @@
#import "GRPCChannel.h"
+#include <grpc/grpc.h>
+
@implementation GRPCChannel
- (instancetype)init {
--
GitLab