From: Wolfgang Bangerth Date: Fri, 16 Jul 2010 12:09:14 +0000 (+0000) Subject: Compare shared_ptr against 0 in a way so that it also works with X-Git-Tag: v8.0.0~5815 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fe3ceda4eb20355b385c86e4a16f3edec00b32f;p=dealii.git Compare shared_ptr against 0 in a way so that it also works with current gcc mainline. git-svn-id: https://svn.dealii.org/trunk@21506 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/include/lac/iterative_inverse.h b/deal.II/lac/include/lac/iterative_inverse.h index 0bf78ff0c9..90e13a3381 100644 --- a/deal.II/lac/include/lac/iterative_inverse.h +++ b/deal.II/lac/include/lac/iterative_inverse.h @@ -91,7 +91,7 @@ class IterativeInverse : public Subscriptor * and preconditioner. */ void clear(); - + /** * Solve for right hand side src. */ @@ -111,13 +111,13 @@ class IterativeInverse : public Subscriptor * parameters. */ SolverSelector solver; - + private: /** * The matrix in use. */ std_cxx1x::shared_ptr > matrix; - + /** * The preconditioner to use. */ @@ -126,7 +126,7 @@ class IterativeInverse : public Subscriptor * The transpose of the matrix in use. */ std_cxx1x::shared_ptr > transpose_matrix; - + /** * The transpose of the preconditioner to use. */ @@ -161,8 +161,8 @@ template inline void IterativeInverse::vmult (VECTOR& dst, const VECTOR& src) const { - Assert(matrix != 0, ExcNotInitialized()); - Assert(preconditioner != 0, ExcNotInitialized()); + Assert(matrix.get() != 0, ExcNotInitialized()); + Assert(preconditioner.get() != 0, ExcNotInitialized()); solver.solve(*matrix, dst, src, *preconditioner); }