Fix after merge

pull/13349/head
Craig Tiller 7 years ago
parent 15ff8f3597
commit e31e200dec
  1. 4
      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 // Force the command to print its usage message
fprintf(stderr, "\nWrong number of arguments for %s\n", command.c_str()); fprintf(stderr, "\nWrong number of arguments for %s\n", command.c_str());
grpc_tool.SetPrintCommandMode(1); 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); const bool ok = cmd->function(&grpc_tool, argc, argv, cred, callback);
return ok ? 0 : 1; 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]) + "'"); Usage("Unknown command '" + grpc::string(argv[0]) + "'");
} }
SetPrintCommandMode(0); SetPrintCommandMode(0);
cmd->function(this, -1, NULL, cred, callback); cmd->function(this, -1, nullptr, cred, callback);
} }
return true; return true;
} }

Loading…
Cancel
Save