From: heister Date: Tue, 5 Mar 2013 19:04:19 +0000 (+0000) Subject: fix some more errors X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f66d05d03fa4562c7c920c9a687721f4b240bf46;p=dealii-svn.git fix some more errors git-svn-id: https://svn.dealii.org/branches/branch_bigger_global_dof_indices_4@28741 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/lac/constraint_matrix.cc b/deal.II/source/lac/constraint_matrix.cc index e4c69da6fb..cf95c9fb66 100644 --- a/deal.II/source/lac/constraint_matrix.cc +++ b/deal.II/source/lac/constraint_matrix.cc @@ -2268,7 +2268,7 @@ ConstraintMatrix::memory_consumption () const VectorType &condensed_vector) const; \ template void ConstraintMatrix:: \ distribute_local_to_global (const Vector &, \ - const std::vector &, \ + const std::vector &, \ VectorType &, \ const FullMatrix &) const; \ template void ConstraintMatrix::distribute(const VectorType &condensed,\ diff --git a/deal.II/source/lac/petsc_matrix_base.cc b/deal.II/source/lac/petsc_matrix_base.cc index 0ddd19db0c..bdf4de2ee4 100644 --- a/deal.II/source/lac/petsc_matrix_base.cc +++ b/deal.II/source/lac/petsc_matrix_base.cc @@ -270,7 +270,7 @@ namespace PETScWrappers - size_type + MatrixBase::size_type MatrixBase::m () const { #ifdef PETSC_USE_64BIT_INDICES @@ -287,7 +287,7 @@ namespace PETScWrappers - size_type + MatrixBase::size_type MatrixBase::n () const { #ifdef PETSC_USE_64BIT_INDICES @@ -304,7 +304,7 @@ namespace PETScWrappers - size_type + MatrixBase::size_type MatrixBase::local_size () const { #ifdef PETSC_USE_64BIT_INDICES @@ -321,7 +321,7 @@ namespace PETScWrappers - std::pair + std::pair MatrixBase::local_range () const { #ifdef PETSC_USE_64BIT_INDICES @@ -339,7 +339,7 @@ namespace PETScWrappers - size_type + MatrixBase::size_type MatrixBase::n_nonzero_elements () const { MatInfo mat_info; @@ -352,7 +352,7 @@ namespace PETScWrappers - size_type + MatrixBase::size_type MatrixBase:: row_length (const size_type row) const { diff --git a/deal.II/source/lac/petsc_parallel_sparse_matrix.cc b/deal.II/source/lac/petsc_parallel_sparse_matrix.cc index a1fa31752a..8097040817 100644 --- a/deal.II/source/lac/petsc_parallel_sparse_matrix.cc +++ b/deal.II/source/lac/petsc_parallel_sparse_matrix.cc @@ -618,7 +618,7 @@ namespace PETScWrappers template SparseMatrix::SparseMatrix (const MPI_Comm &, const SparsityPattern &, - const std::vector &, const std::vector &, const unsigned int, const bool); diff --git a/deal.II/source/lac/petsc_vector_base.cc b/deal.II/source/lac/petsc_vector_base.cc index ef58923090..e0de106e1b 100644 --- a/deal.II/source/lac/petsc_vector_base.cc +++ b/deal.II/source/lac/petsc_vector_base.cc @@ -263,7 +263,7 @@ namespace PETScWrappers - size_type + VectorBase::size_type VectorBase::size () const { #ifdef PETSC_USE_64BIT_INDICES @@ -280,7 +280,7 @@ namespace PETScWrappers - size_type + VectorBase::size_type VectorBase::local_size () const { #ifdef PETSC_USE_64BIT_INDICES @@ -297,7 +297,7 @@ namespace PETScWrappers - std::pair + std::pair VectorBase::local_range () const { #ifdef PETSC_USE_64BIT_INDICES