From bbd71aebd2fe7d6df8a47bc6a0dfd014f4fcc7f9 Mon Sep 17 00:00:00 2001 From: David Wells Date: Sat, 27 Jan 2018 13:19:53 -0500 Subject: [PATCH] Use nullptr for the null pointer. --- include/deal.II/matrix_free/tensor_product_kernels.h | 12 ++++++------ include/deal.II/particles/particle.h | 2 +- source/lac/scalapack.cc | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/deal.II/matrix_free/tensor_product_kernels.h b/include/deal.II/matrix_free/tensor_product_kernels.h index a3f6e723ca..8fe79420e1 100644 --- a/include/deal.II/matrix_free/tensor_product_kernels.h +++ b/include/deal.II/matrix_free/tensor_product_kernels.h @@ -77,9 +77,9 @@ namespace internal */ EvaluatorTensorProduct () : - shape_values (0), - shape_gradients (0), - shape_hessians (0) + shape_values (nullptr), + shape_gradients (nullptr), + shape_hessians (nullptr) {} /** @@ -316,9 +316,9 @@ namespace internal */ EvaluatorTensorProduct () : - shape_values (0), - shape_gradients (0), - shape_hessians (0), + shape_values (nullptr), + shape_gradients (nullptr), + shape_hessians (nullptr), fe_degree (numbers::invalid_unsigned_int), n_q_points_1d (numbers::invalid_unsigned_int) {} diff --git a/include/deal.II/particles/particle.h b/include/deal.II/particles/particle.h index 9cd1cf21ef..6ea1ee4a66 100644 --- a/include/deal.II/particles/particle.h +++ b/include/deal.II/particles/particle.h @@ -347,7 +347,7 @@ namespace Particles void Particle::save (Archive &ar, const unsigned int) const { unsigned int n_properties = 0; - if ((property_pool != NULL) && (properties != PropertyPool::invalid_handle)) + if ((property_pool != nullptr) && (properties != PropertyPool::invalid_handle)) n_properties = get_properties().size(); ar &location diff --git a/source/lac/scalapack.cc b/source/lac/scalapack.cc index b7918ed7f5..a63453e3d3 100644 --- a/source/lac/scalapack.cc +++ b/source/lac/scalapack.cc @@ -253,8 +253,8 @@ ScaLAPACKMatrix::copy_to (ScaLAPACKMatrix &dest) const int union_n_process_columns = 1; Cblacs_gridinit(&union_blacs_context, order, union_n_process_rows, union_n_process_columns); - const NumberType *loc_vals_source = NULL; - NumberType *loc_vals_dest = NULL; + const NumberType *loc_vals_source = nullptr; + NumberType *loc_vals_dest = nullptr; if (this->grid->mpi_process_is_active && (this->values.size()>0)) { -- 2.39.5