Created a branch from trunk

[SVN r38959]

CMakeLists.txt

@@ -1,21 +0,0 @@
-#----------------------------------------------------------------------------
-# This file was automatically generated from the original CMakeLists.txt file
-# Add a variable to hold the headers for the library
-set (lib_headers
-    logic
-)
-
-# Add a library target to the build system
-boost_library_project(
-  logic
-  #  SRCDIRS 
-  TESTDIRS  test
-  HEADERS ${lib_headers}
-  #  DOCDIRS 
-  #  DESCRIPTION 
-  MODULARIZED 
-  #  AUTHORS 
-  #  MAINTAINERS 
-)
-
-

doc/Jamfile.v2

@@ -6,9 +6,4 @@ doxygen reference : [ glob ../../../boost/logic/tribool.hpp ]
                     [ glob ../../../boost/logic/tribool_fwd.hpp ]
                     [ glob ../../../boost/logic/tribool_io.hpp ]
                   ;
-boostbook tribool 
-	: 
-	tribool.boostbook 
-	:
-        <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
-	;
+boostbook tribool : tribool.boostbook ;

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

module.cmake

@@ -1,3 +0,0 @@
-boost_module(logic DEPENDS config detail)
-
-

test/CMakeLists.txt

@@ -1,6 +0,0 @@
-boost_additional_test_dependencies(logic BOOST_DEPENDS test)
-
-
-boost_test_run(tribool_test)
-boost_test_run(tribool_rename_test)
-boost_test_run(tribool_io_test)

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>