Branch at revision 46530

[SVN r46531]
Include <ios> to get std::boolalpha. Fixes #1586
2008-06-19 18:57:10 +00:00 · 2008-01-25 21:07:14 +00:00 · 2007-10-22 19:37:05 +00:00 · 2007-08-08 19:02:26 +00:00 · 2007-05-03 03:28:53 +00:00 · 2007-05-03 01:18:48 +00:00
3 changed files with 5 additions and 4 deletions
--- a/doc/tribool.boostbook
+++ b/doc/tribool.boostbook
@ -2,7 +2,7 @@
 <!DOCTYPE library PUBLIC "-//Boost//DTD BoostBook XML V1.0//EN"
  "http://www.boost.org/tools/boostbook/dtd/boostbook.dtd">
 <library name="Tribool" dirname="logic" id="tribool"
-         last-revision="$Date: 2004/07/25 03:01:38 $" xmlns:xi="http://www.w3.org/2001/XInclude">
+         last-revision="$Date: 2007/05/03 03:28:53 $" xmlns:xi="http://www.w3.org/2001/XInclude">
  <libraryinfo>
    <author>
      <firstname>Douglas</firstname>
@ -197,7 +197,7 @@ cout &lt;&lt; boolalpha &lt;&lt; x &lt;&lt; endl; // Prints "maybe"</programlist

  </section>

-  <xi:include href="reference.boostbook"/>
+  <xi:include href="reference.xml"/>

  <testsuite id="tribool.tests">
    <run-test filename="tribool_test.cpp">
--- 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
Beman Dawes	3781ee6709	Branch at revision 46530 [SVN r46531]	2008-06-19 18:57:10 +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
Vladimir Prus	d1f46c8f98	Remove V1 Jamfiles [SVN r38516]	2007-08-08 19:02:26 +00:00
Eric Niebler	23af176127	fix typo [SVN r37572]	2007-05-03 03:28:53 +00:00
Eric Niebler	196865d37f	fix xincludes of doxygen-generated reference sections [SVN r37571]	2007-05-03 01:18:48 +00:00