Skip to content
Snippets Groups Projects
Commit 146070db authored by David Garcia Quintas's avatar David Garcia Quintas
Browse files

fixed multiple initialization of globals

parent a643960d
No related branches found
No related tags found
No related merge requests found
......@@ -58,8 +58,12 @@ static CoreCodegen g_core_codegen;
class GrpcLibraryInitializer GRPC_FINAL {
public:
GrpcLibraryInitializer() {
grpc::g_glip = &g_gli;
grpc::g_core_codegen_interface = &g_core_codegen;
if (grpc::g_glip == nullptr) {
grpc::g_glip = &g_gli;
}
if (grpc::g_core_codegen_interface == nullptr) {
grpc::g_core_codegen_interface = &g_core_codegen;
}
}
/// A no-op method to force the linker to reference this class, which will
......
......@@ -60,8 +60,7 @@ std::shared_ptr<grpc::Channel> SecureChannelCredentials::CreateChannel(
SecureCallCredentials::SecureCallCredentials(grpc_call_credentials* c_creds)
: c_creds_(c_creds) {
internal::GrpcLibraryInitializer gli_initializer;
gli_initializer.summon();
g_gli_initializer.summon();
}
bool SecureCallCredentials::ApplyToCall(grpc_call* call) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment