aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Vijay Pai <vpai@google.com>2016-11-04 09:09:58 -0700
committerGravatar Vijay Pai <vpai@google.com>2016-11-04 09:09:58 -0700
commit1b87ddee0ae35c4470ef78d83f73767e5dcb7de0 (patch)
tree0673b87f48e03db95fc2d54441f71fac5b86576e
parentb0a6be2b8f7791b62bb4c998845bee1ed1a23f23 (diff)
One more NULL->nullptr
-rw-r--r--test/cpp/end2end/async_end2end_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/cpp/end2end/async_end2end_test.cc b/test/cpp/end2end/async_end2end_test.cc
index 3bec37fdd3..8e385d100c 100644
--- a/test/cpp/end2end/async_end2end_test.cc
+++ b/test/cpp/end2end/async_end2end_test.cc
@@ -1110,7 +1110,7 @@ class AsyncEnd2endServerTryCancelTest : public AsyncEnd2endTest {
expected_cq_result = false;
}
- std::thread* server_try_cancel_thd = NULL;
+ std::thread* server_try_cancel_thd = nullptr;
auto verif = Verifier(GetParam().disable_blocking);
@@ -1148,7 +1148,7 @@ class AsyncEnd2endServerTryCancelTest : public AsyncEnd2endTest {
}
}
- if (server_try_cancel_thd != NULL) {
+ if (server_try_cancel_thd != nullptr) {
server_try_cancel_thd->join();
delete server_try_cancel_thd;
}