]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Try something to possibly get gcc2.95 back into the boat.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 13 Feb 2006 07:01:30 +0000 (07:01 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 13 Feb 2006 07:01:30 +0000 (07:01 +0000)
git-svn-id: https://svn.dealii.org/trunk@12354 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/dofs/dof_iterator_selector.h

index 13db10f52371cee5393baaee203ea127bedecf2b..d4e825a1fa02b536f0187ea3473a2873627620e5 100644 (file)
@@ -56,9 +56,11 @@ namespace internal
   template <template <int> class DH>
   struct DoFIteratorSelector<DH<1> >
   {
-      typedef TriaRawIterator<1,DoFCellAccessor<DH<1> > >    raw_line_iterator;
-      typedef TriaIterator<1,DoFCellAccessor<DH<1> > >       line_iterator;
-      typedef TriaActiveIterator<1,DoFCellAccessor<DH<1> > > active_line_iterator;
+      typedef DH<1> DoFHandler_type;
+      
+      typedef TriaRawIterator<1,DoFCellAccessor<DoFHandler_type> >    raw_line_iterator;
+      typedef TriaIterator<1,DoFCellAccessor<DoFHandler_type> >       line_iterator;
+      typedef TriaActiveIterator<1,DoFCellAccessor<DoFHandler_type> > active_line_iterator;
       
       typedef void * raw_quad_iterator;
       typedef void * quad_iterator;
@@ -92,13 +94,15 @@ namespace internal
   template <template <int> class DH>
   struct DoFIteratorSelector<DH<2> >
   {
-      typedef TriaRawIterator<2,DoFObjectAccessor<1, DH<2> > >    raw_line_iterator;
-      typedef TriaIterator<2,DoFObjectAccessor<1, DH<2> > >       line_iterator;
-      typedef TriaActiveIterator<2,DoFObjectAccessor<1, DH<2> > > active_line_iterator;
+      typedef DH<2> DoFHandler_type;
+      
+      typedef TriaRawIterator<2,DoFObjectAccessor<1, DoFHandler_type> >    raw_line_iterator;
+      typedef TriaIterator<2,DoFObjectAccessor<1, DoFHandler_type> >       line_iterator;
+      typedef TriaActiveIterator<2,DoFObjectAccessor<1, DoFHandler_type> > active_line_iterator;
       
-      typedef TriaRawIterator<2,DoFCellAccessor<DH<2> > >         raw_quad_iterator;
-      typedef TriaIterator<2,DoFCellAccessor<DH<2> > >            quad_iterator;
-      typedef TriaActiveIterator<2,DoFCellAccessor<DH<2> > >      active_quad_iterator;
+      typedef TriaRawIterator<2,DoFCellAccessor<DoFHandler_type> >         raw_quad_iterator;
+      typedef TriaIterator<2,DoFCellAccessor<DoFHandler_type> >            quad_iterator;
+      typedef TriaActiveIterator<2,DoFCellAccessor<DoFHandler_type> >      active_quad_iterator;
       
       typedef void * raw_hex_iterator;
       typedef void * hex_iterator;
@@ -128,17 +132,19 @@ namespace internal
   template <template <int> class DH>
   struct DoFIteratorSelector<DH<3> >
   {
-      typedef TriaRawIterator<3,DoFObjectAccessor<1, DH<3> > >    raw_line_iterator;
-      typedef TriaIterator<3,DoFObjectAccessor<1, DH<3> > >       line_iterator;
-      typedef TriaActiveIterator<3,DoFObjectAccessor<1, DH<3> > > active_line_iterator;
+      typedef DH<3> DoFHandler_type;
+      
+      typedef TriaRawIterator<3,DoFObjectAccessor<1, DoFHandler_type> >    raw_line_iterator;
+      typedef TriaIterator<3,DoFObjectAccessor<1, DoFHandler_type> >       line_iterator;
+      typedef TriaActiveIterator<3,DoFObjectAccessor<1, DoFHandler_type> > active_line_iterator;
       
-      typedef TriaRawIterator<3,DoFObjectAccessor<2, DH<3> > >    raw_quad_iterator;
-      typedef TriaIterator<3,DoFObjectAccessor<2, DH<3> > >       quad_iterator;
-      typedef TriaActiveIterator<3,DoFObjectAccessor<2, DH<3> > > active_quad_iterator;
+      typedef TriaRawIterator<3,DoFObjectAccessor<2, DoFHandler_type> >    raw_quad_iterator;
+      typedef TriaIterator<3,DoFObjectAccessor<2, DoFHandler_type> >       quad_iterator;
+      typedef TriaActiveIterator<3,DoFObjectAccessor<2, DoFHandler_type> > active_quad_iterator;
       
-      typedef TriaRawIterator<3,DoFCellAccessor<DH<3> > >         raw_hex_iterator;
-      typedef TriaIterator<3,DoFCellAccessor<DH<3> > >            hex_iterator;
-      typedef TriaActiveIterator<3,DoFCellAccessor<DH<3> > >      active_hex_iterator;
+      typedef TriaRawIterator<3,DoFCellAccessor<DoFHandler_type> >         raw_hex_iterator;
+      typedef TriaIterator<3,DoFCellAccessor<DoFHandler_type> >            hex_iterator;
+      typedef TriaActiveIterator<3,DoFCellAccessor<DoFHandler_type> >      active_hex_iterator;
       
       typedef raw_hex_iterator    raw_cell_iterator;
       typedef hex_iterator        cell_iterator;

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.