Apply clang-tidy modernize-use-nullptr to googletest.
Now that googletest has moved to C++11, it should no longer use NULL or 0 for the null pointer. This patch converts all such usages to nullptr using clang-tidy. This prevents LLVM from issuing -Wzero-as-null-pointer-constant warnings. PiperOrigin-RevId: 215814400
This commit is contained in:
committed by
Gennadiy Civil
parent
f13bbe2992
commit
4bb49ed640
@@ -174,7 +174,7 @@ TEST(SCOPED_TRACETest, AcceptedValues) {
|
||||
SCOPED_TRACE("literal string");
|
||||
SCOPED_TRACE(std::string("std::string"));
|
||||
SCOPED_TRACE(1337); // streamable type
|
||||
const char* null_value = NULL;
|
||||
const char* null_value = nullptr;
|
||||
SCOPED_TRACE(null_value);
|
||||
|
||||
ADD_FAILURE() << "Just checking that all these values work fine.";
|
||||
@@ -306,9 +306,8 @@ TEST(SCOPED_TRACETest, WorksConcurrently) {
|
||||
printf("(expecting 6 failures)\n");
|
||||
|
||||
CheckPoints check_points;
|
||||
ThreadWithParam<CheckPoints*> thread(&ThreadWithScopedTrace,
|
||||
&check_points,
|
||||
NULL);
|
||||
ThreadWithParam<CheckPoints*> thread(&ThreadWithScopedTrace, &check_points,
|
||||
nullptr);
|
||||
check_points.n1.WaitForNotification();
|
||||
|
||||
{
|
||||
@@ -511,7 +510,7 @@ class DeathTestAndMultiThreadsTest : public testing::Test {
|
||||
// Starts a thread and waits for it to begin.
|
||||
virtual void SetUp() {
|
||||
thread_.reset(new ThreadWithParam<SpawnThreadNotifications*>(
|
||||
&ThreadRoutine, ¬ifications_, NULL));
|
||||
&ThreadRoutine, ¬ifications_, nullptr));
|
||||
notifications_.spawn_thread_started.WaitForNotification();
|
||||
}
|
||||
// Tells the thread to finish, and reaps it.
|
||||
@@ -966,7 +965,7 @@ TEST_F(ExpectFailureTest, ExpectNonFatalFailure) {
|
||||
class ExpectFailureWithThreadsTest : public ExpectFailureTest {
|
||||
protected:
|
||||
static void AddFailureInOtherThread(FailureMode failure) {
|
||||
ThreadWithParam<FailureMode> thread(&AddFailure, failure, NULL);
|
||||
ThreadWithParam<FailureMode> thread(&AddFailure, failure, nullptr);
|
||||
thread.Join();
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user