aboutsummaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorGravatar Vijay Pai <vpai@google.com>2015-07-25 00:56:33 +0000
committerGravatar Vijay Pai <vpai@google.com>2015-07-25 00:56:33 +0000
commitd2a9b6da13d84e9e9cb75b56e0adc365a35b0ee0 (patch)
tree66172dc733e99ce4e3bb1df6ddb066d09112bc31 /test
parent7e06b6ffe276f8ceaafc601b09e53971e5eead15 (diff)
Isolate nullptr to grpc namespace when we must define it ourselves
Change the one non-namespace use of nullptr to NULL (used as an argument to a C function anyway)
Diffstat (limited to 'test')
-rw-r--r--test/cpp/qps/timer.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/cpp/qps/timer.cc b/test/cpp/qps/timer.cc
index 07289f699b..c1ba23decd 100644
--- a/test/cpp/qps/timer.cc
+++ b/test/cpp/qps/timer.cc
@@ -52,7 +52,7 @@ static double time_double(struct timeval* tv) {
Timer::Result Timer::Sample() {
struct rusage usage;
struct timeval tv;
- gettimeofday(&tv, nullptr);
+ gettimeofday(&tv, NULL);
getrusage(RUSAGE_SELF, &usage);
Result r;