Skip to content
Snippets Groups Projects
Commit 623860f7 authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files

Merge pull request #3133 from yang-g/fix_build

Do not include internal proto header
parents 956e411e c3ee1d5e
No related branches found
No related tags found
No related merge requests found
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <cctype> #include <cctype>
#include <map> #include <map>
#include <sstream>
#include <vector> #include <vector>
#include "src/compiler/csharp_generator.h" #include "src/compiler/csharp_generator.h"
...@@ -44,7 +45,6 @@ ...@@ -44,7 +45,6 @@
using google::protobuf::compiler::csharp::GetFileNamespace; using google::protobuf::compiler::csharp::GetFileNamespace;
using google::protobuf::compiler::csharp::GetClassName; using google::protobuf::compiler::csharp::GetClassName;
using google::protobuf::compiler::csharp::GetUmbrellaClassName; using google::protobuf::compiler::csharp::GetUmbrellaClassName;
using google::protobuf::SimpleItoa;
using grpc::protobuf::FileDescriptor; using grpc::protobuf::FileDescriptor;
using grpc::protobuf::Descriptor; using grpc::protobuf::Descriptor;
using grpc::protobuf::ServiceDescriptor; using grpc::protobuf::ServiceDescriptor;
...@@ -228,11 +228,14 @@ void GenerateStaticMethodField(Printer* out, const MethodDescriptor *method) { ...@@ -228,11 +228,14 @@ void GenerateStaticMethodField(Printer* out, const MethodDescriptor *method) {
} }
void GenerateServiceDescriptorProperty(Printer* out, const ServiceDescriptor *service) { void GenerateServiceDescriptorProperty(Printer* out, const ServiceDescriptor *service) {
std::ostringstream index;
index << service->index();
out->Print("// service descriptor\n"); out->Print("// service descriptor\n");
out->Print("public static global::Google.Protobuf.Reflection.ServiceDescriptor Descriptor\n"); out->Print("public static global::Google.Protobuf.Reflection.ServiceDescriptor Descriptor\n");
out->Print("{\n"); out->Print("{\n");
out->Print(" get { return $umbrella$.Descriptor.Services[$index$]; }\n", out->Print(" get { return $umbrella$.Descriptor.Services[$index$]; }\n",
"umbrella", GetUmbrellaClassName(service->file()), "index", SimpleItoa(service->index())); "umbrella", GetUmbrellaClassName(service->file()), "index",
index.str());
out->Print("}\n"); out->Print("}\n");
out->Print("\n"); out->Print("\n");
} }
......
...@@ -36,10 +36,7 @@ ...@@ -36,10 +36,7 @@
#include "src/compiler/config.h" #include "src/compiler/config.h"
using namespace std;
#include <google/protobuf/compiler/csharp/csharp_names.h> #include <google/protobuf/compiler/csharp/csharp_names.h>
#include <google/protobuf/stubs/strutil.h>
namespace grpc_csharp_generator { namespace grpc_csharp_generator {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment