From ae1b77ee3657e4940d325360a97853b89e9a931f Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 3 Dec 2019 07:45:21 +0100 Subject: [PATCH] STYLE: force bool context for xorOp --- src/OpenFOAM/primitives/ops/ops.H | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/OpenFOAM/primitives/ops/ops.H b/src/OpenFOAM/primitives/ops/ops.H index 8491a5ca4f..4411f85460 100644 --- a/src/OpenFOAM/primitives/ops/ops.H +++ b/src/OpenFOAM/primitives/ops/ops.H @@ -222,8 +222,8 @@ Op(cmptDivide, cmptDivide(x, y)) Op(stabilise, stabilise(x, y)) Op(max, max(x, y)) Op(min, min(x, y)) -Op(minMagSqr, (magSqr(x)<=magSqr(y) ? x : y)) -Op(maxMagSqr, (magSqr(x)>=magSqr(y) ? x : y)) +Op(minMagSqr, (magSqr(x) <= magSqr(y) ? x : y)) +Op(maxMagSqr, (magSqr(x) >= magSqr(y) ? x : y)) Op(minMod, minMod(x, y)) Op(bitAnd, (x & y)) @@ -232,7 +232,7 @@ Op(bitXor, (x ^ y)) BoolOp(and, 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(notEqual, x != y) BoolOp(less, x < y)