Skip to content
Snippets Groups Projects
Commit 6af31bd0 authored by Bogdan Drutu's avatar Bogdan Drutu
Browse files

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
...@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment