From a2da6109851b7f8261f5b346d01e6e4da80dc085 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Sat, 15 May 2010 14:17:22 +0000 Subject: [PATCH] Fix Slepc compilation. git-svn-id: https://svn.dealii.org/trunk@21132 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/lac/include/lac/slepc_solver.h | 2 +- .../lac/include/lac/slepc_spectral_transformation.h | 2 +- deal.II/lac/source/slepc_solver.cc | 10 +++++----- deal.II/lac/source/slepc_spectral_transformation.cc | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deal.II/lac/include/lac/slepc_solver.h b/deal.II/lac/include/lac/slepc_solver.h index deb4438ca0..afd0a37427 100644 --- a/deal.II/lac/include/lac/slepc_solver.h +++ b/deal.II/lac/include/lac/slepc_solver.h @@ -20,7 +20,7 @@ #ifdef DEAL_II_USE_SLEPC -# include +# include # include # include # include diff --git a/deal.II/lac/include/lac/slepc_spectral_transformation.h b/deal.II/lac/include/lac/slepc_spectral_transformation.h index 974046c937..736d024e15 100644 --- a/deal.II/lac/include/lac/slepc_spectral_transformation.h +++ b/deal.II/lac/include/lac/slepc_spectral_transformation.h @@ -20,7 +20,7 @@ #ifdef DEAL_II_USE_SLEPC -# include +# include # include # include diff --git a/deal.II/lac/source/slepc_solver.cc b/deal.II/lac/source/slepc_solver.cc index 58142a7c87..bb50e8b2cd 100644 --- a/deal.II/lac/source/slepc_solver.cc +++ b/deal.II/lac/source/slepc_solver.cc @@ -53,7 +53,7 @@ namespace SLEPcWrappers SolverBase::~SolverBase () { - if (solver_data != 0) + if (&*solver_data != 0) solver_data.reset (); } @@ -95,7 +95,7 @@ namespace SLEPcWrappers { int ierr; - AssertThrow (solver_data == 0, ExcSLEPcWrappersUsageError()); + AssertThrow (&*solver_data == 0, ExcSLEPcWrappersUsageError()); solver_data.reset (new SolverData()); // create eigensolver context and @@ -158,7 +158,7 @@ namespace SLEPcWrappers #endif PETScWrappers::VectorBase &vr) { - AssertThrow (solver_data != 0, ExcSLEPcWrappersUsageError()); + AssertThrow (&*solver_data != 0, ExcSLEPcWrappersUsageError()); // get converged eigenpair int ierr = EPSGetEigenpair(solver_data->eps, index, @@ -170,7 +170,7 @@ namespace SLEPcWrappers void SolverBase::reset () { - AssertThrow (solver_data != 0, ExcSLEPcWrappersUsageError()); + AssertThrow (&*solver_data != 0, ExcSLEPcWrappersUsageError()); // destroy solver object. solver_data.reset (); @@ -179,7 +179,7 @@ namespace SLEPcWrappers EPS * SolverBase::get_EPS () { - if( solver_data == 0 ) + if( &*solver_data == 0 ) return NULL; return &solver_data->eps; } diff --git a/deal.II/lac/source/slepc_spectral_transformation.cc b/deal.II/lac/source/slepc_spectral_transformation.cc index b1e6b67636..1d818a3c31 100644 --- a/deal.II/lac/source/slepc_spectral_transformation.cc +++ b/deal.II/lac/source/slepc_spectral_transformation.cc @@ -45,7 +45,7 @@ namespace SLEPcWrappers void TransformationBase::set_context (EPS &eps) { - AssertThrow (transformation_data == 0, + AssertThrow (&*transformation_data == 0, SolverBase::ExcSLEPcWrappersUsageError()); transformation_data.reset (new TransformationData()); -- 2.39.5