From 2da32b8ba853a05b9f54e5c9b9b023d87e16156c Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Wed, 30 Jul 2008 14:23:36 +0000 Subject: [PATCH] Replace && by & and || by | inside the definition of the overloaded operators & and |. --- STL_Extension/include/CGAL/Uncertain.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/STL_Extension/include/CGAL/Uncertain.h b/STL_Extension/include/CGAL/Uncertain.h index d68508a820d..99133df0c31 100644 --- a/STL_Extension/include/CGAL/Uncertain.h +++ b/STL_Extension/include/CGAL/Uncertain.h @@ -275,37 +275,37 @@ Uncertain operator!(Uncertain a) inline Uncertain operator|(Uncertain a, Uncertain b) { - return Uncertain(a.inf() || b.inf(), a.sup() || b.sup()); + return Uncertain(a.inf() | b.inf(), a.sup() | b.sup()); } inline Uncertain operator|(bool a, Uncertain b) { - return Uncertain(a || b.inf(), a || b.sup()); + return Uncertain(a | b.inf(), a | b.sup()); } inline Uncertain operator|(Uncertain a, bool b) { - return Uncertain(a.inf() || b, a.sup() || b); + return Uncertain(a.inf() | b, a.sup() | b); } inline Uncertain operator&(Uncertain a, Uncertain b) { - return Uncertain(a.inf() && b.inf(), a.sup() && b.sup()); + return Uncertain(a.inf() & b.inf(), a.sup() & b.sup()); } inline Uncertain operator&(bool a, Uncertain b) { - return Uncertain(a && b.inf(), a && b.sup()); + return Uncertain(a & b.inf(), a & b.sup()); } inline Uncertain operator&(Uncertain a, bool b) { - return Uncertain(a.inf() && b, a.sup() && b); + return Uncertain(a.inf() & b, a.sup() & b); }