Skip to content
Snippets Groups Projects
Commit 19625624 authored by Oliver Sander's avatar Oliver Sander Committed by sander
Browse files

Replace deprecated auto_ptr by unique_ptr

Patch by Jonathan Youett

[[Imported from SVN: r10056]]
parent c5fe0f31
No related branches found
No related tags found
No related merge requests found
......@@ -618,7 +618,7 @@ public:
for (size_t i=0; i<coefficients.size(); i++)
orientationCoefficients[i] = coefficients[i].q;
orientationFEFunction_ = std::auto_ptr<LocalGeodesicFEFunction<dim,ctype,LocalFiniteElement,Rotation<field_type,3> > > (new LocalGeodesicFEFunction<dim,ctype,LocalFiniteElement,Rotation<field_type,3> >(localFiniteElement,orientationCoefficients));
orientationFEFunction_ = std::unique_ptr<LocalGeodesicFEFunction<dim,ctype,LocalFiniteElement,Rotation<field_type,3> > > (new LocalGeodesicFEFunction<dim,ctype,LocalFiniteElement,Rotation<field_type,3> >(localFiniteElement,orientationCoefficients));
}
......@@ -823,7 +823,7 @@ private:
std::vector<Dune::FieldVector<field_type,3> > translationCoefficients_;
std::auto_ptr<LocalGeodesicFEFunction<dim,ctype,LocalFiniteElement,Rotation<field_type,3> > > orientationFEFunction_;
std::unique_ptr<LocalGeodesicFEFunction<dim,ctype,LocalFiniteElement,Rotation<field_type,3> > > orientationFEFunction_;
};
......
......@@ -179,7 +179,7 @@ setup(const GridType& grid,
// Create Hessian matrix and its occupation structure
// ////////////////////////////////////////////////////////////
hessianMatrix_ = std::auto_ptr<MatrixType>(new MatrixType);
hessianMatrix_ = std::unique_ptr<MatrixType>(new MatrixType);
Dune::MatrixIndexSet indices(grid_->size(1), grid_->size(1));
assembler_->getNeighborsPerVertex(indices);
indices.exportIdx(*hessianMatrix_);
......
......@@ -80,7 +80,7 @@ public:
RiemannianTrustRegionSolver()
: IterativeSolver<std::vector<TargetSpace>, Dune::BitSetVector<blocksize> >(0,100,NumProc::FULL),
hessianMatrix_(std::auto_ptr<MatrixType>(NULL)), h1SemiNorm_(NULL)
hessianMatrix_(nullptr), h1SemiNorm_(NULL)
{
std::fill(scaling_.begin(), scaling_.end(), 1.0);
}
......@@ -155,7 +155,7 @@ protected:
double innerTolerance_;
/** \brief Hessian matrix */
std::auto_ptr<MatrixType> hessianMatrix_;
std::unique_ptr<MatrixType> hessianMatrix_;
/** \brief The assembler for the material law */
const GeodesicFEAssembler<Basis, TargetSpace>* assembler_;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment