aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/cpp/codegen
diff options
context:
space:
mode:
authorGravatar Vijay Pai <vpai@google.com>2016-06-16 06:42:01 +0000
committerGravatar vpai <vpai@vpai-rhel6-instance1.c.grpc-testing.internal>2016-06-16 06:47:10 +0000
commit4425828d1d8a7ac882e34d76a2f26e47e8d1b22f (patch)
tree8d66103f7ad504fb6aa2aa286aa63fc52f6c455c /src/cpp/codegen
parent20bf126da605e3c765ddc494ce92de3a7ff32795 (diff)
Should not explicitly initialize these pointers to nullptr in gcc-4.4 case
because nullptr assignment actually requires the calling of a constructor. As a result, the order in which these nullptr initializations take place is not defined with respect to other initializations. A pointer that is left without explicit initialization automatically gets nullptr anyway, so just don't explicitly initialize these.
Diffstat (limited to 'src/cpp/codegen')
-rw-r--r--src/cpp/codegen/codegen_init.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cpp/codegen/codegen_init.cc b/src/cpp/codegen/codegen_init.cc
index c5d22124b7..103a7c1258 100644
--- a/src/cpp/codegen/codegen_init.cc
+++ b/src/cpp/codegen/codegen_init.cc
@@ -34,12 +34,12 @@
#include <grpc++/impl/codegen/core_codegen_interface.h>
#include <grpc++/impl/codegen/grpc_library.h>
-/// Initializes the global gRPC variables for the codegen library. These will
+/// Null-initializes the global gRPC variables for the codegen library. These
/// stay null in the absence of of grpc++ library. In this case, no gRPC
/// features such as the ability to perform calls will be available. Trying to
/// perform them would result in a segmentation fault when trying to deference
/// the following nulled globals. These should be associated with actual
/// as part of the instantiation of a \a grpc::GrpcLibraryInitializer variable.
-grpc::CoreCodegenInterface* grpc::g_core_codegen_interface = nullptr;
-grpc::GrpcLibraryInterface* grpc::g_glip = nullptr;
+grpc::CoreCodegenInterface* grpc::g_core_codegen_interface;
+grpc::GrpcLibraryInterface* grpc::g_glip;