diff options
| author | Dhruv <dhruv.batra@hotmail.com> | 2018-08-06 23:10:16 +0800 |
|---|---|---|
| committer | Dhruv <dhruv.batra@hotmail.com> | 2018-08-07 08:03:57 +0800 |
| commit | 526b350199e604b62daaee9febc5d8a8d593a010 (patch) | |
| tree | b5b0408408979675429fab071c5ce1cae1313a54 /src/google/protobuf/stubs/strutil_unittest.cc | |
| parent | e9a5412afcb5035c02136ba65210bf2cb69d9ab5 (diff) | |
| download | protobuf-526b350199e604b62daaee9febc5d8a8d593a010.tar.gz protobuf-526b350199e604b62daaee9febc5d8a8d593a010.tar.bz2 protobuf-526b350199e604b62daaee9febc5d8a8d593a010.zip | |
4593 Replace all occurrences of "NULL" to nullptr in src/google/protobug/stubs
Diffstat (limited to 'src/google/protobuf/stubs/strutil_unittest.cc')
| -rw-r--r-- | src/google/protobuf/stubs/strutil_unittest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/google/protobuf/stubs/strutil_unittest.cc b/src/google/protobuf/stubs/strutil_unittest.cc index 6bf0f598..9460a665 100644 --- a/src/google/protobuf/stubs/strutil_unittest.cc +++ b/src/google/protobuf/stubs/strutil_unittest.cc @@ -50,18 +50,18 @@ namespace { TEST(StringUtilityTest, ImmuneToLocales) { // Remember the old locale. - char* old_locale_cstr = setlocale(LC_NUMERIC, NULL); - ASSERT_TRUE(old_locale_cstr != NULL); + char* old_locale_cstr = setlocale(LC_NUMERIC, nullptr); + ASSERT_TRUE(old_locale_cstr != nullptr); string old_locale = old_locale_cstr; // Set the locale to "C". - ASSERT_TRUE(setlocale(LC_NUMERIC, "C") != NULL); + ASSERT_TRUE(setlocale(LC_NUMERIC, "C") != nullptr); EXPECT_EQ("1.5", SimpleDtoa(1.5)); EXPECT_EQ("1.5", SimpleFtoa(1.5)); - if (setlocale(LC_NUMERIC, "es_ES") == NULL && - setlocale(LC_NUMERIC, "es_ES.utf8") == NULL) { + if (setlocale(LC_NUMERIC, "es_ES") == nullptr && + setlocale(LC_NUMERIC, "es_ES.utf8") == nullptr) { // Some systems may not have the desired locale available. GOOGLE_LOG(WARNING) << "Couldn't set locale to es_ES. Skipping this test."; |