This commit was manufactured by cvs2svn to create branch 'RC_1_33_0'.

[SVN r30300]

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: 2007/05/03 03:28:53 $" xmlns:xi="http://www.w3.org/2001/XInclude">
+         last-revision="$Date: 2004/07/25 03:01:38 $" 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.xml"/>
+  <xi:include href="reference.boostbook"/>
 
   <testsuite id="tribool.tests">
     <run-test filename="tribool_test.cpp">

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

include/boost/logic/tribool_io.hpp

@@ -104,10 +104,9 @@ template<>
 inline std::basic_string<char> get_default_indeterminate_name<char>()
 { return "indeterminate"; }
 
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
+#if BOOST_WORKAROUND(BOOST_MSVC, <= 1200)
 // VC++ 6.0 chokes on the specialization below, so we're stuck without 
-// wchar_t support. What a pain. TODO: it might just need a the template 
-// parameter as function parameter...
+// wchar_t support. What a pain.
 #else
 #  ifndef BOOST_NO_WCHAR_T
 /// Returns the wide character string L"indeterminate".

test/Jamfile

@@ -0,0 +1,35 @@
+# Tribool library
+
+# Copyright (C) 2002-2003 Douglas Gregor
+
+# Use, modification and distribution is subject to the Boost Software License, 
+# Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at 
+# http://www.boost.org/LICENSE_1_0.txt) 
+
+# For more information, see http://www.boost.org/
+
+
+# Testing Jamfile autogenerated from XML source
+subproject libs/logic/test ;
+
+# bring in rules for testing
+SEARCH on testing.jam = $(BOOST_BUILD_PATH) ;
+include testing.jam ;
+
+# Make tests run by default.
+DEPENDS all : test ;
+
+{
+  # look in BOOST_ROOT for sources first, just in this Jamfile
+  local SEARCH_SOURCE = $(BOOST_ROOT) $(SEARCH_SOURCE) ;
+
+  test-suite logic
+    : 
+    [ run libs/logic/test/tribool_test.cpp :  :  :  :  ]
+
+    [ run libs/logic/test/tribool_rename_test.cpp :  :  :  :  ]
+
+    [ run libs/logic/test/tribool_io_test.cpp :  :  :  :  ]
+   ;
+}
+      

test/tribool_io_test.cpp

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