diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-08-28 13:01:23 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2015-08-28 13:01:23 -0700 |
| commit | 623860f7d9335fc6eb147d7f6606782d4bed0d77 (patch) | |
| tree | 65bc4b6e5d5542787bf088c61b29aeec80e85579 | |
| parent | 956e411e31c97836702aac5675e9f509b2231426 (diff) | |
| parent | c3ee1d5eb4aa790db7c309627286be5d60ff60ec (diff) | |
Merge pull request #3133 from yang-g/fix_build
Do not include internal proto header
| -rw-r--r-- | src/compiler/csharp_generator.cc | 7 | ||||
| -rw-r--r-- | src/compiler/csharp_generator.h | 3 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/csharp_generator.cc b/src/compiler/csharp_generator.cc index 51d8d982e2..7b497df7f4 100644 --- a/src/compiler/csharp_generator.cc +++ b/src/compiler/csharp_generator.cc @@ -33,6 +33,7 @@ #include <cctype> #include <map> +#include <sstream> #include <vector> #include "src/compiler/csharp_generator.h" @@ -44,7 +45,6 @@ using google::protobuf::compiler::csharp::GetFileNamespace; using google::protobuf::compiler::csharp::GetClassName; using google::protobuf::compiler::csharp::GetUmbrellaClassName; -using google::protobuf::SimpleItoa; using grpc::protobuf::FileDescriptor; using grpc::protobuf::Descriptor; using grpc::protobuf::ServiceDescriptor; @@ -228,11 +228,14 @@ void GenerateStaticMethodField(Printer* out, const MethodDescriptor *method) { } void GenerateServiceDescriptorProperty(Printer* out, const ServiceDescriptor *service) { + std::ostringstream index; + index << service->index(); out->Print("// service descriptor\n"); out->Print("public static global::Google.Protobuf.Reflection.ServiceDescriptor Descriptor\n"); out->Print("{\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"); } diff --git a/src/compiler/csharp_generator.h b/src/compiler/csharp_generator.h index 67e3ee30b5..90eb7e2984 100644 --- a/src/compiler/csharp_generator.h +++ b/src/compiler/csharp_generator.h @@ -36,10 +36,7 @@ #include "src/compiler/config.h" -using namespace std; - #include <google/protobuf/compiler/csharp/csharp_names.h> -#include <google/protobuf/stubs/strutil.h> namespace grpc_csharp_generator { |