From bb8884caf0b19df3df035ce63b02ce5042f81270 Mon Sep 17 00:00:00 2001 From: heister Date: Sun, 21 Aug 2011 00:16:16 +0000 Subject: [PATCH] make clang happy with default template argument and use better exception. git-svn-id: https://svn.dealii.org/trunk@24131 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/source/fe/fe_q.cc | 12 ++++-------- deal.II/source/fe/fe_q_hierarchical.cc | 12 ++++-------- deal.II/source/fe/fe_raviart_thomas_nodal.cc | 4 ++-- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/deal.II/source/fe/fe_q.cc b/deal.II/source/fe/fe_q.cc index 979dd3b4e3..ca205683ca 100644 --- a/deal.II/source/fe/fe_q.cc +++ b/deal.II/source/fe/fe_q.cc @@ -778,12 +778,10 @@ get_interpolation_matrix (const FiniteElement &x_source_fe, template <> void FE_Q<1>:: -get_face_interpolation_matrix (const FiniteElement<1> &/*x_source_fe*/, +get_face_interpolation_matrix (const FiniteElement<1,1> &/*x_source_fe*/, FullMatrix &/*interpolation_matrix*/) const { - Assert (false, - FiniteElement<1>:: - ExcInterpolationNotImplemented ()); + Assert (false, ExcImpossibleInDim(1)); } @@ -791,13 +789,11 @@ get_face_interpolation_matrix (const FiniteElement<1> &/*x_source_fe*/, template <> void FE_Q<1>:: -get_subface_interpolation_matrix (const FiniteElement<1> &/*x_source_fe*/, +get_subface_interpolation_matrix (const FiniteElement<1,1> &/*x_source_fe*/, const unsigned int /*subface*/, FullMatrix &/*interpolation_matrix*/) const { - Assert (false, - FiniteElement<1>:: - ExcInterpolationNotImplemented ()); + Assert (false, ExcImpossibleInDim(1)); } diff --git a/deal.II/source/fe/fe_q_hierarchical.cc b/deal.II/source/fe/fe_q_hierarchical.cc index 106fa8e24e..71b999d681 100644 --- a/deal.II/source/fe/fe_q_hierarchical.cc +++ b/deal.II/source/fe/fe_q_hierarchical.cc @@ -587,25 +587,21 @@ void FE_Q_Hierarchical<1>::initialize_unit_face_support_points () template <> void FE_Q_Hierarchical<1>:: -get_face_interpolation_matrix (const FiniteElement<1> &/*x_source_fe*/, +get_face_interpolation_matrix (const FiniteElement<1,1> &/*x_source_fe*/, FullMatrix &/*interpolation_matrix*/) const { - Assert (false, - FiniteElement<1>:: - ExcInterpolationNotImplemented ()); + Assert (false, ExcImpossibleInDim(1)); } template <> void FE_Q_Hierarchical<1>:: -get_subface_interpolation_matrix (const FiniteElement<1> &/*x_source_fe*/, +get_subface_interpolation_matrix (const FiniteElement<1,1> &/*x_source_fe*/, const unsigned int /*subface*/, FullMatrix &/*interpolation_matrix*/) const { - Assert (false, - FiniteElement<1>:: - ExcInterpolationNotImplemented ()); + Assert (false, ExcImpossibleInDim(1)); } diff --git a/deal.II/source/fe/fe_raviart_thomas_nodal.cc b/deal.II/source/fe/fe_raviart_thomas_nodal.cc index 479c1e2b31..4f6c20da65 100644 --- a/deal.II/source/fe/fe_raviart_thomas_nodal.cc +++ b/deal.II/source/fe/fe_raviart_thomas_nodal.cc @@ -542,7 +542,7 @@ FE_RaviartThomasNodal::compare_for_face_domination ( template <> void FE_RaviartThomasNodal<1>::get_face_interpolation_matrix ( - const FiniteElement<1> &/*x_source_fe*/, + const FiniteElement<1,1> &/*x_source_fe*/, FullMatrix &/*interpolation_matrix*/) const { Assert (false, ExcImpossibleInDim(1)); @@ -552,7 +552,7 @@ FE_RaviartThomasNodal<1>::get_face_interpolation_matrix ( template <> void FE_RaviartThomasNodal<1>::get_subface_interpolation_matrix ( - const FiniteElement<1> &/*x_source_fe*/, + const FiniteElement<1,1> &/*x_source_fe*/, const unsigned int /*subface*/, FullMatrix &/*interpolation_matrix*/) const { -- 2.39.5