From 02bd5d0d668e57e6336ce51ebadeb2276b53b876 Mon Sep 17 00:00:00 2001 From: Ralf Hartmann Date: Mon, 13 Feb 2006 17:23:36 +0000 Subject: [PATCH] Make it compile with MIPSpro. git-svn-id: https://svn.dealii.org/trunk@12365 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/dofs/dof_accessor.h | 41 ++++++++++--------- .../include/dofs/dof_accessor.templates.h | 26 ++++++------ deal.II/deal.II/source/dofs/dof_accessor.cc | 2 +- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/deal.II/deal.II/include/dofs/dof_accessor.h b/deal.II/deal.II/include/dofs/dof_accessor.h index fd80003797..a2d406e402 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.h @@ -411,7 +411,7 @@ class DoFObjectAccessor : public DoFAccessor, * for hp DoF handlers, this may * change from cell to cell. */ - const FiniteElement & + const FiniteElement::dim> & get_fe () const; /** @@ -432,14 +432,14 @@ class DoFObjectAccessor : public DoFAccessor, * Pointer to the ith line * bounding this Object. */ - TriaIterator > + TriaIterator::dim,DoFObjectAccessor<1, DH> > line (const unsigned int i) const; /** * Pointer to the ith quad * bounding this Object. */ - TriaIterator > + TriaIterator::dim,DoFObjectAccessor<2, DH> > quad (const unsigned int i) const; /** @@ -449,7 +449,8 @@ class DoFObjectAccessor : public DoFAccessor, * class returns a hex accessor without * access to the DoF data. */ - TriaIterator > child (const unsigned int) const; + TriaIterator::dim,DoFObjectAccessor > + child (const unsigned int) const; /** * Distribute a local (cell @@ -729,7 +730,7 @@ class DoFObjectAccessor<1, DH> : * for hp DoF handlers, this may * change from cell to cell. */ - const FiniteElement & + const FiniteElement::dim> & get_fe () const; /** @@ -752,7 +753,8 @@ class DoFObjectAccessor<1, DH> : * class returns a line accessor without * access to the DoF data. */ - TriaIterator > child (const unsigned int) const; + TriaIterator::dim,DoFObjectAccessor<1,DH> > + child (const unsigned int) const; /** * Distribute a local (cell based) vector @@ -976,7 +978,7 @@ class DoFObjectAccessor<2, DH> : * for hp DoF handlers, this may * change from cell to cell. */ - const FiniteElement & + const FiniteElement::dim> & get_fe () const; /** @@ -996,7 +998,7 @@ class DoFObjectAccessor<2, DH> : * Return a pointer to the @p ith line * bounding this @p Quad. */ - TriaIterator > + TriaIterator::dim,DoFObjectAccessor<1, DH> > line (const unsigned int i) const; /** @@ -1006,7 +1008,7 @@ class DoFObjectAccessor<2, DH> : * class returns a quad accessor without * access to the DoF data. */ - TriaIterator > + TriaIterator::dim,DoFObjectAccessor<2, DH> > child (const unsigned int) const; /** @@ -1231,7 +1233,7 @@ class DoFObjectAccessor<3, DH> : * for hp DoF handlers, this may * change from cell to cell. */ - const FiniteElement & + const FiniteElement::dim> & get_fe () const; /** @@ -1251,14 +1253,14 @@ class DoFObjectAccessor<3, DH> : * Return a pointer to the @p ith line * bounding this @p Hex. */ - TriaIterator > + TriaIterator::dim,DoFObjectAccessor<1, DH> > line (const unsigned int i) const; /** * Return a pointer to the @p ith quad * bounding this @p Hex. */ - TriaIterator > + TriaIterator::dim,DoFObjectAccessor<2, DH> > quad (const unsigned int i) const; /** @@ -1268,7 +1270,8 @@ class DoFObjectAccessor<3, DH> : * class returns a hex accessor without * access to the DoF data. */ - TriaIterator > child (const unsigned int) const; + TriaIterator::dim,DoFObjectAccessor<3, DH> > + child (const unsigned int) const; /** * Distribute a local (cell @@ -1367,12 +1370,12 @@ class DoFCellAccessor : public DoFObjectAccessor * get passed from the iterator * classes. */ - typedef typename DoFObjectAccessor::AccessorData AccessorData; + typedef typename DoFObjectAccessor::AccessorData AccessorData; /** * Constructor */ - DoFCellAccessor (const Triangulation *tria, + DoFCellAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data); @@ -1386,7 +1389,7 @@ class DoFCellAccessor : public DoFObjectAccessor * without access to the DoF * data. */ - TriaIterator > + TriaIterator > neighbor (const unsigned int) const; /** @@ -1398,7 +1401,7 @@ class DoFCellAccessor : public DoFObjectAccessor * without access to the DoF * data. */ - TriaIterator > + TriaIterator > child (const unsigned int) const; /** @@ -1409,7 +1412,7 @@ class DoFCellAccessor : public DoFObjectAccessor * 1D, and maps to DoFObjectAccessor<2, * dim>::line in 2D. */ - TriaIterator > + TriaIterator > face (const unsigned int i) const; /** @@ -1423,7 +1426,7 @@ class DoFCellAccessor : public DoFObjectAccessor * access to the triangulation * data). */ - TriaIterator > + TriaIterator > neighbor_child_on_subface (const unsigned int face_no, const unsigned int subface_no) const; 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 2ef7c5a613..9ed714044b 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.templates.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.templates.h @@ -235,7 +235,7 @@ DoFObjectAccessor<1,DH>::get_dof_indices (std::vector &dof_indices template inline -TriaIterator > +TriaIterator::dim,DoFObjectAccessor<1,DH> > DoFObjectAccessor<1,DH>::child (const unsigned int i) const { TriaIterator > q (this->tria, @@ -254,7 +254,7 @@ DoFObjectAccessor<1,DH>::child (const unsigned int i) const template inline -const FiniteElement & +const FiniteElement::dim> & DoFObjectAccessor<1,DH>::get_fe () const { return *this->dof_handler->selected_fe; @@ -515,7 +515,7 @@ DoFObjectAccessor<2,DH>::get_dof_indices (std::vector &dof_indices template inline -TriaIterator > +TriaIterator::dim,DoFObjectAccessor<1,DH> > DoFObjectAccessor<2,DH>::line (const unsigned int i) const { Assert (i<4, ExcIndexRange (i, 0, 4)); @@ -532,7 +532,7 @@ DoFObjectAccessor<2,DH>::line (const unsigned int i) const template inline -TriaIterator > +TriaIterator::dim,DoFObjectAccessor<2,DH> > DoFObjectAccessor<2,DH>::child (const unsigned int i) const { TriaIterator > q (this->tria, @@ -550,7 +550,7 @@ DoFObjectAccessor<2,DH>::child (const unsigned int i) const template inline -const FiniteElement & +const FiniteElement::dim> & DoFObjectAccessor<2,DH>::get_fe () const { return *this->dof_handler->selected_fe; @@ -820,7 +820,7 @@ DoFObjectAccessor<3,DH>::get_dof_indices (std::vector &dof_indices template inline -TriaIterator > +TriaIterator::dim,DoFObjectAccessor<1,DH> > DoFObjectAccessor<3,DH>::line (const unsigned int i) const { TriaIterator > l = BaseClass::line(i); @@ -836,7 +836,7 @@ DoFObjectAccessor<3,DH>::line (const unsigned int i) const template inline -TriaIterator > +TriaIterator::dim,DoFObjectAccessor<2,DH> > DoFObjectAccessor<3,DH>::quad (const unsigned int i) const { Assert (i<6, ExcIndexRange (i, 0, 6)); @@ -853,7 +853,7 @@ DoFObjectAccessor<3,DH>::quad (const unsigned int i) const template inline -TriaIterator > +TriaIterator::dim,DoFObjectAccessor<3,DH> > DoFObjectAccessor<3,DH>::child (const unsigned int i) const { TriaIterator > q (this->tria, @@ -871,7 +871,7 @@ DoFObjectAccessor<3,DH>::child (const unsigned int i) const template inline -const FiniteElement & +const FiniteElement::dim> & DoFObjectAccessor<3,DH>::get_fe () const { return *this->dof_handler->selected_fe; @@ -1578,18 +1578,18 @@ DoFObjectAccessor<3,hp::DoFHandler<3> >::set_active_fe_index (const unsigned int template inline DoFCellAccessor:: -DoFCellAccessor (const Triangulation *tria, +DoFCellAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data) : - DoFObjectAccessor (tria,level,index,local_data) + DoFObjectAccessor (tria,level,index,local_data) {} template inline -TriaIterator > +TriaIterator::dim,DoFCellAccessor > DoFCellAccessor::neighbor (const unsigned int i) const { TriaIterator > q (this->tria, @@ -1607,7 +1607,7 @@ DoFCellAccessor::neighbor (const unsigned int i) const template inline -TriaIterator > +TriaIterator::dim,DoFCellAccessor > DoFCellAccessor::child (const unsigned int i) const { TriaIterator > q (this->tria, diff --git a/deal.II/deal.II/source/dofs/dof_accessor.cc b/deal.II/deal.II/source/dofs/dof_accessor.cc index a3f502d19b..e97a8eb9ad 100644 --- a/deal.II/deal.II/source/dofs/dof_accessor.cc +++ b/deal.II/deal.II/source/dofs/dof_accessor.cc @@ -460,7 +460,7 @@ DoFCellAccessor >::face (const unsigned int i) const template -TriaIterator > +TriaIterator::dim,DoFCellAccessor > DoFCellAccessor::neighbor_child_on_subface (const unsigned int face, const unsigned int subface) const { -- 2.39.5