Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grpc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tci-gateway-module
Grpc
Commits
623860f7
Commit
623860f7
authored
9 years ago
by
Jan Tattermusch
Browse files
Options
Downloads
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/compiler/csharp_generator.cc
+5
-2
5 additions, 2 deletions
src/compiler/csharp_generator.cc
src/compiler/csharp_generator.h
+0
-3
0 additions, 3 deletions
src/compiler/csharp_generator.h
with
5 additions
and
5 deletions
src/compiler/csharp_generator.cc
+
5
−
2
View file @
623860f7
...
@@ -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
"
);
}
}
...
...
This diff is collapsed.
Click to expand it.
src/compiler/csharp_generator.h
+
0
−
3
View file @
623860f7
...
@@ -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
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment