From: bangerth Date: Fri, 1 Sep 2006 20:32:44 +0000 (+0000) Subject: The operator defined is actually an operator&, not operator| X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a5b21e74cd6ff72391c06c6ce186ccd247f8cfd;p=dealii-svn.git The operator defined is actually an operator&, not operator| git-svn-id: https://svn.dealii.org/trunk@13795 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/include/fe/fe_base.h b/deal.II/deal.II/include/fe/fe_base.h index c03c3a61b2..5ff310c5b0 100644 --- a/deal.II/deal.II/include/fe/fe_base.h +++ b/deal.II/deal.II/include/fe/fe_base.h @@ -113,7 +113,7 @@ namespace FiniteElementDomination /** * A generalization of the binary - * or operator to a comparison + * and operator to a comparison * relationship. The way this works is * pretty much as when you would want to * define a comparison relationship for @@ -139,7 +139,7 @@ namespace FiniteElementDomination * then the returned value is * neither_element_dominates. */ - Domination operator | (const Domination d1, + Domination operator & (const Domination d1, const Domination d2); } @@ -594,7 +594,7 @@ class FiniteElementData namespace FiniteElementDomination { inline - Domination operator | (const Domination d1, + Domination operator & (const Domination d1, const Domination d2) { switch (d1) diff --git a/deal.II/deal.II/source/dofs/dof_tools.cc b/deal.II/deal.II/source/dofs/dof_tools.cc index b59925e8d5..0e90ade639 100644 --- a/deal.II/deal.II/source/dofs/dof_tools.cc +++ b/deal.II/deal.II/source/dofs/dof_tools.cc @@ -2137,7 +2137,7 @@ namespace internal FiniteElementDomination::Domination mother_face_dominates = FiniteElementDomination::either_element_can_dominate; for (unsigned int c=0; c::subfaces_per_face; ++c) - mother_face_dominates = mother_face_dominates | + mother_face_dominates = mother_face_dominates & (cell->get_fe().compare_for_domination (cell->neighbor_child_on_subface (face, c)->get_fe())); @@ -2296,7 +2296,7 @@ namespace internal domination = FiniteElementDomination::either_element_can_dominate; for (unsigned int sf=0; sf::subfaces_per_face; ++sf) if (sf != dominating_subface_no) - domination = domination | + domination = domination & cell->neighbor_child_on_subface (face, dominating_subface_no) ->get_fe().compare_for_domination (cell->neighbor_child_on_subface (face, sf)->get_fe()); diff --git a/deal.II/deal.II/source/fe/fe_system.cc b/deal.II/deal.II/source/fe/fe_system.cc index 5a877700eb..74aa473568 100644 --- a/deal.II/deal.II/source/fe/fe_system.cc +++ b/deal.II/deal.II/source/fe/fe_system.cc @@ -2305,7 +2305,7 @@ compare_for_domination (const FiniteElement &fe_other) const // for this pair of base elements, // check who dominates and combine // with previous result - domination = domination | (this->base_element(b) + domination = domination & (this->base_element(b) .compare_for_domination (fe_sys_other->base_element(b))); }