Merge pull request #15639 from jtattermusch/no_package_service

fix: if .proto file doesn't specify "package", csharp_generator generates invalid code.
pull/15658/head
Jan Tattermusch 7 years ago committed by GitHub
commit 09370122cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 13
      src/compiler/csharp_generator.cc

@ -680,14 +680,19 @@ grpc::string GetServices(const FileDescriptor* file, bool generate_client,
out.Print("using grpc = global::Grpc.Core;\n");
out.Print("\n");
out.Print("namespace $namespace$ {\n", "namespace", GetFileNamespace(file));
out.Indent();
grpc::string file_namespace = GetFileNamespace(file);
if (file_namespace != "") {
out.Print("namespace $namespace$ {\n", "namespace", file_namespace);
out.Indent();
}
for (int i = 0; i < file->service_count(); i++) {
GenerateService(&out, file->service(i), generate_client, generate_server,
internal_access);
}
out.Outdent();
out.Print("}\n");
if (file_namespace != "") {
out.Outdent();
out.Print("}\n");
}
out.Print("#endregion\n");
}
return output;

Loading…
Cancel
Save