zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STYLE: force bool context for xorOp

Browse Source
This commit is contained in:
Mark Olesen
2019-12-03 07:45:21 +01:00
parent 5d7d24df94
commit ae1b77ee36
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/OpenFOAM/primitives/ops/ops.H
View File

@ -222,8 +222,8 @@ Op(cmptDivide, cmptDivide(x, y))
Op(stabilise, stabilise(x, y)) Op(stabilise, stabilise(x, y))
Op(max, max(x, y)) Op(max, max(x, y))
Op(min, min(x, y)) Op(min, min(x, y))
Op(minMagSqr, (magSqr(x)<=magSqr(y) ? x : y)) Op(minMagSqr, (magSqr(x) <= magSqr(y) ? x : y))
Op(maxMagSqr, (magSqr(x)>=magSqr(y) ? x : y)) Op(maxMagSqr, (magSqr(x) >= magSqr(y) ? x : y))
Op(minMod, minMod(x, y)) Op(minMod, minMod(x, y))
Op(bitAnd, (x & y)) Op(bitAnd, (x & y))
@ -232,7 +232,7 @@ Op(bitXor, (x ^ y))
BoolOp(and, x && y) BoolOp(and, x && y)
BoolOp(or, x || y) BoolOp(or, x || y)
BoolOp(xor, x != y) // Or as (!x != !y) to force bool context? BoolOp(xor, (!x) != (!y)) // With forced bool context
BoolOp(equal, x == y) BoolOp(equal, x == y)
BoolOp(notEqual, x != y) BoolOp(notEqual, x != y)
BoolOp(less, x < y) BoolOp(less, x < y)