Replace && by & and || by | inside the definition of the overloaded operators & and |.

This commit is contained in:
Sylvain Pion 2008-07-30 14:23:36 +00:00
parent fbc04e5b3e
commit 2da32b8ba8
1 changed files with 6 additions and 6 deletions

View File

@ -275,37 +275,37 @@ Uncertain<bool> operator!(Uncertain<bool> a)
inline
Uncertain<bool> operator|(Uncertain<bool> a, Uncertain<bool> b)
{
return Uncertain<bool>(a.inf() || b.inf(), a.sup() || b.sup());
return Uncertain<bool>(a.inf() | b.inf(), a.sup() | b.sup());
}
inline
Uncertain<bool> operator|(bool a, Uncertain<bool> b)
{
return Uncertain<bool>(a || b.inf(), a || b.sup());
return Uncertain<bool>(a | b.inf(), a | b.sup());
}
inline
Uncertain<bool> operator|(Uncertain<bool> a, bool b)
{
return Uncertain<bool>(a.inf() || b, a.sup() || b);
return Uncertain<bool>(a.inf() | b, a.sup() | b);
}
inline
Uncertain<bool> operator&(Uncertain<bool> a, Uncertain<bool> b)
{
return Uncertain<bool>(a.inf() && b.inf(), a.sup() && b.sup());
return Uncertain<bool>(a.inf() & b.inf(), a.sup() & b.sup());
}
inline
Uncertain<bool> operator&(bool a, Uncertain<bool> b)
{
return Uncertain<bool>(a && b.inf(), a && b.sup());
return Uncertain<bool>(a & b.inf(), a & b.sup());
}
inline
Uncertain<bool> operator&(Uncertain<bool> a, bool b)
{
return Uncertain<bool>(a.inf() && b, a.sup() && b);
return Uncertain<bool>(a.inf() & b, a.sup() & b);
}