diff options
| author |  Yang Gao <yangg@google.com> | 2018-11-20 14:10:34 -0800 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-11-20 14:10:34 -0800 |
| commit | e4e564679b4fcff665ea27c68b1a491a580203eb (patch) | |
| tree | d16c6e4720bd7374866957f7d385e5dbde006e61 /src/cpp | |
| parent | edea79c0142ec16c593c232b4b52737318e004e2 (diff) | |
| parent | c21393e553e7ab528edb5966c835bc0832ea4edf (diff) | |
Merge pull request #17154 from liutongxuan/master
g_default_client_callbacks shouldn't be global variable
Diffstat (limited to 'src/cpp')
| -rw-r--r-- | src/cpp/client/client_context.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/cpp/client/client_context.cc b/src/cpp/client/client_context.cc index 50da75f09c..c9ea3e5f83 100644 --- a/src/cpp/client/client_context.cc +++ b/src/cpp/client/client_context.cc @@ -41,9 +41,10 @@ class DefaultGlobalClientCallbacks final }; static internal::GrpcLibraryInitializer g_gli_initializer; -static DefaultGlobalClientCallbacks g_default_client_callbacks; +static DefaultGlobalClientCallbacks* g_default_client_callbacks = + new DefaultGlobalClientCallbacks(); static ClientContext::GlobalCallbacks* g_client_callbacks = - &g_default_client_callbacks; + g_default_client_callbacks; ClientContext::ClientContext() : initial_metadata_received_(false), @@ -139,9 +140,9 @@ grpc::string ClientContext::peer() const { } void ClientContext::SetGlobalCallbacks(GlobalCallbacks* client_callbacks) { - GPR_ASSERT(g_client_callbacks == &g_default_client_callbacks); + GPR_ASSERT(g_client_callbacks == g_default_client_callbacks); GPR_ASSERT(client_callbacks != nullptr); - GPR_ASSERT(client_callbacks != &g_default_client_callbacks); + GPR_ASSERT(client_callbacks != g_default_client_callbacks); g_client_callbacks = client_callbacks; } |