diff options
| author |  Jorge Canizales <jcanizales@google.com> | 2015-07-18 00:50:07 -0700 |
|---|---|---|
| committer | Jorge Canizales <jcanizales@google.com> | 2015-07-18 00:50:07 -0700 |
| commit | 9fce4554358dd3cdb1ceb16e3f5f6f91a344f059 (patch) | |
| tree | 1bf218e5b49a12a0bdece35e8dfb03bd0f4f1f51 | |
| parent | f87a0984ab727e95b068237f3bb0689d9685c8ea (diff) | |
Fixup codegen now that GRXWriter is a class
| -rw-r--r-- | src/compiler/objective_c_generator.cc | 3 | ||||
| -rw-r--r-- | src/compiler/objective_c_plugin.cc | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/compiler/objective_c_generator.cc b/src/compiler/objective_c_generator.cc index 711d0d5870..69b3805bb1 100644 --- a/src/compiler/objective_c_generator.cc +++ b/src/compiler/objective_c_generator.cc @@ -186,9 +186,6 @@ string GetHeader(const ServiceDescriptor *service) { grpc::protobuf::io::StringOutputStream output_stream(&output); Printer printer(&output_stream, '$'); - printer.Print("@protocol GRXWriteable;\n"); - printer.Print("@protocol GRXWriter;\n\n"); - map<string, string> vars = {{"service_class", ServiceClassName(service)}}; printer.Print(vars, "@protocol $service_class$ <NSObject>\n\n"); diff --git a/src/compiler/objective_c_plugin.cc b/src/compiler/objective_c_plugin.cc index 2b5ab758fc..10f06ad4df 100644 --- a/src/compiler/objective_c_plugin.cc +++ b/src/compiler/objective_c_plugin.cc @@ -63,7 +63,9 @@ class ObjectiveCGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator { // Generate .pbrpc.h string imports = string("#import \"") + file_name + ".pbobjc.h\"\n\n" - "#import <ProtoRPC/ProtoService.h>\n"; + "#import <ProtoRPC/ProtoService.h>\n" + "#import <RxLibrary/GRXWriteable.h>\n" + "#import <RxLibrary/GRXWriter.h>\n"; // TODO(jcanizales): Instead forward-declare the input and output types // and import the files in the .pbrpc.m @@ -89,7 +91,6 @@ class ObjectiveCGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator { string imports = string("#import \"") + file_name + ".pbrpc.h\"\n\n" "#import <ProtoRPC/ProtoRPC.h>\n" - "#import <RxLibrary/GRXWriteable.h>\n" "#import <RxLibrary/GRXWriter+Immediate.h>\n"; string definitions; |