really screwy merge trancking behavior, starting over

[SVN r44394]
post-review proto version
2025-06-27 04:51:37 +02:00 · 2008-04-14 05:45:24 +00:00 · 2008-04-05 18:00:00 +00:00 · 2008-01-25 21:07:14 +00:00 · 2007-10-22 19:37:05 +00:00
2 changed files with 3 additions and 2 deletions
--- 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));
 }

 /**
--- a/test/tribool_io_test.cpp
+++ b/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>
Author	SHA1	Message	Date
Eric Niebler	9e2c689059	really screwy merge trancking behavior, starting over [SVN r44394]	2008-04-14 05:45:24 +00:00
Eric Niebler	a50850668f	post-review proto version [SVN r44061]	2008-04-05 18:00:00 +00:00
Douglas Gregor	24117db3ae	Include <ios> to get std::boolalpha. Fixes #1586 [SVN r42972]	2008-01-25 21:07:14 +00:00
Douglas Gregor	15b34d0bf4	Fix warnings from GCC 4.3. Fixes #1337 [SVN r40299]	2007-10-22 19:37:05 +00:00