From: Wolfgang Bangerth Date: Mon, 13 Feb 2006 22:31:01 +0000 (+0000) Subject: Revert Ralf's patches back to this state: X-Git-Tag: v8.0.0~12313 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce0ef2bb3f9332f5acf834bc17eaaeade01c0f36;p=dealii.git Revert Ralf's patches back to this state: =================================================================== File: dof_accessor.h Status: Up-to-date Working revision: 1.83 Repository revision: 1.83 /home/people/cvs/deal/deal.II/deal.II/include/dofs/dof_accessor.h,v Sticky Tag: 1.83 Sticky Date: (none) Sticky Options: (none) =================================================================== File: dof_accessor.templates.h Status: Up-to-date Working revision: 1.41 Repository revision: 1.41 /home/people/cvs/deal/deal.II/deal.II/include/dofs/dof_accessor.templates.h,v Sticky Tag: 1.41 Sticky Date: (none) Sticky Options: (none) =================================================================== File: dof_accessor.cc Status: Up-to-date Working revision: 1.88 Repository revision: 1.88 /home/people/cvs/deal/deal.II/deal.II/source/dofs/dof_accessor.cc,v Sticky Tag: 1.88 Sticky Date: (none) Sticky Options: (none) All these changes were meant to work around limitations in the MIPSPro compiler, but we run afoul of PR26261 in gcc. See here for more information on this bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=26261 Unfortunately, while Ralf's changes made things work with gcc3.4.x, gcc3.3 apparently is even more broken in this respect that just 26261 reveals. git-svn-id: https://svn.dealii.org/trunk@12369 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/dofs/dof_accessor.h b/deal.II/deal.II/include/dofs/dof_accessor.h index 27aef51918..9302b344e1 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::dim> & + const FiniteElement & get_fe () const; /** @@ -432,14 +432,14 @@ class DoFObjectAccessor : public DoFAccessor, * Pointer to the ith line * bounding this Object. */ - TriaIterator::dim,DoFObjectAccessor<1, DH> > + TriaIterator > line (const unsigned int i) const; /** * Pointer to the ith quad * bounding this Object. */ - TriaIterator::dim,DoFObjectAccessor<2, DH> > + TriaIterator > quad (const unsigned int i) const; /** @@ -449,8 +449,7 @@ class DoFObjectAccessor : public DoFAccessor, * class returns a hex accessor without * access to the DoF data. */ - TriaIterator::dim,DoFObjectAccessor > - child (const unsigned int) const; + TriaIterator > child (const unsigned int) const; /** * Distribute a local (cell @@ -609,7 +608,7 @@ class DoFObjectAccessor<1, DH> : * argument is assumed to be a pointer * to a DoFHandler object. */ - DoFObjectAccessor (const Triangulation *tria, + DoFObjectAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data); @@ -730,7 +729,7 @@ class DoFObjectAccessor<1, DH> : * for hp DoF handlers, this may * change from cell to cell. */ - const FiniteElement::dim> & + const FiniteElement & get_fe () const; /** @@ -753,8 +752,7 @@ class DoFObjectAccessor<1, DH> : * class returns a line accessor without * access to the DoF data. */ - TriaIterator::dim,DoFObjectAccessor<1,DH> > - child (const unsigned int) const; + TriaIterator > child (const unsigned int) const; /** * Distribute a local (cell based) vector @@ -856,7 +854,7 @@ class DoFObjectAccessor<2, DH> : * argument is assumed to be a pointer * to a DoFHandler object. */ - DoFObjectAccessor (const Triangulation *tria, + DoFObjectAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data); @@ -978,7 +976,7 @@ class DoFObjectAccessor<2, DH> : * for hp DoF handlers, this may * change from cell to cell. */ - const FiniteElement::dim> & + const FiniteElement & get_fe () const; /** @@ -998,7 +996,7 @@ class DoFObjectAccessor<2, DH> : * Return a pointer to the @p ith line * bounding this @p Quad. */ - TriaIterator::dim,DoFObjectAccessor<1, DH> > + TriaIterator > line (const unsigned int i) const; /** @@ -1008,7 +1006,7 @@ class DoFObjectAccessor<2, DH> : * class returns a quad accessor without * access to the DoF data. */ - TriaIterator::dim,DoFObjectAccessor<2, DH> > + TriaIterator > child (const unsigned int) const; /** @@ -1111,7 +1109,7 @@ class DoFObjectAccessor<3, DH> : * argument is assumed to be a pointer * to a DoFHandler object. */ - DoFObjectAccessor (const Triangulation *tria, + DoFObjectAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data); @@ -1233,7 +1231,7 @@ class DoFObjectAccessor<3, DH> : * for hp DoF handlers, this may * change from cell to cell. */ - const FiniteElement::dim> & + const FiniteElement & get_fe () const; /** @@ -1253,14 +1251,14 @@ class DoFObjectAccessor<3, DH> : * Return a pointer to the @p ith line * bounding this @p Hex. */ - TriaIterator::dim,DoFObjectAccessor<1, DH> > + TriaIterator > line (const unsigned int i) const; /** * Return a pointer to the @p ith quad * bounding this @p Hex. */ - TriaIterator::dim,DoFObjectAccessor<2, DH> > + TriaIterator > quad (const unsigned int i) const; /** @@ -1270,8 +1268,7 @@ class DoFObjectAccessor<3, DH> : * class returns a hex accessor without * access to the DoF data. */ - TriaIterator::dim,DoFObjectAccessor<3, DH> > - child (const unsigned int) const; + TriaIterator > child (const unsigned int) const; /** * Distribute a local (cell @@ -1370,12 +1367,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); @@ -1389,7 +1386,7 @@ class DoFCellAccessor : public DoFObjectAccessor * without access to the DoF * data. */ - TriaIterator::dim,DoFCellAccessor > + TriaIterator > neighbor (const unsigned int) const; /** @@ -1401,7 +1398,7 @@ class DoFCellAccessor : public DoFObjectAccessor * without access to the DoF * data. */ - TriaIterator::dim,DoFCellAccessor > + TriaIterator > child (const unsigned int) const; /** @@ -1412,7 +1409,7 @@ class DoFCellAccessor : public DoFObjectAccessor * 1D, and maps to DoFObjectAccessor<2, * dim>::line in 2D. */ - TriaIterator > + TriaIterator > face (const unsigned int i) const; /** @@ -1426,7 +1423,7 @@ class DoFCellAccessor : public DoFObjectAccessor * access to the triangulation * data). */ - TriaIterator::dim,DoFCellAccessor > + 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 9ed714044b..ff22b3b0a7 100644 --- a/deal.II/deal.II/include/dofs/dof_accessor.templates.h +++ b/deal.II/deal.II/include/dofs/dof_accessor.templates.h @@ -115,15 +115,15 @@ DoFAccessor::operator != (const DoFAccessor &a) const template inline DoFObjectAccessor<1,DH>:: -DoFObjectAccessor (const Triangulation *tria, +DoFObjectAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data) : DoFAccessor (local_data), - DoFObjectAccessor_Inheritance<1,dim>::BaseClass (tria, - level, - index) + DoFObjectAccessor_Inheritance<1,DH::dimension>::BaseClass (tria, + level, + index) {} @@ -235,7 +235,7 @@ DoFObjectAccessor<1,DH>::get_dof_indices (std::vector &dof_indices template inline -TriaIterator::dim,DoFObjectAccessor<1,DH> > +TriaIterator > 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::dim> & +const FiniteElement & DoFObjectAccessor<1,DH>::get_fe () const { return *this->dof_handler->selected_fe; @@ -410,7 +410,7 @@ DoFObjectAccessor<1,DH>::operator != (const DoFObjectAccessor<1,DH> &a) const template DoFObjectAccessor<2,DH>:: -DoFObjectAccessor (const Triangulation *tria, +DoFObjectAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data) @@ -515,7 +515,7 @@ DoFObjectAccessor<2,DH>::get_dof_indices (std::vector &dof_indices template inline -TriaIterator::dim,DoFObjectAccessor<1,DH> > +TriaIterator > 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::dim,DoFObjectAccessor<2,DH> > +TriaIterator > 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::dim> & +const FiniteElement & DoFObjectAccessor<2,DH>::get_fe () const { return *this->dof_handler->selected_fe; @@ -711,7 +711,7 @@ DoFObjectAccessor<2,DH>::operator != (const DoFObjectAccessor<2,DH> &a) const template inline DoFObjectAccessor<3,DH>:: -DoFObjectAccessor (const Triangulation *tria, +DoFObjectAccessor (const Triangulation *tria, const int level, const int index, const AccessorData *local_data) @@ -820,7 +820,7 @@ DoFObjectAccessor<3,DH>::get_dof_indices (std::vector &dof_indices template inline -TriaIterator::dim,DoFObjectAccessor<1,DH> > +TriaIterator > 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::dim,DoFObjectAccessor<2,DH> > +TriaIterator > 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::dim,DoFObjectAccessor<3,DH> > +TriaIterator > 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::dim> & +const FiniteElement & 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::dim,DoFCellAccessor > +TriaIterator > 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::dim,DoFCellAccessor > +TriaIterator > 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 e97a8eb9ad..a3f502d19b 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::dim,DoFCellAccessor > +TriaIterator > DoFCellAccessor::neighbor_child_on_subface (const unsigned int face, const unsigned int subface) const {