From e31e200dec2db3a3abfda0bdc15397945eabadc3 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 13 Nov 2017 14:04:47 -0800 Subject: Fix after merge --- test/cpp/util/grpc_tool.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cpp/util/grpc_tool.cc b/test/cpp/util/grpc_tool.cc index 7d51c5f45f..a6d08cd83c 100644 --- a/test/cpp/util/grpc_tool.cc +++ b/test/cpp/util/grpc_tool.cc @@ -251,7 +251,7 @@ int GrpcToolMainLib(int argc, const char** argv, const CliCredentials& cred, // Force the command to print its usage message fprintf(stderr, "\nWrong number of arguments for %s\n", command.c_str()); grpc_tool.SetPrintCommandMode(1); - return cmd->function(&grpc_tool, -1, NULL, cred, callback); + return cmd->function(&grpc_tool, -1, nullptr, cred, callback); } const bool ok = cmd->function(&grpc_tool, argc, argv, cred, callback); return ok ? 0 : 1; @@ -285,7 +285,7 @@ bool GrpcTool::Help(int argc, const char** argv, const CliCredentials& cred, Usage("Unknown command '" + grpc::string(argv[0]) + "'"); } SetPrintCommandMode(0); - cmd->function(this, -1, NULL, cred, callback); + cmd->function(this, -1, nullptr, cred, callback); } return true; } -- cgit v1.2.3