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 7d07c49b9d7e00213b6dbf3372aef5984677bb1f..7fb27e15484b11e63eb3f4bc62703f5ab9afeb57 100644 (file)
--- 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 9846515776159782d7a95b854b561ce791c730c5..a7f290f6241b98d7d168da8985c128f514de1ffd 100644 (file)
--- 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 e974863ae1b899e3d3cb4f90b18db4921059b464..f71a5217b9b176e2fbf9f1fd602917a9e0a8dd3a 100644 (file)
--- 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<double>  &V,
                           VectorOperation::values         operation,
-                          std_cxx11::shared_ptr<const CommunicationPatternBase> communication_pattern = NULL);
+                          std_cxx11::shared_ptr<const CommunicationPatternBase> communication_pattern =
+                            std_cxx11::shared_ptr<const CommunicationPatternBase> ());
 
       /**
        * 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 b325607fc08fe9bf3198149b5e6cd59e294826cc..85b382835429862d01e371d1747c269ae32f59cf 100644 (file)
--- a/include/deal.II/lac/vector_space_vector.h
+++ b/include/deal.II/lac/vector_space_vector.h
@@ -20,6 +20,7 @@
 #include <deal.II/base/mpi.h>
 #include <deal.II/base/numbers.h>
 #include <deal.II/base/std_cxx11/shared_ptr.h>
+#include <deal.II/lac/vector.h>
 
 
 DEAL_II_NAMESPACE_OPEN
@@ -81,7 +82,8 @@ namespace LinearAlgebra
      */
     virtual void import(const ReadWriteVector<Number> &V,
                         VectorOperation::values operation,
-                        std_cxx11::shared_ptr<const CommunicationPatternBase> communication_pattern = NULL) = 0;
+                        std_cxx11::shared_ptr<const CommunicationPatternBase> communication_pattern =
+                          std_cxx11::shared_ptr<const CommunicationPatternBase> ()) = 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 854de65ff77ee758b4fcfe895b655f6879cc2587..58d3bae0f176622bbf7e41207112c4e60f50386d 100644 (file)
--- 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 &parallel_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)))
     {}