Fix Slepc compilation.

git-svn-id: https://svn.dealii.org/trunk@21132 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/lac/include/lac/slepc_solver.h b/deal.II/lac/include/lac/slepc_solver.h
index deb4438ca01eea50e5c07069b0d0e66cbb7e26f8..afd0a37427fbd229d76f99a7fe00511d353230f0 100644 (file)
--- 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 <base/std_cxx1x/shared_ptr.hpp>
+#  include <base/std_cxx1x/shared_ptr.h>
 #  include <lac/exceptions.h>
 #  include <lac/solver_control.h>
 #  include <lac/petsc_matrix_base.h>

diff --git a/deal.II/lac/include/lac/slepc_spectral_transformation.h b/deal.II/lac/include/lac/slepc_spectral_transformation.h
index 974046c9378160a6f222af058230bc579523a213..736d024e15ab1fa17fe5d6cb03052cc13a2324a0 100644 (file)
--- 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 <base/std_cxx1x/shared_ptr.hpp>
+#  include <base/std_cxx1x/shared_ptr.h>
 #  include <lac/exceptions.h>
 
 #  include <petscksp.h>

diff --git a/deal.II/lac/source/slepc_solver.cc b/deal.II/lac/source/slepc_solver.cc
index 58142a7c87ae4211823625708f5ce73813702c62..bb50e8b2cdacde0261e13fdf2c6e972b0046706a 100644 (file)
--- 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 b1e6b67636dc79a27ed705767e915924f7fca69e..1d818a3c314b02a3133a995f06de0ce79e05f684 100644 (file)
--- 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());