Reverting grpc generated file suffix (#6995)

* Reverting grpc generated file suffix

* - Setting the greeter sample as it was
- Reverting the include of the generated message in grpc.cc file
This commit is contained in:
Panagiotis Gourgaris
2021-12-19 04:23:28 +02:00
committed by GitHub
parent b8aaccee82
commit b3edfdbfb7
3 changed files with 10 additions and 14 deletions

View File

@@ -246,9 +246,7 @@ class FlatBufFile : public grpc_generator::File {
return parser_.opts.filename_suffix + ".h";
}
std::string service_header_ext() const {
return parser_.opts.filename_suffix + ".grpc.fb.h";
}
std::string service_header_ext() const { return ".grpc.fb.h"; }
std::string package() const {
return parser_.current_namespace_->GetFullyQualifiedName("");
@@ -374,14 +372,10 @@ bool GenerateCppGRPC(const Parser &parser, const std::string &path,
grpc_cpp_generator::GetSourceServices(&fbfile, generator_parameters) +
grpc_cpp_generator::GetSourceEpilogue(&fbfile, generator_parameters);
return flatbuffers::SaveFile(
(path + file_name + parser.opts.filename_suffix + ".grpc.fb.h")
.c_str(),
header_code, false) &&
flatbuffers::SaveFile(
(path + file_name + parser.opts.filename_suffix + ".grpc.fb.cc")
.c_str(),
source_code, false);
return flatbuffers::SaveFile((path + file_name + ".grpc.fb.h").c_str(),
header_code, false) &&
flatbuffers::SaveFile((path + file_name + ".grpc.fb.cc").c_str(),
source_code, false);
}
class JavaGRPCGenerator : public flatbuffers::BaseGenerator {