Use "nullptr" for null pointer values

PiperOrigin-RevId: 157468186

4 files changed, 12 insertions, 11 deletions

diff --git a/tensorflow/core/lib/strings/numbers.cc b/tensorflow/core/lib/strings/numbers.cc
index fc07bd446c..0dea0f89f9 100644
--- a/tensorflow/core/lib/strings/numbers.cc
+++ b/tensorflow/core/lib/strings/numbers.cc
@@ -166,7 +166,7 @@ char* DoubleToBuffer(double value, char* buffer) {
     DCHECK(snprintf_result > 0 && snprintf_result < kFastToBufferSize);
 
     full_precision_needed =
-        locale_independent_strtonum<double>(buffer, NULL) != value;
+        locale_independent_strtonum<double>(buffer, nullptr) != value;
   }
 
   if (full_precision_needed) {
diff --git a/tensorflow/core/lib/strings/ordered_code_test.cc b/tensorflow/core/lib/strings/ordered_code_test.cc
index 3eac2a3cab..adb3b8d943 100644
--- a/tensorflow/core/lib/strings/ordered_code_test.cc
+++ b/tensorflow/core/lib/strings/ordered_code_test.cc
@@ -102,7 +102,7 @@ static T TestRead(const string& a) {
   // gracefully reject any proper prefix of an encoding
   for (int i = 0; i < a.size() - 1; ++i) {
     StringPiece s(a.data(), i);
-    CHECK(!OCRead<T>(&s, NULL));
+    CHECK(!OCRead<T>(&s, nullptr));
     CHECK_EQ(s, a.substr(0, i));
   }
 
@@ -296,7 +296,7 @@ static inline string StrNot(const string& s) {
 template <typename T>
 static void TestInvalidEncoding(const string& s) {
   StringPiece p(s);
-  EXPECT_FALSE(OCRead<T>(&p, static_cast<T*>(NULL)));
+  EXPECT_FALSE(OCRead<T>(&p, static_cast<T*>(nullptr)));
   EXPECT_EQ(s, p);
 }
 
@@ -330,7 +330,8 @@ TEST(OrderedCodeInvalidEncodingsDeathTest, NonCanonical) {
     EXPECT_NE(OCWrite<uint64>(0), non_minimal);
 #ifndef NDEBUG
     StringPiece s(non_minimal);
-    EXPECT_DEATH(OrderedCode::ReadNumIncreasing(&s, NULL), "invalid encoding");
+    EXPECT_DEATH(OrderedCode::ReadNumIncreasing(&s, nullptr),
+                 "invalid encoding");
 #else
     TestRead<uint64>(non_minimal);
 #endif
@@ -348,7 +349,7 @@ TEST(OrderedCodeInvalidEncodingsDeathTest, NonCanonical) {
     EXPECT_NE(OCWrite<int64>(0), non_minimal);
 #ifndef NDEBUG
     StringPiece s(non_minimal);
-    EXPECT_DEATH(OrderedCode::ReadSignedNumIncreasing(&s, NULL),
+    EXPECT_DEATH(OrderedCode::ReadSignedNumIncreasing(&s, nullptr),
                  "invalid encoding")
         << n;
 #else
@@ -439,15 +440,15 @@ TEST(String, EncodeDecode) {
       StringPiece s = out;
       StringPiece s2 = out;
       CHECK(OCRead<string>(&s, &a2));
-      CHECK(OCRead<string>(&s2, NULL));
+      CHECK(OCRead<string>(&s2, nullptr));
       CHECK_EQ(s, s2);
 
       CHECK(OCRead<string>(&s, &b2));
-      CHECK(OCRead<string>(&s2, NULL));
+      CHECK(OCRead<string>(&s2, nullptr));
       CHECK_EQ(s, s2);
 
       CHECK(!OCRead<string>(&s, &dummy));
-      CHECK(!OCRead<string>(&s2, NULL));
+      CHECK(!OCRead<string>(&s2, nullptr));
       CHECK_EQ(a, a2);
       CHECK_EQ(b, b2);
       CHECK(s.empty());
diff --git a/tensorflow/core/lib/strings/stringprintf.cc b/tensorflow/core/lib/strings/stringprintf.cc
index 855734fc14..03eba4c851 100644
--- a/tensorflow/core/lib/strings/stringprintf.cc
+++ b/tensorflow/core/lib/strings/stringprintf.cc
@@ -52,7 +52,7 @@ void Appendv(string* dst, const char* format, va_list ap) {
       // Error or MSVC running out of space.  MSVC 8.0 and higher
       // can be asked about space needed with the special idiom below:
       va_copy(backup_ap, ap);
-      result = vsnprintf(NULL, 0, format, backup_ap);
+      result = vsnprintf(nullptr, 0, format, backup_ap);
       va_end(backup_ap);
     }
 
diff --git a/tensorflow/core/lib/strings/stringprintf_test.cc b/tensorflow/core/lib/strings/stringprintf_test.cc
index 8d2bc897b0..d61a1a945a 100644
--- a/tensorflow/core/lib/strings/stringprintf_test.cc
+++ b/tensorflow/core/lib/strings/stringprintf_test.cc
@@ -66,7 +66,7 @@ TEST(PrintfTest, Multibyte) {
   // out of memory while trying to determine destination buffer size.
   // see b/4194543.
 
-  char* old_locale = setlocale(LC_CTYPE, NULL);
+  char* old_locale = setlocale(LC_CTYPE, nullptr);
   // Push locale with multibyte mode
   setlocale(LC_CTYPE, "en_US.utf8");
 
@@ -95,7 +95,7 @@ TEST(PrintfTest, Multibyte) {
 
 TEST(PrintfTest, NoMultibyte) {
   // No multibyte handling, but the string contains funny chars.
-  char* old_locale = setlocale(LC_CTYPE, NULL);
+  char* old_locale = setlocale(LC_CTYPE, nullptr);
   setlocale(LC_CTYPE, "POSIX");
   string value = Printf("%.*s", 3, "\375\067s");
   setlocale(LC_CTYPE, old_locale);