aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/cpp/util
diff options
context:
space:
mode:
authorGravatar Vijay Pai <vpai@google.com>2016-06-15 11:24:10 -0700
committerGravatar Vijay Pai <vpai@google.com>2016-06-15 11:24:10 -0700
commit12bf3801b8dd298a2cfd89f45499d5f681e27ed6 (patch)
tree0e17b14d8656b878b5dc248a5773bb41ca851773 /test/cpp/util
parent08e071abe086ec26fc99b55c2d3284f02eace575 (diff)
Got carried away with grpc::
Diffstat (limited to 'test/cpp/util')
-rw-r--r--test/cpp/util/test_credentials_provider.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/cpp/util/test_credentials_provider.cc b/test/cpp/util/test_credentials_provider.cc
index fa572cb9ca..9d762ce657 100644
--- a/test/cpp/util/test_credentials_provider.cc
+++ b/test/cpp/util/test_credentials_provider.cc
@@ -102,7 +102,7 @@ class DefaultCredentialsProvider : public CredentialsProvider {
added_secure_type_names_.end(), type));
if (it == added_secure_type_names_.end()) {
gpr_log(GPR_ERROR, "Unsupported credentials type %s.", type.c_str());
- return grpc::nullptr;
+ return nullptr;
}
return added_secure_type_providers_[it - added_secure_type_names_.begin()]
->GetChannelCredentials(args);
@@ -126,7 +126,7 @@ class DefaultCredentialsProvider : public CredentialsProvider {
added_secure_type_names_.end(), type));
if (it == added_secure_type_names_.end()) {
gpr_log(GPR_ERROR, "Unsupported credentials type %s.", type.c_str());
- return grpc::nullptr;
+ return nullptr;
}
return added_secure_type_providers_[it - added_secure_type_names_.begin()]
->GetServerCredentials();
@@ -151,7 +151,7 @@ class DefaultCredentialsProvider : public CredentialsProvider {
};
gpr_once g_once_init_provider = GPR_ONCE_INIT;
-CredentialsProvider* g_provider = grpc::nullptr;
+CredentialsProvider* g_provider = nullptr;
void CreateDefaultProvider() { g_provider = new DefaultCredentialsProvider; }