From: kronbichler Date: Thu, 5 Nov 2009 19:17:35 +0000 (+0000) Subject: Qualify names to avoid ambiguity with namespace of same name. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8226d49b5a2b359fe3fc784c4a35f8200be39c30;p=dealii-svn.git Qualify names to avoid ambiguity with namespace of same name. git-svn-id: https://svn.dealii.org/trunk@20034 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/dofs/dof_iterator_selector.h b/deal.II/deal.II/include/dofs/dof_iterator_selector.h index 807b19bdad..56d47586d0 100644 --- a/deal.II/deal.II/include/dofs/dof_iterator_selector.h +++ b/deal.II/deal.II/include/dofs/dof_iterator_selector.h @@ -54,9 +54,9 @@ namespace internal { typedef DH<1,spacedim> DoFHandler_type; - typedef TriaRawIterator > raw_line_iterator; - typedef TriaIterator > line_iterator; - typedef TriaActiveIterator > active_line_iterator; + typedef TriaRawIterator > raw_line_iterator; + typedef TriaIterator > line_iterator; + typedef TriaActiveIterator > active_line_iterator; typedef TriaRawIterator > raw_quad_iterator; typedef TriaIterator > quad_iterator; @@ -93,13 +93,13 @@ namespace internal { typedef DH<2,spacedim> DoFHandler_type; - typedef TriaRawIterator > raw_line_iterator; - typedef TriaIterator > line_iterator; - typedef TriaActiveIterator > active_line_iterator; + typedef TriaRawIterator > raw_line_iterator; + typedef TriaIterator > line_iterator; + typedef TriaActiveIterator > active_line_iterator; - typedef TriaRawIterator > raw_quad_iterator; - typedef TriaIterator > quad_iterator; - typedef TriaActiveIterator > active_quad_iterator; + typedef TriaRawIterator > raw_quad_iterator; + typedef TriaIterator > quad_iterator; + typedef TriaActiveIterator > active_quad_iterator; typedef TriaRawIterator > raw_hex_iterator; typedef TriaIterator > hex_iterator; @@ -132,17 +132,17 @@ namespace internal { typedef DH<3, spacedim> DoFHandler_type; - typedef TriaRawIterator > raw_line_iterator; - typedef TriaIterator > line_iterator; - typedef TriaActiveIterator > active_line_iterator; + typedef TriaRawIterator > raw_line_iterator; + typedef TriaIterator > line_iterator; + typedef TriaActiveIterator > active_line_iterator; - typedef TriaRawIterator > raw_quad_iterator; - typedef TriaIterator > quad_iterator; - typedef TriaActiveIterator > active_quad_iterator; + typedef TriaRawIterator > raw_quad_iterator; + typedef TriaIterator > quad_iterator; + typedef TriaActiveIterator > active_quad_iterator; - typedef TriaRawIterator > raw_hex_iterator; - typedef TriaIterator > hex_iterator; - typedef TriaActiveIterator > active_hex_iterator; + typedef TriaRawIterator > raw_hex_iterator; + typedef TriaIterator > hex_iterator; + typedef TriaActiveIterator > active_hex_iterator; typedef raw_hex_iterator raw_cell_iterator; typedef hex_iterator cell_iterator; diff --git a/deal.II/deal.II/include/grid/tria_iterator_selector.h b/deal.II/deal.II/include/grid/tria_iterator_selector.h index 6319878ae2..7885d63ec7 100644 --- a/deal.II/deal.II/include/grid/tria_iterator_selector.h +++ b/deal.II/deal.II/include/grid/tria_iterator_selector.h @@ -67,9 +67,9 @@ namespace internal template struct Iterators<1,spacedim> { - typedef TriaRawIterator > raw_line_iterator; - typedef TriaIterator > line_iterator; - typedef TriaActiveIterator > active_line_iterator; + typedef TriaRawIterator > raw_line_iterator; + typedef TriaIterator > line_iterator; + typedef TriaActiveIterator > active_line_iterator; typedef TriaRawIterator > raw_quad_iterator; typedef TriaIterator > quad_iterator; @@ -128,13 +128,13 @@ namespace internal template struct Iterators<2,spacedim> { - typedef TriaRawIterator > raw_line_iterator; - typedef TriaIterator > line_iterator; - typedef TriaActiveIterator > active_line_iterator; + typedef TriaRawIterator > raw_line_iterator; + typedef TriaIterator > line_iterator; + typedef TriaActiveIterator > active_line_iterator; - typedef TriaRawIterator > raw_quad_iterator; - typedef TriaIterator > quad_iterator; - typedef TriaActiveIterator > active_quad_iterator; + typedef TriaRawIterator > raw_quad_iterator; + typedef TriaIterator > quad_iterator; + typedef TriaActiveIterator > active_quad_iterator; typedef TriaRawIterator > raw_hex_iterator; typedef TriaIterator > hex_iterator; @@ -173,17 +173,17 @@ namespace internal template struct Iterators<3,spacedim> { - typedef TriaRawIterator > raw_line_iterator; - typedef TriaIterator > line_iterator; - typedef TriaActiveIterator > active_line_iterator; + typedef TriaRawIterator > raw_line_iterator; + typedef TriaIterator > line_iterator; + typedef TriaActiveIterator > active_line_iterator; - typedef TriaRawIterator > raw_quad_iterator; - typedef TriaIterator > quad_iterator; - typedef TriaActiveIterator > active_quad_iterator; + typedef TriaRawIterator > raw_quad_iterator; + typedef TriaIterator > quad_iterator; + typedef TriaActiveIterator > active_quad_iterator; - typedef TriaRawIterator > raw_hex_iterator; - typedef TriaIterator > hex_iterator; - typedef TriaActiveIterator > active_hex_iterator; + typedef TriaRawIterator > raw_hex_iterator; + typedef TriaIterator > hex_iterator; + typedef TriaActiveIterator > active_hex_iterator; typedef raw_hex_iterator raw_cell_iterator; typedef hex_iterator cell_iterator; diff --git a/deal.II/deal.II/include/multigrid/mg_dof_iterator_selector.h b/deal.II/deal.II/include/multigrid/mg_dof_iterator_selector.h index 6a3038c05a..9fca49c2a1 100644 --- a/deal.II/deal.II/include/multigrid/mg_dof_iterator_selector.h +++ b/deal.II/deal.II/include/multigrid/mg_dof_iterator_selector.h @@ -47,9 +47,9 @@ namespace internal class Iterators<1,spacedim> { public: - typedef TriaRawIterator > raw_line_iterator; - typedef TriaIterator > line_iterator; - typedef TriaActiveIterator > active_line_iterator; + typedef TriaRawIterator > raw_line_iterator; + typedef TriaIterator > line_iterator; + typedef TriaActiveIterator > active_line_iterator; typedef TriaRawIterator > raw_quad_iterator; typedef TriaIterator > quad_iterator; @@ -78,13 +78,13 @@ namespace internal class Iterators<2,spacedim> { public: - typedef TriaRawIterator > raw_line_iterator; - typedef TriaIterator > line_iterator; - typedef TriaActiveIterator > active_line_iterator; + typedef TriaRawIterator > raw_line_iterator; + typedef TriaIterator > line_iterator; + typedef TriaActiveIterator > active_line_iterator; - typedef TriaRawIterator > raw_quad_iterator; - typedef TriaIterator > quad_iterator; - typedef TriaActiveIterator > active_quad_iterator; + typedef TriaRawIterator > raw_quad_iterator; + typedef TriaIterator > quad_iterator; + typedef TriaActiveIterator > active_quad_iterator; typedef TriaRawIterator > raw_hex_iterator; typedef TriaIterator > hex_iterator; @@ -109,17 +109,17 @@ namespace internal class Iterators<3,spacedim> { public: - typedef TriaRawIterator > raw_line_iterator; - typedef TriaIterator > line_iterator; - typedef TriaActiveIterator > active_line_iterator; + typedef TriaRawIterator > raw_line_iterator; + typedef TriaIterator > line_iterator; + typedef TriaActiveIterator > active_line_iterator; - typedef TriaRawIterator > raw_quad_iterator; - typedef TriaIterator > quad_iterator; - typedef TriaActiveIterator > active_quad_iterator; + typedef TriaRawIterator > raw_quad_iterator; + typedef TriaIterator > quad_iterator; + typedef TriaActiveIterator > active_quad_iterator; - typedef TriaRawIterator > raw_hex_iterator; - typedef TriaIterator > hex_iterator; - typedef TriaActiveIterator > active_hex_iterator; + typedef TriaRawIterator > raw_hex_iterator; + typedef TriaIterator > hex_iterator; + typedef TriaActiveIterator > active_hex_iterator; typedef raw_hex_iterator raw_cell_iterator; typedef hex_iterator cell_iterator;