From 2d4df561b8637311712bc59d0326e17d137e8269 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Sun, 25 Oct 2015 20:22:43 -0400 Subject: [PATCH] remove typename outside template This fixes building on msvc --- include/deal.II/lac/precondition.h | 8 ++++---- source/lac/sparse_direct.cc | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/deal.II/lac/precondition.h b/include/deal.II/lac/precondition.h index 9950fba5a7..536d4d097f 100644 --- a/include/deal.II/lac/precondition.h +++ b/include/deal.II/lac/precondition.h @@ -1029,14 +1029,14 @@ PreconditionIdentity::Tvmult_add (VECTOR &dst, const VECTOR &src) const dst.add(src); } -inline typename PreconditionIdentity::size_type +inline PreconditionIdentity::size_type PreconditionIdentity::m () const { Assert(n_rows != 0, ExcNotInitialized()); return n_rows; } -inline typename PreconditionIdentity::size_type +inline PreconditionIdentity::size_type PreconditionIdentity::n () const { Assert(n_columns != 0, ExcNotInitialized()); @@ -1120,14 +1120,14 @@ PreconditionRichardson::Tvmult_add (VECTOR &dst, const VECTOR &src) const dst.add(relaxation,src); } -inline typename PreconditionRichardson::size_type +inline PreconditionRichardson::size_type PreconditionRichardson::m () const { Assert(n_rows != 0, ExcNotInitialized()); return n_rows; } -inline typename PreconditionRichardson::size_type +inline PreconditionRichardson::size_type PreconditionRichardson::n () const { Assert(n_columns != 0, ExcNotInitialized()); diff --git a/source/lac/sparse_direct.cc b/source/lac/sparse_direct.cc index 637eea4550..a8641c30c5 100644 --- a/source/lac/sparse_direct.cc +++ b/source/lac/sparse_direct.cc @@ -473,14 +473,14 @@ SparseDirectUMFPACK::Tvmult ( this->solve(dst, /*transpose=*/ true); } -typename SparseDirectUMFPACK::size_type +SparseDirectUMFPACK::size_type SparseDirectUMFPACK::m () const { Assert (_m!=0, ExcNotInitialized()); return _m; } -typename SparseDirectUMFPACK::size_type +SparseDirectUMFPACK::size_type SparseDirectUMFPACK::n () const { Assert (_n!=0, ExcNotInitialized()); -- 2.39.5