Replace NULL and 0 with nullptr.

tkoeppe · tensorflower-gardener · commit 43b502ccf761 · 2022-02-07T08:10:13.000-08:00
PiperOrigin-RevId: 426918958
Change-Id: Ie96507133705eed6bf8519440ed4bd595b9b83ae
diff --git a/tensorflow/core/common_runtime/graph_constructor_test.cc b/tensorflow/core/common_runtime/graph_constructor_test.cc
@@ -3232,7 +3232,7 @@ TEST_F(GraphConstructorTest, ImportGraphDef_ValidateDefaultDevice) {
   options.default_device = "/gpu:13";
   ImportGraphDefResults res;
 
-  TF_ASSERT_OK(ImportGraphDef(options, gdef, &graph_, NULL, &res));
+  TF_ASSERT_OK(ImportGraphDef(options, gdef, &graph_, nullptr, &res));
   std::map<string, string> node2dev;
   for (Node* n : graph_.nodes()) {
     node2dev[n->name()] = n->requested_device();
diff --git a/tensorflow/core/kernels/eigen_attention.h b/tensorflow/core/kernels/eigen_attention.h
@@ -193,7 +193,7 @@ struct GlimpseExtractionOp {
                                        .template cast<float>();
 
             DSizes<Index, 3> glimpse_size(num_channels, width_, height_);
-            TensorMap<Tensor<float, 3> > tmp(NULL, glimpse_size);
+            TensorMap<Tensor<float, 3> > tmp(nullptr, glimpse_size);
             output.template chip<3>(i).device(device) =
                 mini.reshape(Sizes<1, 1, 1>()).broadcast(glimpse_size) +
                 (tmp.random(unigen) *
@@ -231,7 +231,7 @@ struct GlimpseExtractionOp {
               maxi.device(device) =
                   input.template chip<3>(i).template chip<0>(j).maximum();
 
-              TensorMap<Tensor<float, 2> > tmp(NULL, glimpse_size);
+              TensorMap<Tensor<float, 2> > tmp(nullptr, glimpse_size);
               output.template chip<3>(i).template chip<0>(j).device(device) =
                   (mean.reshape(Sizes<1, 1>()).broadcast(glimpse_size) +
                    (tmp.random(gen) *
diff --git a/tensorflow/core/lib/gtl/map_util.h b/tensorflow/core/lib/gtl/map_util.h
@@ -40,7 +40,7 @@ const typename Collection::value_type::second_type* FindOrNull(
     const typename Collection::value_type::first_type& key) {
   typename Collection::const_iterator it = collection.find(key);
   if (it == collection.end()) {
-    return 0;
+    return nullptr;
   }
   return &it->second;
 }
@@ -52,7 +52,7 @@ typename Collection::value_type::second_type* FindOrNull(
     const typename Collection::value_type::first_type& key) {
   typename Collection::iterator it = collection.find(key);
   if (it == collection.end()) {
-    return 0;
+    return nullptr;
   }
   return &it->second;
 }
diff --git a/tensorflow/core/lib/io/table.cc b/tensorflow/core/lib/io/table.cc
@@ -104,7 +104,7 @@ Iterator* Table::BlockReader(void* arg, const StringPiece& index_value) {
   Table* table = reinterpret_cast<Table*>(arg);
   Cache* block_cache = table->rep_->options.block_cache;
   Block* block = nullptr;
-  Cache::Handle* cache_handle = NULL;
+  Cache::Handle* cache_handle = nullptr;
 
   BlockHandle handle;
   StringPiece input = index_value;
diff --git a/tensorflow/core/lib/png/png_io.h b/tensorflow/core/lib/png/png_io.h
@@ -56,7 +56,7 @@ struct DecodeContext {
   int channels;
   bool need_to_synthesize_16;
   bool error_condition;
-  DecodeContext() : png_ptr(NULL), info_ptr(NULL) {}
+  DecodeContext() : png_ptr(nullptr), info_ptr(nullptr) {}
 };
 
 bool DecodeHeader(StringPiece png_string, int* width, int* height,
diff --git a/tensorflow/core/profiler/internal/gpu/cupti_collector.cc b/tensorflow/core/profiler/internal/gpu/cupti_collector.cc
@@ -114,7 +114,7 @@ class PerDeviceCollector {
 
     status = cudaOccMaxPotentialOccupancyBlockSize(
         &stats.min_grid_size, &stats.suggested_block_size, &device_properties_,
-        &params.attributes, &state, NULL, params.dynamic_smem_size);
+        &params.attributes, &state, nullptr, params.dynamic_smem_size);
     if (status != CUDA_OCC_SUCCESS) {
       return {};
     }
diff --git a/tensorflow/core/profiler/internal/gpu/cupti_tracer.cc b/tensorflow/core/profiler/internal/gpu/cupti_tracer.cc
@@ -850,7 +850,7 @@ class CuptiDriverApiHookWithActivityApi : public CuptiDriverApiHook {
  private:
   void TrackContext(CUpti_CallbackId cbid, CUcontext ctx) {
     if (!option_.sync_devices_before_stop) return;
-    if (ctx == NULL) return;
+    if (ctx == nullptr) return;
     absl::MutexLock lock(&mutex_);
     if (cbid == CUPTI_DRIVER_TRACE_CBID_cuCtxDestroy_v2 ||
         cbid == CUPTI_DRIVER_TRACE_CBID_cuCtxDestroy) {
diff --git a/tensorflow/core/profiler/internal/gpu/device_tracer_test.cc b/tensorflow/core/profiler/internal/gpu/device_tracer_test.cc
@@ -331,8 +331,8 @@ TEST_F(DeviceTracerTest, CudaRuntimeResource) {
   const size_t size_in_bytes = 8;
   const int8_t test_value = 7;
   TF_EXPECT_OK(tracer->Start());
-  void* hostptr = 0;
-  void* devptr = 0;
+  void* hostptr = nullptr;
+  void* devptr = nullptr;
 
   // These six CUDA API calls will create 4 CUDA API and 4 device XEvents.
   ASSERT_EQ(cudaSuccess,
diff --git a/tensorflow/java/src/main/native/eager_operation_builder_jni.cc b/tensorflow/java/src/main/native/eager_operation_builder_jni.cc
@@ -91,7 +91,7 @@ JNIEXPORT void JNICALL Java_org_tensorflow_EagerOperationBuilder_delete(
 JNIEXPORT jlongArray JNICALL Java_org_tensorflow_EagerOperationBuilder_execute(
     JNIEnv* env, jclass clazz, jlong op_handle) {
   TFE_Op* op = requireOp(env, op_handle);
-  if (op == nullptr) return 0;
+  if (op == nullptr) return nullptr;
   int num_retvals = MAX_OUTPUTS_PER_OP;
   std::unique_ptr<TFE_TensorHandle*[]> retvals(
       new TFE_TensorHandle*[num_retvals]);
diff --git a/tensorflow/java/src/main/native/graph_jni.cc b/tensorflow/java/src/main/native/graph_jni.cc
@@ -206,7 +206,7 @@ jlongArray buildSubgraph(JNIEnv* env, jclass clazz, jobject subgraph_builder,
   jmethodID build_subgraph_method_id = env->GetStaticMethodID(
       clazz, "buildSubgraph",
       "(Lorg/tensorflow/Graph$WhileSubgraphBuilder;J[J[I[J[I)[J");
-  if (build_subgraph_method_id == 0) return nullptr;
+  if (build_subgraph_method_id == nullptr) return nullptr;
 
   jlong subgraph_handle = reinterpret_cast<jlong>(subgraph);
 
@@ -309,7 +309,7 @@ JNIEXPORT jlongArray JNICALL Java_org_tensorflow_Graph_whileLoop(
                                 body_output_elems, 0);
 
   // set loop name param
-  params.name = env->GetStringUTFChars(name, 0);
+  params.name = env->GetStringUTFChars(name, nullptr);
 
   // build the while loop, storing loop outputs in `outputs`
   std::unique_ptr<TF_Output[]> outputs(new TF_Output[ninputs]);
diff --git a/tensorflow/lite/python/interpreter_wrapper/numpy.cc b/tensorflow/lite/python/interpreter_wrapper/numpy.cc
@@ -118,7 +118,7 @@ bool FillStringBufferFromPyUnicode(PyObject* value,
                                    DynamicBuffer* dynamic_buffer) {
   Py_ssize_t len = -1;
   const char* buf = PyUnicode_AsUTF8AndSize(value, &len);
-  if (buf == NULL) {
+  if (buf == nullptr) {
     PyErr_SetString(PyExc_ValueError, "PyUnicode_AsUTF8AndSize() failed.");
     return false;
   }

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ const typename Collection::value_type::second_type* FindOrNull(`
`40`	`40`	`const typename Collection::value_type::first_type& key) {`
`41`	`41`	`typename Collection::const_iterator it = collection.find(key);`
`42`	`42`	`if (it == collection.end()) {`
`43`		`- return 0;`
	`43`	`+ return nullptr;`
`44`	`44`	`}`
`45`	`45`	`return &it->second;`
`46`	`46`	`}`
`@@ -52,7 +52,7 @@ typename Collection::value_type::second_type* FindOrNull(`
`52`	`52`	`const typename Collection::value_type::first_type& key) {`
`53`	`53`	`typename Collection::iterator it = collection.find(key);`
`54`	`54`	`if (it == collection.end()) {`
`55`		`- return 0;`
	`55`	`+ return nullptr;`
`56`	`56`	`}`
`57`	`57`	`return &it->second;`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ class PerDeviceCollector {`
`114`	`114`
`115`	`115`	`status = cudaOccMaxPotentialOccupancyBlockSize(`
`116`	`116`	`&stats.min_grid_size, &stats.suggested_block_size, &device_properties_,`
`117`		`- &params.attributes, &state, NULL, params.dynamic_smem_size);`
	`117`	`+ &params.attributes, &state, nullptr, params.dynamic_smem_size);`
`118`	`118`	`if (status != CUDA_OCC_SUCCESS) {`
`119`	`119`	`return {};`
`120`	`120`	`}`