aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/compiler
diff options
context:
space:
mode:
authorGravatar Muxi Yan <mxyan@google.com>2018-12-18 11:13:13 -0800
committerGravatar Muxi Yan <mxyan@google.com>2018-12-18 11:13:13 -0800
commit8bc8ff3dce507f912b8985fefaa22da1e2d95b6d (patch)
treecf4b044c93d4be009d44fab477893bcc40963ae0 /src/compiler
parentd36a13af3182495079bee65ff78e3e7e7f0d5901 (diff)
Fix nullability incompatibility
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/objective_c_generator.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/compiler/objective_c_generator.cc b/src/compiler/objective_c_generator.cc
index 0a6b64f595..af5398ec68 100644
--- a/src/compiler/objective_c_generator.cc
+++ b/src/compiler/objective_c_generator.cc
@@ -355,7 +355,7 @@ void PrintMethodImplementations(Printer* printer,
"@implementation $service_class$\n\n"
"// Designated initializer\n"
"- (instancetype)initWithHost:(NSString *)host "
- "callOptions:(GRPCCallOptions *_Nullable)callOptions{\n"
+ "callOptions:(GRPCCallOptions *_Nullable)callOptions {\n"
" self = [super initWithHost:host\n"
" packageName:@\"$package$\"\n"
" serviceName:@\"$service_name$\"\n"
@@ -363,10 +363,9 @@ void PrintMethodImplementations(Printer* printer,
" return self;\n"
"}\n\n"
"- (instancetype)initWithHost:(NSString *)host {\n"
- " return [self initWithHost:host\n"
- " packageName:@\"$package$\"\n"
- " serviceName:@\"$service_name$\"\n"
- " callOptions:nil];\n"
+ " return [super initWithHost:host\n"
+ " packageName:@\"$package$\"\n"
+ " serviceName:@\"$service_name$\"];\n"
"}\n\n");
printer.Print(
@@ -381,7 +380,7 @@ void PrintMethodImplementations(Printer* printer,
printer.Print(
"#pragma mark - Class Methods\n\n"
"+ (instancetype)serviceWithHost:(NSString *)host {\n"
- " return [self serviceWithHost:host callOptions:nil];\n"
+ " return [[self alloc] initWithHost:host];\n"
"}\n\n"
"+ (instancetype)serviceWithHost:(NSString *)host "
"callOptions:(GRPCCallOptions *_Nullable)callOptions {\n"