From 0bd2dee40a18955cbc43db85888e6e886afdad51 Mon Sep 17 00:00:00 2001 From: nauber Date: Thu, 12 Aug 1999 12:55:55 +0000 Subject: [PATCH] Declare some missing typedefs and use them. git-svn-id: https://svn.dealii.org/trunk@1687 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/dofs/dof_accessor.h | 20 ++++++++++++++++++- .../include/dofs/dof_accessor.templates.h | 8 ++++---- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/deal.II/deal.II/include/dofs/dof_accessor.h b/deal.II/deal.II/include/dofs/dof_accessor.h index cbba6c55f9..f068cce28d 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.h @@ -247,7 +247,13 @@ class DoFObjectAccessor<1, dim> : public DoFAccessor, * iterator classes. */ typedef DoFHandler AccessorData; - + + /** + * Declare base class as a local typedef + * for simpler access. + */ + typedef typename DoFObjectAccessor_Inheritance<1,dim>::BaseClass BaseClass; + /** * Default constructor, unused thus * not implemented. @@ -364,6 +370,12 @@ class DoFObjectAccessor<2, dim> : public DoFAccessor, * iterator classes. */ typedef DoFHandler AccessorData; + + /** + * Declare base class as a local typedef + * for simpler access. + */ + typedef typename DoFObjectAccessor_Inheritance<2,dim>::BaseClass BaseClass; /** * Default constructor, unused thus @@ -492,6 +504,12 @@ class DoFObjectAccessor<3, dim> : public DoFAccessor, * iterator classes. */ typedef DoFHandler AccessorData; + + /** + * Declare base class as a local typedef + * for simpler access. + */ + typedef typename DoFObjectAccessor_Inheritance<3,dim>::BaseClass BaseClass; /** * Default constructor, unused thus 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 c094f6ab57..3142ec24cf 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.templates.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.templates.h @@ -100,7 +100,7 @@ template inline void DoFObjectAccessor<1, dim>::copy_from (const DoFObjectAccessor<1, dim> &a) { - DoFObjectAccessor_Inheritance<1,dim>::BaseClass::copy_from (a); + BaseClass::copy_from (a); set_dof_handler (a.dof_handler); }; @@ -209,7 +209,7 @@ template inline void DoFObjectAccessor<2, dim>::copy_from (const DoFObjectAccessor<2, dim> &a) { - DoFObjectAccessor_Inheritance<2,dim>::BaseClass::copy_from (a); + BaseClass::copy_from (a); set_dof_handler (a.dof_handler); }; @@ -289,7 +289,7 @@ template inline TriaIterator > DoFObjectAccessor<3, dim>::line (const unsigned int i) const { - TriaIterator > l = DoFObjectAccessor_Inheritance<3,dim>::BaseClass::line(i); + TriaIterator > l = BaseClass::line(i); return TriaIterator > ( tria, @@ -338,7 +338,7 @@ DoFObjectAccessor<3, dim>::child (const unsigned int i) const { template void DoFObjectAccessor<3, dim>::copy_from (const DoFObjectAccessor<3, dim> &a) { - DoFObjectAccessor_Inheritance<3,dim>::BaseClass::copy_from (a); + BaseClass::copy_from (a); set_dof_handler (a.dof_handler); }; -- 2.39.5