From: Daniel Arndt <daniel.arndt@iwr.uni-heidelberg.de>
Date: Sun, 5 Mar 2017 21:53:49 +0000 (+0100)
Subject: Fix pre-C++11 issues
X-Git-Tag: v8.5.0-rc1~61^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75c7421aa35abeb5c31c6567d54195dc26ba6842;p=dealii.git

Fix pre-C++11 issues
---

diff --git a/include/deal.II/matrix_free/operators.h b/include/deal.II/matrix_free/operators.h
index 8f35118acd..a52c638595 100644
--- a/include/deal.II/matrix_free/operators.h
+++ b/include/deal.II/matrix_free/operators.h
@@ -779,9 +779,11 @@ namespace MatrixFreeOperators
   Base<dim,VectorType>::Base ()
     :
     Subscriptor(),
-    data(NULL),
     have_interface_matrices(false)
   {
+    // boost-1.62.0 doesn't allow initializing a shared_ptr
+    // with NULL. Make sure the default constructor does that.
+    Assert(data.get() == NULL, ExcInternalError());
   }
 
 
diff --git a/tests/matrix_free/matrix_vector_stokes_base.cc b/tests/matrix_free/matrix_vector_stokes_base.cc
index dc68467922..26ed95f6b3 100644
--- a/tests/matrix_free/matrix_vector_stokes_base.cc
+++ b/tests/matrix_free/matrix_vector_stokes_base.cc
@@ -119,7 +119,7 @@ test()
   dof_u.distribute_dofs(fe_u);
   dof_p.distribute_dofs(fe_p);
 
-  std::shared_ptr<MatrixFree<dim, double> > mf_data;
+  std_cxx11::shared_ptr<MatrixFree<dim, double> > mf_data;
 
   dof.distribute_dofs(fe);
   ConstraintMatrix constraints, constraints_u, constraints_p;
@@ -179,7 +179,7 @@ test()
     const FEValuesExtractors::Vector velocities(0);
     const FEValuesExtractors::Scalar pressure(dim);
 
-    std::vector<SymmetricTensor<2, dim>> phi_grads_u(dofs_per_cell);
+    std::vector<SymmetricTensor<2, dim> > phi_grads_u(dofs_per_cell);
     std::vector<double> div_phi_u(dofs_per_cell);
     std::vector<double> phi_p(dofs_per_cell);
 
@@ -242,7 +242,7 @@ test()
         mf_system_rhs.block(1)(j) = val;
       }
 
-  mf_data = std::shared_ptr<MatrixFree<dim, double> >(new MatrixFree<dim, double>());
+  mf_data = std_cxx11::shared_ptr<MatrixFree<dim, double> >(new MatrixFree<dim, double>());
   // setup matrix-free structure
   {
     std::vector<const DoFHandler<dim>*> dofs;