| commit | d2a9b6da13d84e9e9cb75b56e0adc365a35b0ee0 | [log] [tgz] |
|---|---|---|
| author | Vijay Pai <vpai@google.com> | Sat Jul 25 00:56:33 2015 +0000 |
| committer | Vijay Pai <vpai@google.com> | Sat Jul 25 00:56:33 2015 +0000 |
| tree | 66172dc733e99ce4e3bb1df6ddb066d09112bc31 | |
| parent | 7e06b6ffe276f8ceaafc601b09e53971e5eead15 [diff] [blame] |
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)
diff --git a/test/cpp/qps/timer.cc b/test/cpp/qps/timer.cc index 07289f6..c1ba23d 100644 --- a/test/cpp/qps/timer.cc +++ b/test/cpp/qps/timer.cc
@@ -52,7 +52,7 @@ Timer::Result Timer::Sample() { struct rusage usage; struct timeval tv; - gettimeofday(&tv, nullptr); + gettimeofday(&tv, NULL); getrusage(RUSAGE_SELF, &usage); Result r;