Merge.

[SVN r43063]

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));
 }
 
 /**

test/tribool_io_test.cpp

@@ -8,6 +8,7 @@
 #include <sstream>
 #include <string>
 #include <iostream>
+#include <ios>     // for std::boolalpha
 
 #ifndef BOOST_NO_STD_LOCALE
 #  include <locale>