Use protobuf's native upper camel conversion

pull/11341/head
Muxi Yan 8 years ago
parent 9baf4b19f0
commit 88974d506a
  1. 4
      src/compiler/objective_c_generator_helpers.h
  2. 2
      src/compiler/objective_c_plugin.cc

@ -38,6 +38,8 @@
#include "src/compiler/config.h" #include "src/compiler/config.h"
#include "src/compiler/generator_helpers.h" #include "src/compiler/generator_helpers.h"
#include <google/protobuf/compiler/objectivec/objectivec_helpers.h>
namespace grpc_objective_c_generator { namespace grpc_objective_c_generator {
using ::grpc::protobuf::FileDescriptor; using ::grpc::protobuf::FileDescriptor;
@ -45,7 +47,7 @@ using ::grpc::protobuf::ServiceDescriptor;
using ::grpc::string; using ::grpc::string;
inline string MessageHeaderName(const FileDescriptor *file) { inline string MessageHeaderName(const FileDescriptor *file) {
return grpc_generator::FileNameInUpperCamel(file) + ".pbobjc.h"; return google::protobuf::compiler::objectivec::FilePath(file) + ".pbobjc.h";
} }
inline string ServiceClassName(const ServiceDescriptor *service) { inline string ServiceClassName(const ServiceDescriptor *service) {

@ -59,7 +59,7 @@ class ObjectiveCGrpcGenerator : public grpc::protobuf::compiler::CodeGenerator {
return true; return true;
} }
::grpc::string file_name = grpc_generator::FileNameInUpperCamel(file); ::grpc::string file_name = google::protobuf::compiler::objectivec::FilePath(file);
::grpc::string prefix = file->options().objc_class_prefix(); ::grpc::string prefix = file->options().objc_class_prefix();
{ {

Loading…
Cancel
Save