From 2bf01b8ef2dcfb88bd540b7a26926ec99bd50c68 Mon Sep 17 00:00:00 2001 From: hartmann Date: Mon, 23 Oct 2006 16:31:28 +0000 Subject: [PATCH] Add some missing ::dealii which are required if DEAL_II_USE_PETSC. git-svn-id: https://svn.dealii.org/trunk@14051 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/lac/include/lac/petsc_block_vector.h | 2 +- deal.II/lac/include/lac/petsc_parallel_block_vector.h | 2 +- deal.II/lac/include/lac/petsc_vector_base.h | 2 +- deal.II/lac/source/petsc_solver.cc | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/deal.II/lac/include/lac/petsc_block_vector.h b/deal.II/lac/include/lac/petsc_block_vector.h index f2ed580ecf..9cfb8990a1 100644 --- a/deal.II/lac/include/lac/petsc_block_vector.h +++ b/deal.II/lac/include/lac/petsc_block_vector.h @@ -457,7 +457,7 @@ namespace PETScWrappers for (unsigned int i=0; in_blocks(); ++i) this->components[i].swap (v.components[i]); - ::swap (this->block_indices, v.block_indices); + ::dealii::swap (this->block_indices, v.block_indices); } diff --git a/deal.II/lac/include/lac/petsc_parallel_block_vector.h b/deal.II/lac/include/lac/petsc_parallel_block_vector.h index 8d752f320d..500a9123f7 100644 --- a/deal.II/lac/include/lac/petsc_parallel_block_vector.h +++ b/deal.II/lac/include/lac/petsc_parallel_block_vector.h @@ -448,7 +448,7 @@ namespace PETScWrappers for (unsigned int i=0; in_blocks(); ++i) this->components[i].swap (v.components[i]); - ::swap (this->block_indices, v.block_indices); + ::dealii::swap (this->block_indices, v.block_indices); } diff --git a/deal.II/lac/include/lac/petsc_vector_base.h b/deal.II/lac/include/lac/petsc_vector_base.h index 4f176e2dd4..eb1b9963a9 100644 --- a/deal.II/lac/include/lac/petsc_vector_base.h +++ b/deal.II/lac/include/lac/petsc_vector_base.h @@ -180,7 +180,7 @@ namespace PETScWrappers * that it can create objects of the * present type. */ - friend class ::PETScWrappers::VectorBase; + friend class ::dealii::PETScWrappers::VectorBase; }; } /** diff --git a/deal.II/lac/source/petsc_solver.cc b/deal.II/lac/source/petsc_solver.cc index be98e02095..59d2f97d71 100644 --- a/deal.II/lac/source/petsc_solver.cc +++ b/deal.II/lac/source/petsc_solver.cc @@ -226,15 +226,15 @@ namespace PETScWrappers switch (state) { - case ::SolverControl::iterate: + case ::dealii::SolverControl::iterate: *reason = KSP_CONVERGED_ITERATING; break; - case ::SolverControl::success: + case ::dealii::SolverControl::success: *reason = static_cast(1); break; - case ::SolverControl::failure: + case ::dealii::SolverControl::failure: if (solver_control.last_step() > solver_control.max_steps()) *reason = KSP_DIVERGED_ITS; else -- 2.39.5