Compare commits

...

5 Commits

Author SHA1 Message Date
Beman Dawes
6a7afdee60 Release
[SVN r43921]
2008-03-29 11:50:24 +00:00
Douglas Gregor
f1d8f513bf Merged from trunk
[SVN r42973]
2008-01-25 21:18:27 +00:00
Beman Dawes
9db33f9dcf Full merge from trunk at revision 41356 of entire boost-root tree.
[SVN r41370]
2007-11-25 18:38:02 +00:00
Beman Dawes
02caed268b Full merge from trunk at revision 41356 of entire boost-root tree.
[SVN r41369]
2007-11-25 18:07:19 +00:00
Beman Dawes
5749fb9ef1 Starting point for releases
[SVN r39706]
2007-10-05 14:25:06 +00:00
3 changed files with 5 additions and 4 deletions

View File

@@ -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">

View File

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

View File

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