From 619ab794cb216069cd054fd78ddc7d73d37494f2 Mon Sep 17 00:00:00 2001 From: bangerth Date: Mon, 8 Dec 2008 19:18:38 +0000 Subject: [PATCH] Provide a few function stubs that are never called but that older compilers want to have a reference to (they're referenced from dead code and gcc 4.0 doesn't seem to eliminate it whereas newer versions of gcc appear to do). git-svn-id: https://svn.dealii.org/trunk@17893 0785d39b-7218-0410-832d-ea1e28bc413d --- .../include/dofs/dof_accessor.templates.h | 22 +++++++ .../include/multigrid/mg_dof_accessor.h | 60 +++++++++++++++++++ .../source/multigrid/mg_dof_accessor.cc | 23 ------- 3 files changed, 82 insertions(+), 23 deletions(-) diff --git a/deal.II/deal.II/include/dofs/dof_accessor.templates.h b/deal.II/deal.II/include/dofs/dof_accessor.templates.h index b38f3254c2..405128e5a9 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.templates.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.templates.h @@ -909,6 +909,28 @@ DoFCellAccessor (const Triangulation *tria, {} + +template +template +inline +DoFCellAccessor:: +DoFCellAccessor (const InvalidAccessor &) +{ + Assert (false, typename BaseClass::ExcInvalidObject()); +} + + + +template +template +inline +DoFCellAccessor:: +DoFCellAccessor (const DoFAccessor &) +{ + Assert (false, typename BaseClass::ExcInvalidObject()); +} + + template inline typename internal::DoFHandler::Iterators::cell_iterator diff --git a/deal.II/deal.II/include/multigrid/mg_dof_accessor.h b/deal.II/deal.II/include/multigrid/mg_dof_accessor.h index e7672173b3..c21365e841 100644 --- a/deal.II/deal.II/include/multigrid/mg_dof_accessor.h +++ b/deal.II/deal.II/include/multigrid/mg_dof_accessor.h @@ -394,6 +394,8 @@ template class MGDoFCellAccessor : public MGDoFAccessor { public: + typedef MGDoFAccessor BaseClass; + /** * Type of faces. */ @@ -561,6 +563,64 @@ class MGDoFCellAccessor : public MGDoFAccessor /*@}*/ +// ------------------- template and inline functions ------------- + +#ifndef DOXYGEN + +template +template +inline +MGDoFAccessor:: +MGDoFAccessor (const InvalidAccessor &) + : + BaseClass (0, -1, -1, 0) +{ + Assert (false, ExcInvalidObject()); +} + + + +template +template +inline +MGDoFAccessor:: +MGDoFAccessor (const MGDoFAccessor &) + : + BaseClass (0, -1, -1, 0) +{ + Assert (false, ExcInvalidObject()); +} + + + +template +template +inline +MGDoFCellAccessor:: +MGDoFCellAccessor (const InvalidAccessor &) + : + BaseClass (0, -1, -1, 0) +{ + Assert (false, typename BaseClass::ExcInvalidObject()); +} + + + +template +template +inline +MGDoFCellAccessor:: +MGDoFCellAccessor (const DoFAccessor &) + : + BaseClass (0, -1, -1, 0) +{ + Assert (false, typename BaseClass::ExcInvalidObject()); +} + + +#endif + + DEAL_II_NAMESPACE_CLOSE diff --git a/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc b/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc index f72032f54e..b24e32d30c 100644 --- a/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc +++ b/deal.II/deal.II/source/multigrid/mg_dof_accessor.cc @@ -53,29 +53,6 @@ MGDoFAccessor::MGDoFAccessor (const Triangulation -template -MGDoFAccessor:: -MGDoFAccessor (const InvalidAccessor &) - : - BaseClass (0, -1, -1, 0) -{ - Assert (false, ExcInvalidObject()); -} - - - -template -template -MGDoFAccessor:: -MGDoFAccessor (const MGDoFAccessor &) - : - BaseClass (0, -1, -1, 0) -{ - Assert (false, ExcInvalidObject()); -} - - template void -- 2.39.5