From 60d46f49ebb7f677599dd2f2ad529b1365f552c4 Mon Sep 17 00:00:00 2001 From: Guido Kanschat Date: Thu, 26 Jan 2006 11:31:38 +0000 Subject: [PATCH] fix |= operator for Coupling git-svn-id: https://svn.dealii.org/trunk@12181 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/deal.II/include/dofs/dof_tools.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/deal.II/deal.II/include/dofs/dof_tools.h b/deal.II/deal.II/include/dofs/dof_tools.h index 4639fec470..50591fda45 100644 --- a/deal.II/deal.II/include/dofs/dof_tools.h +++ b/deal.II/deal.II/include/dofs/dof_tools.h @@ -1638,14 +1638,14 @@ class DoFTools * * @relates DoFTools */ -DoFTools::Coupling operator |= (const DoFTools::Coupling& c1, - const DoFTools::Coupling& c2) +DoFTools::Coupling operator |= (DoFTools::Coupling& c1, + const DoFTools::Coupling c2) { - if (c1 == DoFTools::always || c2 == DoFTools::always) - return DoFTools::always; - if (c1 == DoFTools::nonzero || c2 == DoFTools::nonzero) - return DoFTools::nonzero; - return DoFTools::none; + if (c2 == DoFTools::always) + c1 = DoFTools::always; + else if (c1 != DoFTools::always && c2 == DoFTools::nonzero) + return c1 = DoFTools::nonzero; + return c1; } @@ -1654,8 +1654,8 @@ DoFTools::Coupling operator |= (const DoFTools::Coupling& c1, * * @relates DoFTools */ -DoFTools::Coupling operator | (const DoFTools::Coupling& c1, - const DoFTools::Coupling& c2) +DoFTools::Coupling operator | (const DoFTools::Coupling c1, + const DoFTools::Coupling c2) { if (c1 == DoFTools::always || c2 == DoFTools::always) return DoFTools::always; -- 2.39.5