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
6af31bd0
Commit
6af31bd0
authored
9 years ago
by
Bogdan Drutu
Browse files
Options
Downloads
Patches
Plain Diff
Fix the naming conflict issue that cause the tests to fail.
parent
4a4a20b6
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/cpp/client/client_context.cc
+12
-10
12 additions, 10 deletions
src/cpp/client/client_context.cc
with
12 additions
and
10 deletions
src/cpp/client/client_context.cc
+
12
−
10
View file @
6af31bd0
...
@@ -45,14 +45,16 @@
...
@@ -45,14 +45,16 @@
namespace
grpc
{
namespace
grpc
{
class
DefaultGlobalCallbacks
GRPC_FINAL
:
public
ClientContext
::
GlobalCallbacks
{
class
DefaultGlobalClientCallbacks
GRPC_FINAL
:
public
ClientContext
::
GlobalCallbacks
{
public:
public:
void
DefaultConstructor
(
ClientContext
*
context
)
GRPC_OVERRIDE
{}
void
DefaultConstructor
(
ClientContext
*
context
)
GRPC_OVERRIDE
{}
void
Destructor
(
ClientContext
*
context
)
GRPC_OVERRIDE
{}
void
Destructor
(
ClientContext
*
context
)
GRPC_OVERRIDE
{}
};
};
static
DefaultGlobalCallbacks
g_default_callbacks
;
static
DefaultGlobalClientCallbacks
g_default_client_callbacks
;
static
ClientContext
::
GlobalCallbacks
*
g_callbacks
=
&
g_default_callbacks
;
static
ClientContext
::
GlobalCallbacks
*
g_client_callbacks
=
&
g_default_client_callbacks
;
ClientContext
::
ClientContext
()
ClientContext
::
ClientContext
()
:
initial_metadata_received_
(
false
),
:
initial_metadata_received_
(
false
),
...
@@ -60,14 +62,14 @@ ClientContext::ClientContext()
...
@@ -60,14 +62,14 @@ ClientContext::ClientContext()
call_canceled_
(
false
),
call_canceled_
(
false
),
deadline_
(
gpr_inf_future
(
GPR_CLOCK_REALTIME
)),
deadline_
(
gpr_inf_future
(
GPR_CLOCK_REALTIME
)),
propagate_from_call_
(
nullptr
)
{
propagate_from_call_
(
nullptr
)
{
g_callbacks
->
DefaultConstructor
(
this
);
g_
client_
callbacks
->
DefaultConstructor
(
this
);
}
}
ClientContext
::~
ClientContext
()
{
ClientContext
::~
ClientContext
()
{
if
(
call_
)
{
if
(
call_
)
{
grpc_call_destroy
(
call_
);
grpc_call_destroy
(
call_
);
}
}
g_callbacks
->
Destructor
(
this
);
g_
client_
callbacks
->
Destructor
(
this
);
}
}
std
::
unique_ptr
<
ClientContext
>
ClientContext
::
FromServerContext
(
std
::
unique_ptr
<
ClientContext
>
ClientContext
::
FromServerContext
(
...
@@ -136,11 +138,11 @@ grpc::string ClientContext::peer() const {
...
@@ -136,11 +138,11 @@ grpc::string ClientContext::peer() const {
return
peer
;
return
peer
;
}
}
void
ClientContext
::
SetGlobalCallbacks
(
GlobalCallbacks
*
callbacks
)
{
void
ClientContext
::
SetGlobalCallbacks
(
GlobalCallbacks
*
client_
callbacks
)
{
GPR_ASSERT
(
g_callbacks
==
&
g_default_callbacks
);
GPR_ASSERT
(
g_
client_
callbacks
==
&
g_default_
client_
callbacks
);
GPR_ASSERT
(
callbacks
!=
NULL
);
GPR_ASSERT
(
client_
callbacks
!=
NULL
);
GPR_ASSERT
(
callbacks
!=
&
g_default_callbacks
);
GPR_ASSERT
(
client_
callbacks
!=
&
g_default_
client_
callbacks
);
g_callbacks
=
callbacks
;
g_
client_
callbacks
=
client_
callbacks
;
}
}
}
// namespace grpc
}
// namespace grpc
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