From 02caed268b62fd832dbe08158816ff9fd5d2c1ef Mon Sep 17 00:00:00 2001 From: Beman Dawes Date: Sun, 25 Nov 2007 18:07:19 +0000 Subject: [PATCH] Full merge from trunk at revision 41356 of entire boost-root tree. [SVN r41369] --- include/boost/logic/tribool.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/logic/tribool.hpp b/include/boost/logic/tribool.hpp index 2cc501c..229feb4 100644 --- a/include/boost/logic/tribool.hpp +++ b/include/boost/logic/tribool.hpp @@ -336,7 +336,7 @@ inline tribool operator==(tribool x, tribool y) if (indeterminate(x) || indeterminate(y)) return indeterminate; else - return x && y || !x && !y; + return (x && y) || (!x && !y); } /** @@ -399,7 +399,7 @@ inline tribool operator!=(tribool x, tribool y) if (indeterminate(x) || indeterminate(y)) return indeterminate; else - return !(x && y || !x && !y); + return !((x && y) || (!x && !y)); } /**