diff options
author | Muxi Yan <muxi@users.noreply.github.com> | 2017-11-28 06:34:12 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-28 06:34:12 +0800 |
commit | fbe8ff657ccb742daedae11a1029f5628de07ce7 (patch) | |
tree | d47757c82ddee77a590635e9dfbaf143ee6025e1 /src/compiler | |
parent | 8d30c31afe1277bdfb9483ae9e08da3b5964bf56 (diff) | |
parent | 9b7484867663018e2b362cf01567dd9a77341f00 (diff) |
Merge pull request #13437 from muxi/fix-forward-declaration
Fix ObjC forward declaration
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/objective_c_plugin.cc | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/compiler/objective_c_plugin.cc b/src/compiler/objective_c_plugin.cc index 53ff81f94a..d5d488e84d 100644 --- a/src/compiler/objective_c_plugin.cc +++ b/src/compiler/objective_c_plugin.cc @@ -51,12 +51,15 @@ class ObjectiveCGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator { { // Generate .pbrpc.h - ::grpc::string imports = ::grpc::string("#import \"") + file_name + - ".pbobjc.h\"\n\n" - "#import <ProtoRPC/ProtoService.h>\n" - "#import <ProtoRPC/ProtoRPC.h>\n" - "#import <RxLibrary/GRXWriteable.h>\n" - "#import <RxLibrary/GRXWriter.h>\n"; + ::grpc::string imports = + ::grpc::string("#if !GPB_GRPC_FORWARD_DECLARE_MESSAGE_PROTO\n") + + "#import \"" + file_name + + ".pbobjc.h\"\n" + "#endif\n\n" + "#import <ProtoRPC/ProtoService.h>\n" + "#import <ProtoRPC/ProtoRPC.h>\n" + "#import <RxLibrary/GRXWriteable.h>\n" + "#import <RxLibrary/GRXWriter.h>\n"; ::grpc::string proto_imports; proto_imports += "#if GPB_GRPC_FORWARD_DECLARE_MESSAGE_PROTO\n" + @@ -105,7 +108,10 @@ class ObjectiveCGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator { // Generate .pbrpc.m ::grpc::string imports = ::grpc::string("#import \"") + file_name + - ".pbrpc.h\"\n\n" + ".pbrpc.h\"\n" + "#import \"" + + file_name + + ".pbobjc.h\"\n\n" "#import <ProtoRPC/ProtoRPC.h>\n" "#import <RxLibrary/GRXWriter+Immediate.h>\n"; for (int i = 0; i < file->dependency_count(); i++) { |