]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Revert Ralf's patches back to this state:
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 13 Feb 2006 22:31:01 +0000 (22:31 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 13 Feb 2006 22:31:01 +0000 (22:31 +0000)
===================================================================
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

deal.II/deal.II/include/dofs/dof_accessor.h
deal.II/deal.II/include/dofs/dof_accessor.templates.h
deal.II/deal.II/source/dofs/dof_accessor.cc

index 27aef51918e16cd407b020b2fe35a374296c2aef..9302b344e18adf57db9b88d4535e937826de764a 100644 (file)
@@ -411,7 +411,7 @@ class DoFObjectAccessor : public DoFAccessor<DH>,
                                       * for hp DoF handlers, this may
                                       * change from cell to cell.
                                       */
-    const FiniteElement<DoFObjectAccessor<celldim,DH>::dim> &
+    const FiniteElement<dim> &
     get_fe () const;
     
                                      /**
@@ -432,14 +432,14 @@ class DoFObjectAccessor : public DoFAccessor<DH>,
                                      *  Pointer to the <i>i</i>th line
                                      *  bounding this Object.
                                      */
-    TriaIterator<DoFObjectAccessor<celldim,DH>::dim,DoFObjectAccessor<1, DH> >
+    TriaIterator<dim,DoFObjectAccessor<1, DH> >
     line (const unsigned int i) const;
 
                                     /**
                                      *  Pointer to the <i>i</i>th quad
                                      *  bounding this Object.
                                      */
-    TriaIterator<DoFObjectAccessor<celldim,DH>::dim,DoFObjectAccessor<2, DH> >
+    TriaIterator<dim,DoFObjectAccessor<2, DH> >
     quad (const unsigned int i) const;
     
                                     /**
@@ -449,8 +449,7 @@ class DoFObjectAccessor : public DoFAccessor<DH>,
                                      * class returns a hex accessor without
                                      * access to the DoF data.
                                      */
-    TriaIterator<DoFObjectAccessor<celldim,DH>::dim,DoFObjectAccessor<celldim, DH> >
-    child (const unsigned int) const;
+    TriaIterator<dim,DoFObjectAccessor<celldim, DH> > 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<dim> *tria,
+    DoFObjectAccessor (const Triangulation<DH::dimension> *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<DoFObjectAccessor<1,DH>::dim> &
+    const FiniteElement<DH::dimension> &
     get_fe () const;
     
                                      /**
@@ -753,8 +752,7 @@ class DoFObjectAccessor<1, DH> :
                                      * class returns a line accessor without
                                      * access to the DoF data.
                                      */
-    TriaIterator<DoFObjectAccessor<1,DH>::dim,DoFObjectAccessor<1,DH> >
-    child (const unsigned int) const;
+    TriaIterator<DH::dimension,DoFObjectAccessor<1,DH> > 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<dim> *tria,
+    DoFObjectAccessor (const Triangulation<DH::dimension> *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<DoFObjectAccessor<2,DH>::dim> &
+    const FiniteElement<DH::dimension> &
     get_fe () const;
     
                                      /**
@@ -998,7 +996,7 @@ class DoFObjectAccessor<2, DH> :
                                      *  Return a pointer to the @p ith line
                                      *  bounding this @p Quad.
                                      */
-    TriaIterator<DoFObjectAccessor<2,DH>::dim,DoFObjectAccessor<1, DH> >
+    TriaIterator<DH::dimension,DoFObjectAccessor<1, DH> >
     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<DoFObjectAccessor<2,DH>::dim,DoFObjectAccessor<2, DH> >
+    TriaIterator<DH::dimension,DoFObjectAccessor<2, DH> >
     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<dim> *tria,
+    DoFObjectAccessor (const Triangulation<DH::dimension> *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<DoFObjectAccessor<3, DH>::dim> &
+    const FiniteElement<DH::dimension> &
     get_fe () const;
 
                                      /**
@@ -1253,14 +1251,14 @@ class DoFObjectAccessor<3, DH> :
                                      *  Return a pointer to the @p ith line
                                      *  bounding this @p Hex.
                                      */
-    TriaIterator<DoFObjectAccessor<3, DH>::dim,DoFObjectAccessor<1, DH> >
+    TriaIterator<DH::dimension,DoFObjectAccessor<1, DH> >
     line (const unsigned int i) const;
 
                                     /**
                                      *  Return a pointer to the @p ith quad
                                      *  bounding this @p Hex.
                                      */
-    TriaIterator<DoFObjectAccessor<3, DH>::dim,DoFObjectAccessor<2, DH> >
+    TriaIterator<DH::dimension,DoFObjectAccessor<2, DH> >
     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<DoFObjectAccessor<3, DH>::dim,DoFObjectAccessor<3, DH> >
-    child (const unsigned int) const;
+    TriaIterator<DH::dimension,DoFObjectAccessor<3, DH> > child (const unsigned int) const;
 
                                     /**
                                      * Distribute a local (cell
@@ -1370,12 +1367,12 @@ class DoFCellAccessor :  public DoFObjectAccessor<DH::dimension,DH>
                                      * get passed from the iterator
                                      * classes.
                                      */
-    typedef typename DoFObjectAccessor<dim,DH>::AccessorData AccessorData;
+    typedef typename DoFObjectAccessor<DH::dimension,DH>::AccessorData AccessorData;
     
                                     /**
                                      * Constructor
                                      */
-    DoFCellAccessor (const Triangulation<dim> *tria,
+    DoFCellAccessor (const Triangulation<DH::dimension> *tria,
                     const int                 level,
                     const int                 index,
                     const AccessorData       *local_data);
@@ -1389,7 +1386,7 @@ class DoFCellAccessor :  public DoFObjectAccessor<DH::dimension,DH>
                                      * without access to the DoF
                                      * data.
                                      */
-    TriaIterator<DoFCellAccessor<DH>::dim,DoFCellAccessor<DH> >
+    TriaIterator<DH::dimension,DoFCellAccessor<DH> >
     neighbor (const unsigned int) const;
 
                                     /**
@@ -1401,7 +1398,7 @@ class DoFCellAccessor :  public DoFObjectAccessor<DH::dimension,DH>
                                      * without access to the DoF
                                      * data.
                                      */
-    TriaIterator<DoFCellAccessor<DH>::dim,DoFCellAccessor<DH> >
+    TriaIterator<DH::dimension,DoFCellAccessor<DH> >
     child (const unsigned int) const;
 
                                     /**
@@ -1412,7 +1409,7 @@ class DoFCellAccessor :  public DoFObjectAccessor<DH::dimension,DH>
                                      * 1D, and maps to DoFObjectAccessor<2,
                                      * dim>::line in 2D.
                                      */
-    TriaIterator<dim, DoFObjectAccessor<dim-1, DH> >
+    TriaIterator<DH::dimension, DoFObjectAccessor<dim-1, DH> >
     face (const unsigned int i) const;
 
                                      /**
@@ -1426,7 +1423,7 @@ class DoFCellAccessor :  public DoFObjectAccessor<DH::dimension,DH>
                                      * access to the triangulation
                                      * data).
                                      */
-    TriaIterator<DoFCellAccessor<DH>::dim,DoFCellAccessor<DH> >
+    TriaIterator<DH::dimension,DoFCellAccessor<DH> >
     neighbor_child_on_subface (const unsigned int face_no,
                                const unsigned int subface_no) const;
 
index 9ed714044ba06c41b01f5883652075c532553fc0..ff22b3b0a79471bd6093d5fdb8de02f69ae8e903 100644 (file)
@@ -115,15 +115,15 @@ DoFAccessor<DH>::operator != (const DoFAccessor<DH> &a) const
 template <class DH>
 inline
 DoFObjectAccessor<1,DH>::
-DoFObjectAccessor (const Triangulation<dim> *tria,
+DoFObjectAccessor (const Triangulation<DH::dimension> *tria,
                    const int                 level,
                    const int                 index,
                    const AccessorData       *local_data)
                 :
                 DoFAccessor<DH> (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<unsigned int> &dof_indices
 
 template <class DH>
 inline
-TriaIterator<DoFObjectAccessor<1,DH>::dim,DoFObjectAccessor<1,DH> >
+TriaIterator<DH::dimension,DoFObjectAccessor<1,DH> >
 DoFObjectAccessor<1,DH>::child (const unsigned int i) const
 {
   TriaIterator<dim,DoFObjectAccessor<1,DH> > q (this->tria,
@@ -254,7 +254,7 @@ DoFObjectAccessor<1,DH>::child (const unsigned int i) const
 
 template <class DH>
 inline
-const FiniteElement<DoFObjectAccessor<1,DH>::dim> &
+const FiniteElement<DH::dimension> &
 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 <class DH>
 DoFObjectAccessor<2,DH>::
-DoFObjectAccessor (const Triangulation<dim> *tria,
+DoFObjectAccessor (const Triangulation<DH::dimension> *tria,
                    const int                 level,
                    const int                 index,
                    const AccessorData       *local_data)
@@ -515,7 +515,7 @@ DoFObjectAccessor<2,DH>::get_dof_indices (std::vector<unsigned int> &dof_indices
 
 template <class DH>
 inline
-TriaIterator<DoFObjectAccessor<2,DH>::dim,DoFObjectAccessor<1,DH> >
+TriaIterator<DH::dimension,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 <class DH>
 inline
-TriaIterator<DoFObjectAccessor<2,DH>::dim,DoFObjectAccessor<2,DH> >
+TriaIterator<DH::dimension,DoFObjectAccessor<2,DH> >
 DoFObjectAccessor<2,DH>::child (const unsigned int i) const
 {
   TriaIterator<dim,DoFObjectAccessor<2,DH> > q (this->tria,
@@ -550,7 +550,7 @@ DoFObjectAccessor<2,DH>::child (const unsigned int i) const
 
 template <class DH>
 inline
-const FiniteElement<DoFObjectAccessor<2,DH>::dim> &
+const FiniteElement<DH::dimension> &
 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 <class DH>
 inline
 DoFObjectAccessor<3,DH>::
-DoFObjectAccessor (const Triangulation<dim> *tria,
+DoFObjectAccessor (const Triangulation<DH::dimension> *tria,
                    const int                 level,
                    const int                 index,
                    const AccessorData       *local_data)
@@ -820,7 +820,7 @@ DoFObjectAccessor<3,DH>::get_dof_indices (std::vector<unsigned int> &dof_indices
 
 template <class DH>
 inline
-TriaIterator<DoFObjectAccessor<3,DH>::dim,DoFObjectAccessor<1,DH> >
+TriaIterator<DH::dimension,DoFObjectAccessor<1,DH> >
 DoFObjectAccessor<3,DH>::line (const unsigned int i) const
 {
   TriaIterator<dim,TriaObjectAccessor<1,dim> > l = BaseClass::line(i);
@@ -836,7 +836,7 @@ DoFObjectAccessor<3,DH>::line (const unsigned int i) const
 
 template <class DH>
 inline
-TriaIterator<DoFObjectAccessor<3,DH>::dim,DoFObjectAccessor<2,DH> >
+TriaIterator<DH::dimension,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 <class DH>
 inline
-TriaIterator<DoFObjectAccessor<3,DH>::dim,DoFObjectAccessor<3,DH> >
+TriaIterator<DH::dimension,DoFObjectAccessor<3,DH> >
 DoFObjectAccessor<3,DH>::child (const unsigned int i) const
 {
   TriaIterator<dim,DoFObjectAccessor<3,DH> > q (this->tria,
@@ -871,7 +871,7 @@ DoFObjectAccessor<3,DH>::child (const unsigned int i) const
 
 template <class DH>
 inline
-const FiniteElement<DoFObjectAccessor<3,DH>::dim> &
+const FiniteElement<DH::dimension> &
 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 <class DH>
 inline
 DoFCellAccessor<DH>::
-DoFCellAccessor (const Triangulation<dim> *tria,
+DoFCellAccessor (const Triangulation<DH::dimension> *tria,
                  const int                 level,
                  const int                 index,
                  const AccessorData       *local_data)
                 :
-                DoFObjectAccessor<dim,DH> (tria,level,index,local_data)
+                DoFObjectAccessor<DH::dimension,DH> (tria,level,index,local_data)
 {}
 
 
 template <class DH>
 inline
-TriaIterator<DoFCellAccessor<DH>::dim,DoFCellAccessor<DH> >
+TriaIterator<DH::dimension,DoFCellAccessor<DH> >
 DoFCellAccessor<DH>::neighbor (const unsigned int i) const
 {
   TriaIterator<dim,DoFCellAccessor<DH> > q (this->tria,
@@ -1607,7 +1607,7 @@ DoFCellAccessor<DH>::neighbor (const unsigned int i) const
 
 template <class DH>
 inline
-TriaIterator<DoFCellAccessor<DH>::dim,DoFCellAccessor<DH> >
+TriaIterator<DH::dimension,DoFCellAccessor<DH> >
 DoFCellAccessor<DH>::child (const unsigned int i) const
 {
   TriaIterator<dim,DoFCellAccessor<DH> > q (this->tria,
index e97a8eb9ad3011e7d5aacb1a743c4e3d78467f08..a3f502d19b85b9219313f65c643a6fccec98f5cb 100644 (file)
@@ -460,7 +460,7 @@ DoFCellAccessor<DoFHandler<3> >::face (const unsigned int i) const
 
 
 template <class DH>
-TriaIterator<DoFCellAccessor<DH>::dim,DoFCellAccessor<DH> >
+TriaIterator<DH::dimension,DoFCellAccessor<DH> >
 DoFCellAccessor<DH>::neighbor_child_on_subface (const unsigned int face,
                                                const unsigned int subface) const
 {

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.