From: Bruno Turcksin Date: Thu, 24 Mar 2016 17:58:20 +0000 (-0400) Subject: Do not assign NULL to boost::shared_ptr. X-Git-Tag: v8.5.0-rc1~1177^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2404%2Fhead;p=dealii.git Do not assign NULL to boost::shared_ptr. --- diff --git a/include/deal.II/lac/read_write_vector.templates.h b/include/deal.II/lac/read_write_vector.templates.h index 7d07c49b9d..7fb27e1548 100644 --- a/include/deal.II/lac/read_write_vector.templates.h +++ b/include/deal.II/lac/read_write_vector.templates.h @@ -71,7 +71,7 @@ namespace LinearAlgebra // reset the communication patter source_stored_elements.clear(); - comm_pattern = NULL; + comm_pattern.reset(); } @@ -91,7 +91,7 @@ namespace LinearAlgebra // reset the communication patter source_stored_elements.clear(); - comm_pattern = NULL; + comm_pattern.reset(); } @@ -112,7 +112,7 @@ namespace LinearAlgebra // reset the communication patter source_stored_elements.clear(); - comm_pattern = NULL; + comm_pattern.reset(); } diff --git a/include/deal.II/lac/trilinos_epetra_communication_pattern.h b/include/deal.II/lac/trilinos_epetra_communication_pattern.h index 9846515776..a7f290f624 100644 --- a/include/deal.II/lac/trilinos_epetra_communication_pattern.h +++ b/include/deal.II/lac/trilinos_epetra_communication_pattern.h @@ -55,7 +55,7 @@ namespace LinearAlgebra */ void reinit(const IndexSet &vector_space_vector_index_set, const IndexSet &read_write_vector_index_set, - const MPI_Comm &communicator) override; + const MPI_Comm &communicator); /** * Return the underlying MPI communicator. diff --git a/include/deal.II/lac/trilinos_epetra_vector.h b/include/deal.II/lac/trilinos_epetra_vector.h index e974863ae1..f71a5217b9 100644 --- a/include/deal.II/lac/trilinos_epetra_vector.h +++ b/include/deal.II/lac/trilinos_epetra_vector.h @@ -101,7 +101,8 @@ namespace LinearAlgebra */ virtual void import(const ReadWriteVector &V, VectorOperation::values operation, - std_cxx11::shared_ptr communication_pattern = NULL); + std_cxx11::shared_ptr communication_pattern = + std_cxx11::shared_ptr ()); /** * Multiply the entire vector by a fixed factor. diff --git a/include/deal.II/lac/vector_space_vector.h b/include/deal.II/lac/vector_space_vector.h index b325607fc0..85b3828354 100644 --- a/include/deal.II/lac/vector_space_vector.h +++ b/include/deal.II/lac/vector_space_vector.h @@ -20,6 +20,7 @@ #include #include #include +#include DEAL_II_NAMESPACE_OPEN @@ -81,7 +82,8 @@ namespace LinearAlgebra */ virtual void import(const ReadWriteVector &V, VectorOperation::values operation, - std_cxx11::shared_ptr communication_pattern = NULL) = 0; + std_cxx11::shared_ptr communication_pattern = + std_cxx11::shared_ptr ()) = 0; /** * Return the scalar product of two vectors. diff --git a/source/lac/trilinos_epetra_vector.cc b/source/lac/trilinos_epetra_vector.cc index 854de65ff7..58d3bae0f1 100644 --- a/source/lac/trilinos_epetra_vector.cc +++ b/source/lac/trilinos_epetra_vector.cc @@ -33,16 +33,14 @@ namespace LinearAlgebra { Vector::Vector() : - vector(new Epetra_FEVector(Epetra_Map(0,0,0,Utilities::Trilinos::comm_self()))), - epetra_comm_pattern(NULL) + vector(new Epetra_FEVector(Epetra_Map(0,0,0,Utilities::Trilinos::comm_self()))) {} Vector::Vector(const Vector &V) : - vector(new Epetra_FEVector(V.trilinos_vector())), - epetra_comm_pattern(NULL) + vector(new Epetra_FEVector(V.trilinos_vector())) {} @@ -50,8 +48,7 @@ namespace LinearAlgebra Vector::Vector(const IndexSet ¶llel_partitioner, const MPI_Comm &communicator) : - vector(new Epetra_FEVector(parallel_partitioner.make_trilinos_map(communicator,false))), - epetra_comm_pattern(NULL) + vector(new Epetra_FEVector(parallel_partitioner.make_trilinos_map(communicator,false))) {}