diff options
author | Jorge Canizales <jcanizales@google.com> | 2015-09-03 15:09:30 -0700 |
---|---|---|
committer | Jorge Canizales <jcanizales@google.com> | 2015-09-03 15:09:30 -0700 |
commit | 6d84373f8e9e21e4eee1f30c1573280eba455b9d (patch) | |
tree | 917f182efe0999794799bd911a572e58a08bb66d /src/objective-c/GRPCClient/private/GRPCWrappedCall.h | |
parent | d21781f39e74cbcac02b857b7ef6bd094cc0dcd1 (diff) | |
parent | 8c3c8ac947f97e9015ece0e63f56d629db103103 (diff) |
Manually merge release-0_11 into make-errors-public-beta to solve conflict
Diffstat (limited to 'src/objective-c/GRPCClient/private/GRPCWrappedCall.h')
-rw-r--r-- | src/objective-c/GRPCClient/private/GRPCWrappedCall.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/objective-c/GRPCClient/private/GRPCWrappedCall.h b/src/objective-c/GRPCClient/private/GRPCWrappedCall.h index da11cbb761..4ca2766147 100644 --- a/src/objective-c/GRPCClient/private/GRPCWrappedCall.h +++ b/src/objective-c/GRPCClient/private/GRPCWrappedCall.h @@ -35,6 +35,7 @@ #include <grpc/grpc.h> #import "GRPCChannel.h" +#import "GRPCRequestHeaders.h" @interface GRPCOperation : NSObject @property(nonatomic, readonly) grpc_op op; @@ -44,7 +45,7 @@ @interface GRPCOpSendMetadata : GRPCOperation -- (instancetype)initWithMetadata:(NSDictionary *)metadata +- (instancetype)initWithMetadata:(GRPCRequestHeaders *)metadata handler:(void(^)())handler NS_DESIGNATED_INITIALIZER; @end |