From 4201b6b776abec191498b5074254936b92b9793e Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Sat, 14 Nov 2015 18:24:04 +0100
Subject: [PATCH] Use std::unique_ptr instead of std::auto_ptr to avoid
deprecation warnings
---
dune/gfe/mixedriemanniantrsolver.cc | 8 ++++----
dune/gfe/mixedriemanniantrsolver.hh | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dune/gfe/mixedriemanniantrsolver.cc b/dune/gfe/mixedriemanniantrsolver.cc
index b334c8a4..1fac797a 100644
--- a/dune/gfe/mixedriemanniantrsolver.cc
+++ b/dune/gfe/mixedriemanniantrsolver.cc
@@ -175,10 +175,10 @@ setup(const GridType& grid,
// \todo Why are the hessianMatrix objects class members at all, and not local to 'solve'?
- hessianMatrix00_ = std::auto_ptr<MatrixType00>(new MatrixType00);
- hessianMatrix01_ = std::auto_ptr<MatrixType01>(new MatrixType01);
- hessianMatrix10_ = std::auto_ptr<MatrixType10>(new MatrixType10);
- hessianMatrix11_ = std::auto_ptr<MatrixType11>(new MatrixType11);
+ hessianMatrix00_ = std::unique_ptr<MatrixType00>(new MatrixType00);
+ hessianMatrix01_ = std::unique_ptr<MatrixType01>(new MatrixType01);
+ hessianMatrix10_ = std::unique_ptr<MatrixType10>(new MatrixType10);
+ hessianMatrix11_ = std::unique_ptr<MatrixType11>(new MatrixType11);
// ////////////////////////////////////
// Create the transfer operators
diff --git a/dune/gfe/mixedriemanniantrsolver.hh b/dune/gfe/mixedriemanniantrsolver.hh
index 7e5acd78..7525f782 100644
--- a/dune/gfe/mixedriemanniantrsolver.hh
+++ b/dune/gfe/mixedriemanniantrsolver.hh
@@ -125,10 +125,10 @@ protected:
double innerTolerance_;
/** \brief Hessian matrix */
- std::auto_ptr<MatrixType00> hessianMatrix00_;
- std::auto_ptr<MatrixType01> hessianMatrix01_;
- std::auto_ptr<MatrixType10> hessianMatrix10_;
- std::auto_ptr<MatrixType11> hessianMatrix11_;
+ std::unique_ptr<MatrixType00> hessianMatrix00_;
+ std::unique_ptr<MatrixType01> hessianMatrix01_;
+ std::unique_ptr<MatrixType10> hessianMatrix10_;
+ std::unique_ptr<MatrixType11> hessianMatrix11_;
/** \brief The assembler for the material law */
const MixedGFEAssembler<Basis0, TargetSpace0, Basis1, TargetSpace1>* assembler_;
--
GitLab