From: Martin Kronbichler Date: Tue, 28 Jul 2009 11:11:16 +0000 (+0000) Subject: std::auto_ptr cannot be copied which causes an error on some platforms. Use std_cxx1x... X-Git-Tag: v8.0.0~7441 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=942294ec9eb43f3fad26d9dcd6eac89266851724;p=dealii.git std::auto_ptr cannot be copied which causes an error on some platforms. Use std_cxx1x::shared_ptr instead. git-svn-id: https://svn.dealii.org/trunk@19124 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/include/lac/constraint_matrix.h b/deal.II/lac/include/lac/constraint_matrix.h index f99bd67173..c6b8a39c7c 100644 --- a/deal.II/lac/include/lac/constraint_matrix.h +++ b/deal.II/lac/include/lac/constraint_matrix.h @@ -1521,7 +1521,7 @@ class ConstraintMatrix : public Subscriptor * This vector is used to import data * within the distribute function. */ - mutable std::auto_ptr vec_distribute; + mutable std_cxx1x::shared_ptr vec_distribute; #endif }; diff --git a/deal.II/lac/source/constraint_matrix.cc b/deal.II/lac/source/constraint_matrix.cc index 5bd0c374fe..0624e8cfdf 100644 --- a/deal.II/lac/source/constraint_matrix.cc +++ b/deal.II/lac/source/constraint_matrix.cc @@ -1917,7 +1917,7 @@ ConstraintMatrix::distribute (TrilinosWrappers::MPI::Vector &vec) const my_indices.resize(index2); Epetra_Map map_exchange = Epetra_Map(-1,index2,(int*)&my_indices[0],0,vec.trilinos_vector().Comm()); - vec_distribute = std::auto_ptr + vec_distribute = std_cxx1x::shared_ptr (new TrilinosWrappers::MPI::Vector(map_exchange)); } // here we import the data