Merge remote-tracking branch 'upstream/v1.12.x' into upmerge_changes

7 years ago · a80086735e
parent d8fac0bb7f ca08fd9f9b
commit a80086735e
1 changed files with 1 additions and 2 deletions
--- a/src/compiler/objective_c_generator.cc
+++ b/src/compiler/objective_c_generator.cc
@ -222,8 +222,7 @@ void PrintMethodImplementations(Printer* printer,
  map< ::grpc::string, ::grpc::string> vars = {
      {"service_class", ServiceClassName(service)}};

-  printer.Print(
-      vars, "@protocol $service_class$ <NSObject, GRPCProtoServiceInit>\n\n");
+  printer.Print(vars, "@protocol $service_class$ <NSObject>\n\n");
  for (int i = 0; i < service->method_count(); i++) {
    PrintMethodDeclarations(&printer, service->method(i));
  }