]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Qualify names to avoid ambiguity with namespace of same name.
authorMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Thu, 5 Nov 2009 19:17:35 +0000 (19:17 +0000)
committerMartin Kronbichler <kronbichler@lnm.mw.tum.de>
Thu, 5 Nov 2009 19:17:35 +0000 (19:17 +0000)
git-svn-id: https://svn.dealii.org/trunk@20034 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/include/dofs/dof_iterator_selector.h
deal.II/deal.II/include/grid/tria_iterator_selector.h
deal.II/deal.II/include/multigrid/mg_dof_iterator_selector.h

index 807b19bdadabdabce729fb0b9cf4befe265876ba..56d47586d0c682379c20518f0c9d1f3cfce9dbd6 100644 (file)
@@ -54,9 +54,9 @@ namespace internal
     {
         typedef DH<1,spacedim> DoFHandler_type;
     
-        typedef TriaRawIterator<DoFCellAccessor<DoFHandler_type> >    raw_line_iterator;
-        typedef TriaIterator<DoFCellAccessor<DoFHandler_type> >       line_iterator;
-        typedef TriaActiveIterator<DoFCellAccessor<DoFHandler_type> > active_line_iterator;
+        typedef TriaRawIterator<dealii::DoFCellAccessor<DoFHandler_type> >    raw_line_iterator;
+        typedef TriaIterator<dealii::DoFCellAccessor<DoFHandler_type> >       line_iterator;
+        typedef TriaActiveIterator<dealii::DoFCellAccessor<DoFHandler_type> > active_line_iterator;
     
         typedef TriaRawIterator   <InvalidAccessor<2,1,spacedim> > raw_quad_iterator;
         typedef TriaIterator      <InvalidAccessor<2,1,spacedim> > quad_iterator;
@@ -93,13 +93,13 @@ namespace internal
     {
         typedef DH<2,spacedim> DoFHandler_type;
     
-        typedef TriaRawIterator<DoFAccessor<1, DoFHandler_type> >    raw_line_iterator;
-        typedef TriaIterator<DoFAccessor<1, DoFHandler_type> >       line_iterator;
-        typedef TriaActiveIterator<DoFAccessor<1, DoFHandler_type> > active_line_iterator;
+        typedef TriaRawIterator<dealii::DoFAccessor<1, DoFHandler_type> >    raw_line_iterator;
+        typedef TriaIterator<dealii::DoFAccessor<1, DoFHandler_type> >       line_iterator;
+        typedef TriaActiveIterator<dealii::DoFAccessor<1, DoFHandler_type> > active_line_iterator;
     
-        typedef TriaRawIterator<DoFCellAccessor<DoFHandler_type> >         raw_quad_iterator;
-        typedef TriaIterator<DoFCellAccessor<DoFHandler_type> >            quad_iterator;
-        typedef TriaActiveIterator<DoFCellAccessor<DoFHandler_type> >      active_quad_iterator;
+        typedef TriaRawIterator<dealii::DoFCellAccessor<DoFHandler_type> >         raw_quad_iterator;
+        typedef TriaIterator<dealii::DoFCellAccessor<DoFHandler_type> >            quad_iterator;
+        typedef TriaActiveIterator<dealii::DoFCellAccessor<DoFHandler_type> >      active_quad_iterator;
     
         typedef TriaRawIterator   <InvalidAccessor<3,2,spacedim> > raw_hex_iterator;
         typedef TriaIterator      <InvalidAccessor<3,2,spacedim> > hex_iterator;
@@ -132,17 +132,17 @@ namespace internal
     {
         typedef DH<3, spacedim> DoFHandler_type;
       
-        typedef TriaRawIterator<DoFAccessor<1, DoFHandler_type> >    raw_line_iterator;
-        typedef TriaIterator<DoFAccessor<1, DoFHandler_type> >       line_iterator;
-        typedef TriaActiveIterator<DoFAccessor<1, DoFHandler_type> > active_line_iterator;
+        typedef TriaRawIterator<dealii::DoFAccessor<1, DoFHandler_type> >    raw_line_iterator;
+        typedef TriaIterator<dealii::DoFAccessor<1, DoFHandler_type> >       line_iterator;
+        typedef TriaActiveIterator<dealii::DoFAccessor<1, DoFHandler_type> > active_line_iterator;
       
-        typedef TriaRawIterator<DoFAccessor<2, DoFHandler_type> >    raw_quad_iterator;
-        typedef TriaIterator<DoFAccessor<2, DoFHandler_type> >       quad_iterator;
-        typedef TriaActiveIterator<DoFAccessor<2, DoFHandler_type> > active_quad_iterator;
+        typedef TriaRawIterator<dealii::DoFAccessor<2, DoFHandler_type> >    raw_quad_iterator;
+        typedef TriaIterator<dealii::DoFAccessor<2, DoFHandler_type> >       quad_iterator;
+        typedef TriaActiveIterator<dealii::DoFAccessor<2, DoFHandler_type> > active_quad_iterator;
       
-        typedef TriaRawIterator<DoFCellAccessor<DoFHandler_type> >         raw_hex_iterator;
-        typedef TriaIterator<DoFCellAccessor<DoFHandler_type> >            hex_iterator;
-        typedef TriaActiveIterator<DoFCellAccessor<DoFHandler_type> >      active_hex_iterator;
+        typedef TriaRawIterator<dealii::DoFCellAccessor<DoFHandler_type> >         raw_hex_iterator;
+        typedef TriaIterator<dealii::DoFCellAccessor<DoFHandler_type> >            hex_iterator;
+        typedef TriaActiveIterator<dealii::DoFCellAccessor<DoFHandler_type> >      active_hex_iterator;
       
         typedef raw_hex_iterator    raw_cell_iterator;
         typedef hex_iterator        cell_iterator;
index 6319878ae2a250013961a0e69c013f888d397260..7885d63ec7fde7dbefa6761af878bd4bb3d4887f 100644 (file)
@@ -67,9 +67,9 @@ namespace internal
     template <int spacedim>
     struct Iterators<1,spacedim>
     {
-        typedef TriaRawIterator   <CellAccessor<1,spacedim> > raw_line_iterator;
-        typedef TriaIterator      <CellAccessor<1,spacedim> > line_iterator;
-        typedef TriaActiveIterator<CellAccessor<1,spacedim> > active_line_iterator;
+        typedef TriaRawIterator   <dealii::CellAccessor<1,spacedim> > raw_line_iterator;
+        typedef TriaIterator      <dealii::CellAccessor<1,spacedim> > line_iterator;
+        typedef TriaActiveIterator<dealii::CellAccessor<1,spacedim> > active_line_iterator;
 
         typedef TriaRawIterator   <InvalidAccessor<2,1,spacedim> > raw_quad_iterator;
         typedef TriaIterator      <InvalidAccessor<2,1,spacedim> > quad_iterator;
@@ -128,13 +128,13 @@ namespace internal
     template <int spacedim>
     struct Iterators<2,spacedim>
     {
-        typedef TriaRawIterator   <TriaAccessor<1, 2, spacedim> > raw_line_iterator;
-        typedef TriaIterator      <TriaAccessor<1, 2, spacedim> > line_iterator;
-        typedef TriaActiveIterator<TriaAccessor<1, 2, spacedim> > active_line_iterator;
+        typedef TriaRawIterator   <dealii::TriaAccessor<1, 2, spacedim> > raw_line_iterator;
+        typedef TriaIterator      <dealii::TriaAccessor<1, 2, spacedim> > line_iterator;
+        typedef TriaActiveIterator<dealii::TriaAccessor<1, 2, spacedim> > active_line_iterator;
     
-        typedef TriaRawIterator   <CellAccessor<2, spacedim> > raw_quad_iterator;
-        typedef TriaIterator      <CellAccessor<2, spacedim> > quad_iterator;
-        typedef TriaActiveIterator<CellAccessor<2, spacedim> > active_quad_iterator;
+        typedef TriaRawIterator   <dealii::CellAccessor<2, spacedim> > raw_quad_iterator;
+        typedef TriaIterator      <dealii::CellAccessor<2, spacedim> > quad_iterator;
+        typedef TriaActiveIterator<dealii::CellAccessor<2, spacedim> > active_quad_iterator;
 
         typedef TriaRawIterator   <InvalidAccessor<3,2,spacedim> > raw_hex_iterator;
         typedef TriaIterator      <InvalidAccessor<3,2,spacedim> > hex_iterator;
@@ -173,17 +173,17 @@ namespace internal
     template <int spacedim>
     struct Iterators<3,spacedim>
     {
-        typedef TriaRawIterator   <TriaAccessor<1, 3, spacedim> > raw_line_iterator;
-        typedef TriaIterator      <TriaAccessor<1, 3, spacedim> > line_iterator;
-        typedef TriaActiveIterator<TriaAccessor<1, 3, spacedim> > active_line_iterator;
+        typedef TriaRawIterator   <dealii::TriaAccessor<1, 3, spacedim> > raw_line_iterator;
+        typedef TriaIterator      <dealii::TriaAccessor<1, 3, spacedim> > line_iterator;
+        typedef TriaActiveIterator<dealii::TriaAccessor<1, 3, spacedim> > active_line_iterator;
     
-        typedef TriaRawIterator   <TriaAccessor<2, 3, spacedim> > raw_quad_iterator;
-        typedef TriaIterator      <TriaAccessor<2, 3, spacedim> > quad_iterator;
-        typedef TriaActiveIterator<TriaAccessor<2, 3, spacedim> > active_quad_iterator;
+        typedef TriaRawIterator   <dealii::TriaAccessor<2, 3, spacedim> > raw_quad_iterator;
+        typedef TriaIterator      <dealii::TriaAccessor<2, 3, spacedim> > quad_iterator;
+        typedef TriaActiveIterator<dealii::TriaAccessor<2, 3, spacedim> > active_quad_iterator;
 
-        typedef TriaRawIterator   <CellAccessor<3, spacedim> > raw_hex_iterator;
-        typedef TriaIterator      <CellAccessor<3, spacedim> > hex_iterator;
-        typedef TriaActiveIterator<CellAccessor<3, spacedim> > active_hex_iterator;
+        typedef TriaRawIterator   <dealii::CellAccessor<3, spacedim> > raw_hex_iterator;
+        typedef TriaIterator      <dealii::CellAccessor<3, spacedim> > hex_iterator;
+        typedef TriaActiveIterator<dealii::CellAccessor<3, spacedim> > active_hex_iterator;
 
         typedef raw_hex_iterator    raw_cell_iterator;
         typedef hex_iterator        cell_iterator;
index 6a3038c05a9ac67e6e837dced557689c608d19fa..9fca49c2a1950130a5198f3a0686d4e6244ddbd7 100644 (file)
@@ -47,9 +47,9 @@ namespace internal
     class Iterators<1,spacedim>
     {
       public:
-        typedef TriaRawIterator<MGDoFCellAccessor<1,spacedim> >    raw_line_iterator;
-        typedef TriaIterator<MGDoFCellAccessor<1,spacedim> >       line_iterator;
-        typedef TriaActiveIterator<MGDoFCellAccessor<1,spacedim> > active_line_iterator;
+        typedef TriaRawIterator<dealii::MGDoFCellAccessor<1,spacedim> >    raw_line_iterator;
+        typedef TriaIterator<dealii::MGDoFCellAccessor<1,spacedim> >       line_iterator;
+        typedef TriaActiveIterator<dealii::MGDoFCellAccessor<1,spacedim> > active_line_iterator;
 
         typedef TriaRawIterator   <InvalidAccessor<2,1,spacedim> > raw_quad_iterator;
         typedef TriaIterator      <InvalidAccessor<2,1,spacedim> > quad_iterator;
@@ -78,13 +78,13 @@ namespace internal
     class Iterators<2,spacedim>
     {
       public:
-        typedef TriaRawIterator<MGDoFAccessor<1,2,spacedim> >    raw_line_iterator;
-        typedef TriaIterator<MGDoFAccessor<1,2,spacedim> >       line_iterator;
-        typedef TriaActiveIterator<MGDoFAccessor<1,2,spacedim> > active_line_iterator;
+        typedef TriaRawIterator<dealii::MGDoFAccessor<1,2,spacedim> >    raw_line_iterator;
+        typedef TriaIterator<dealii::MGDoFAccessor<1,2,spacedim> >       line_iterator;
+        typedef TriaActiveIterator<dealii::MGDoFAccessor<1,2,spacedim> > active_line_iterator;
     
-        typedef TriaRawIterator<MGDoFCellAccessor<2,spacedim> >         raw_quad_iterator;
-        typedef TriaIterator<MGDoFCellAccessor<2,spacedim> >            quad_iterator;
-        typedef TriaActiveIterator<MGDoFCellAccessor<2,spacedim> >      active_quad_iterator;
+        typedef TriaRawIterator<dealii::MGDoFCellAccessor<2,spacedim> >         raw_quad_iterator;
+        typedef TriaIterator<dealii::MGDoFCellAccessor<2,spacedim> >            quad_iterator;
+        typedef TriaActiveIterator<dealii::MGDoFCellAccessor<2,spacedim> >      active_quad_iterator;
 
         typedef TriaRawIterator   <InvalidAccessor<3,2,spacedim> > raw_hex_iterator;
         typedef TriaIterator      <InvalidAccessor<3,2,spacedim> > hex_iterator;
@@ -109,17 +109,17 @@ namespace internal
     class Iterators<3,spacedim>
     {
       public:
-        typedef TriaRawIterator<MGDoFAccessor<1,3,spacedim> >    raw_line_iterator;
-        typedef TriaIterator<MGDoFAccessor<1,3,spacedim> >       line_iterator;
-        typedef TriaActiveIterator<MGDoFAccessor<1,3,spacedim> > active_line_iterator;
+        typedef TriaRawIterator<dealii::MGDoFAccessor<1,3,spacedim> >    raw_line_iterator;
+        typedef TriaIterator<dealii::MGDoFAccessor<1,3,spacedim> >       line_iterator;
+        typedef TriaActiveIterator<dealii::MGDoFAccessor<1,3,spacedim> > active_line_iterator;
 
-        typedef TriaRawIterator<MGDoFAccessor<2,3,spacedim> >    raw_quad_iterator;
-        typedef TriaIterator<MGDoFAccessor<2,3,spacedim> >       quad_iterator;
-        typedef TriaActiveIterator<MGDoFAccessor<2,3,spacedim> > active_quad_iterator;
+        typedef TriaRawIterator<dealii::MGDoFAccessor<2,3,spacedim> >    raw_quad_iterator;
+        typedef TriaIterator<dealii::MGDoFAccessor<2,3,spacedim> >       quad_iterator;
+        typedef TriaActiveIterator<dealii::MGDoFAccessor<2,3,spacedim> > active_quad_iterator;
 
-        typedef TriaRawIterator<MGDoFCellAccessor<3,spacedim> >        raw_hex_iterator;
-        typedef TriaIterator<MGDoFCellAccessor<3,spacedim> >           hex_iterator;
-        typedef TriaActiveIterator<MGDoFCellAccessor<3,spacedim> >     active_hex_iterator;
+        typedef TriaRawIterator<dealii::MGDoFCellAccessor<3,spacedim> >        raw_hex_iterator;
+        typedef TriaIterator<dealii::MGDoFCellAccessor<3,spacedim> >           hex_iterator;
+        typedef TriaActiveIterator<dealii::MGDoFCellAccessor<3,spacedim> >     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.