From b113e816575e81146345b978dc199ccf72977357 Mon Sep 17 00:00:00 2001 From: bangerth Date: Mon, 23 Oct 2006 15:53:31 +0000 Subject: [PATCH] Fix fallout from the dealii:: namespace patches git-svn-id: https://svn.dealii.org/trunk@14048 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/dofs/dof_iterator_selector.h | 2 ++ deal.II/deal.II/include/grid/tria_iterator_selector.h | 2 ++ deal.II/lac/include/lac/petsc_parallel_vector.h | 8 ++++---- deal.II/lac/include/lac/petsc_vector.h | 8 ++++---- deal.II/lac/include/lac/precondition_selector.h | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/deal.II/deal.II/include/dofs/dof_iterator_selector.h b/deal.II/deal.II/include/dofs/dof_iterator_selector.h index 39145d92be..8688258035 100644 --- a/deal.II/deal.II/include/dofs/dof_iterator_selector.h +++ b/deal.II/deal.II/include/dofs/dof_iterator_selector.h @@ -21,6 +21,8 @@ // 2. Can cell_iterator and quad_iterator in 2D be different (or hex // in 3D)? +#include + DEAL_II_NAMESPACE_OPEN template class DoFAccessor; diff --git a/deal.II/deal.II/include/grid/tria_iterator_selector.h b/deal.II/deal.II/include/grid/tria_iterator_selector.h index 47fa4e30aa..8af49ebe4c 100644 --- a/deal.II/deal.II/include/grid/tria_iterator_selector.h +++ b/deal.II/deal.II/include/grid/tria_iterator_selector.h @@ -14,6 +14,8 @@ #define __deal2__tria_iterator_selector_h +#include + DEAL_II_NAMESPACE_OPEN template class CellAccessor; diff --git a/deal.II/lac/include/lac/petsc_parallel_vector.h b/deal.II/lac/include/lac/petsc_parallel_vector.h index a009392780..d66a9f908f 100644 --- a/deal.II/lac/include/lac/petsc_parallel_vector.h +++ b/deal.II/lac/include/lac/petsc_parallel_vector.h @@ -201,7 +201,7 @@ namespace PETScWrappers */ template explicit Vector (const MPI_Comm &communicator, - const ::Vector &v, + const dealii::Vector &v, const unsigned int local_size); /** @@ -294,7 +294,7 @@ namespace PETScWrappers * source vector. */ template - Vector & operator = (const ::Vector &v); + Vector & operator = (const dealii::Vector &v); /** * Change the dimension of the vector @@ -396,7 +396,7 @@ namespace PETScWrappers template Vector::Vector (const MPI_Comm &communicator, - const ::Vector &v, + const dealii::Vector &v, const unsigned int local_size) : communicator (communicator) @@ -439,7 +439,7 @@ namespace PETScWrappers template inline Vector & - Vector::operator = (const ::Vector &v) + Vector::operator = (const dealii::Vector &v) { Assert (size() == v.size(), ExcDimensionMismatch (size(), v.size())); diff --git a/deal.II/lac/include/lac/petsc_vector.h b/deal.II/lac/include/lac/petsc_vector.h index 31215e4cbb..714d69c2ee 100644 --- a/deal.II/lac/include/lac/petsc_vector.h +++ b/deal.II/lac/include/lac/petsc_vector.h @@ -74,7 +74,7 @@ namespace PETScWrappers * elements. */ template - explicit Vector (const ::Vector &v); + explicit Vector (const dealii::Vector &v); /** * Copy-constructor the values from a @@ -147,7 +147,7 @@ namespace PETScWrappers * object. */ template - Vector & operator = (const ::Vector &v); + Vector & operator = (const dealii::Vector &v); /** * Change the dimension of the vector @@ -217,7 +217,7 @@ namespace PETScWrappers #ifndef DOXYGEN template - Vector::Vector (const ::Vector &v) + Vector::Vector (const dealii::Vector &v) { Vector::create_vector (v.size()); @@ -304,7 +304,7 @@ namespace PETScWrappers template inline Vector & - Vector::operator = (const ::Vector &v) + Vector::operator = (const dealii::Vector &v) { reinit (v.size(), true); // the following isn't necessarily fast, diff --git a/deal.II/lac/include/lac/precondition_selector.h b/deal.II/lac/include/lac/precondition_selector.h index bf48f39f11..ef8e6204f6 100644 --- a/deal.II/lac/include/lac/precondition_selector.h +++ b/deal.II/lac/include/lac/precondition_selector.h @@ -90,7 +90,7 @@ template class SparseMatrix; * @author Ralf Hartmann, 1999 */ template , - class Vector = ::Vector > + class Vector = dealii::Vector > class PreconditionSelector : public Subscriptor { public: -- 2.39.5