Fix warnings about missing parents between || and &&.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@119454 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman
2010-11-17 02:40:30 +00:00
parent 113a06cff4
commit 32df92dde6

View File

@@ -198,16 +198,16 @@ public:
assert((HL > HR ? HL-HR : HR-HL) <= 2 assert((HL > HR ? HL-HR : HR-HL) <= 2
&& "Balancing invariant violated"); && "Balancing invariant violated");
assert(!getLeft() assert((!getLeft() ||
|| ImutInfo::isLess(ImutInfo::KeyOfValue(getLeft()->getValue()), ImutInfo::isLess(ImutInfo::KeyOfValue(getLeft()->getValue()),
ImutInfo::KeyOfValue(getValue())) ImutInfo::KeyOfValue(getValue()))) &&
&& "Value in left child is not less that current value"); "Value in left child is not less that current value");
assert(!getRight() assert(!(getRight() ||
|| ImutInfo::isLess(ImutInfo::KeyOfValue(getValue()), ImutInfo::isLess(ImutInfo::KeyOfValue(getValue()),
ImutInfo::KeyOfValue(getRight()->getValue())) ImutInfo::KeyOfValue(getRight()->getValue()))) &&
&& "Current value is not less that value of right child"); "Current value is not less that value of right child");
return getHeight(); return getHeight();
} }