From 73cce598c7f2b966d2b4ae65753c2cedcd9a1461 Mon Sep 17 00:00:00 2001 From: nobody Date: Tue, 21 Mar 2006 02:26:31 +0000 Subject: [PATCH 01/16] This commit was manufactured by cvs2svn to create branch 'RC_1_34_0'. [SVN r33417] From 9e9489c7bd4f7031edd967ebc6e5b432a6225dda Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 6 Nov 2006 17:10:46 +0000 Subject: [PATCH 02/16] Remove obsolete Boost.Build v1 files. [SVN r35880] --- test/Jamfile | 35 ----------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 test/Jamfile diff --git a/test/Jamfile b/test/Jamfile deleted file mode 100644 index ac5ec21..0000000 --- a/test/Jamfile +++ /dev/null @@ -1,35 +0,0 @@ -# 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 : : : : ] - ; -} - \ No newline at end of file From 03a2600bf5f5de4b700fc631d378834209c78c93 Mon Sep 17 00:00:00 2001 From: nobody Date: Tue, 24 Jul 2007 19:28:14 +0000 Subject: [PATCH 03/16] This commit was manufactured by cvs2svn to create tag 'Version_1_34_1'. [SVN r38286] From 5749fb9ef1e4b24079e8709d02159c6897d35ffe Mon Sep 17 00:00:00 2001 From: Beman Dawes Date: Fri, 5 Oct 2007 14:25:06 +0000 Subject: [PATCH 04/16] Starting point for releases [SVN r39706] From 02caed268b62fd832dbe08158816ff9fd5d2c1ef Mon Sep 17 00:00:00 2001 From: Beman Dawes Date: Sun, 25 Nov 2007 18:07:19 +0000 Subject: [PATCH 05/16] Full merge from trunk at revision 41356 of entire boost-root tree. [SVN r41369] --- include/boost/logic/tribool.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/logic/tribool.hpp b/include/boost/logic/tribool.hpp index 2cc501c..229feb4 100644 --- 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)); } /** From 9db33f9dcfc40b40b838e5a1cc3042692a646e85 Mon Sep 17 00:00:00 2001 From: Beman Dawes Date: Sun, 25 Nov 2007 18:38:02 +0000 Subject: [PATCH 06/16] Full merge from trunk at revision 41356 of entire boost-root tree. [SVN r41370] --- doc/tribool.boostbook | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/tribool.boostbook b/doc/tribool.boostbook index ede46f7..1fa199a 100644 --- a/doc/tribool.boostbook +++ b/doc/tribool.boostbook @@ -2,7 +2,7 @@ + last-revision="$Date: 2007/05/03 03:28:53 $" xmlns:xi="http://www.w3.org/2001/XInclude"> Douglas @@ -197,7 +197,7 @@ cout << boolalpha << x << endl; // Prints "maybe" - + From f1d8f513bf0436ad6bea4a695b6f06c413352cfc Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Fri, 25 Jan 2008 21:18:27 +0000 Subject: [PATCH 07/16] Merged from trunk [SVN r42973] --- test/tribool_io_test.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/test/tribool_io_test.cpp b/test/tribool_io_test.cpp index d7254f1..84bce90 100644 --- a/test/tribool_io_test.cpp +++ b/test/tribool_io_test.cpp @@ -8,6 +8,7 @@ #include #include #include +#include // for std::boolalpha #ifndef BOOST_NO_STD_LOCALE # include From 951486c794b92d161a44884daf5662e0607496df Mon Sep 17 00:00:00 2001 From: "Troy D. Straszheim" Date: Sat, 24 Jan 2009 18:57:20 +0000 Subject: [PATCH 08/16] merge of cmake build files from trunk per beman [SVN r50756] --- CMakeLists.txt | 21 +++++++++++++++++++++ module.cmake | 3 +++ test/CMakeLists.txt | 6 ++++++ 3 files changed, 30 insertions(+) create mode 100644 CMakeLists.txt create mode 100644 module.cmake create mode 100644 test/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..8c18935 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,21 @@ +#---------------------------------------------------------------------------- +# 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 +) + + diff --git a/module.cmake b/module.cmake new file mode 100644 index 0000000..4b1423f --- /dev/null +++ b/module.cmake @@ -0,0 +1,3 @@ +boost_module(logic DEPENDS config detail) + + diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt new file mode 100644 index 0000000..6b5507d --- /dev/null +++ b/test/CMakeLists.txt @@ -0,0 +1,6 @@ +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) From 58cd70062343a9f1f39ff9abccb61ab7b67437c5 Mon Sep 17 00:00:00 2001 From: John Maddock Date: Mon, 23 Feb 2009 18:39:32 +0000 Subject: [PATCH 09/16] Merge PDF build changes from Trunk. [SVN r51417] --- doc/Jamfile.v2 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index d3e2e3c..2e166bd 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -6,4 +6,9 @@ doxygen reference : [ glob ../../../boost/logic/tribool.hpp ] [ glob ../../../boost/logic/tribool_fwd.hpp ] [ glob ../../../boost/logic/tribool_io.hpp ] ; -boostbook tribool : tribool.boostbook ; +boostbook tribool + : + tribool.boostbook + : + pdf:boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html + ; From bd737d03b08fe03a1eedbb5354b6e0f819246851 Mon Sep 17 00:00:00 2001 From: "Troy D. Straszheim" Date: Wed, 22 Jul 2009 21:51:01 +0000 Subject: [PATCH 10/16] Add basic copyright/license to keep cmake out of the inspection report [SVN r55095] --- CMakeLists.txt | 6 ++++++ test/CMakeLists.txt | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c18935..da915e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,9 @@ +# +# Copyright Troy D. Straszheim +# +# Distributed under the Boost Software License, Version 1.0. +# See http://www.boost.org/LICENSE_1_0.txt +# #---------------------------------------------------------------------------- # This file was automatically generated from the original CMakeLists.txt file # Add a variable to hold the headers for the library diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 6b5507d..7684320 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,3 +1,9 @@ +# +# Copyright Troy D. Straszheim +# +# Distributed under the Boost Software License, Version 1.0. +# See http://www.boost.org/LICENSE_1_0.txt +# boost_additional_test_dependencies(logic BOOST_DEPENDS test) From 987080a8c7e13e5b8778b862a35f3a5f19d0107d Mon Sep 17 00:00:00 2001 From: John Maddock Date: Mon, 24 Aug 2009 10:31:43 +0000 Subject: [PATCH 11/16] Fix up logic and date_time Jamfiles so they build needed dependencies. Fix PDF image paths in fusion Jamfile.v2. Add fusion to the PDF build. [SVN r55757] --- doc/Jamfile.v2 | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 2e166bd..41c0dcc 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -11,4 +11,5 @@ boostbook tribool tribool.boostbook : pdf:boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html + reference ; From b86917fe438fb541c7ec3055a66ec83e77fa7a46 Mon Sep 17 00:00:00 2001 From: "Troy D. Straszheim" Date: Sat, 17 Oct 2009 01:10:45 +0000 Subject: [PATCH 12/16] rm cmake from the release branch before it goes out broken. Policy dictates that you never commit to release, you commit to trunk and merge to release. [SVN r56941] --- CMakeLists.txt | 27 --------------------------- module.cmake | 3 --- test/CMakeLists.txt | 12 ------------ 3 files changed, 42 deletions(-) delete mode 100644 CMakeLists.txt delete mode 100644 module.cmake delete mode 100644 test/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index da915e5..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright Troy D. Straszheim -# -# Distributed under the Boost Software License, Version 1.0. -# See http://www.boost.org/LICENSE_1_0.txt -# -#---------------------------------------------------------------------------- -# 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 -) - - diff --git a/module.cmake b/module.cmake deleted file mode 100644 index 4b1423f..0000000 --- a/module.cmake +++ /dev/null @@ -1,3 +0,0 @@ -boost_module(logic DEPENDS config detail) - - diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt deleted file mode 100644 index 7684320..0000000 --- a/test/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# -# Copyright Troy D. Straszheim -# -# Distributed under the Boost Software License, Version 1.0. -# See http://www.boost.org/LICENSE_1_0.txt -# -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) From c053ade60f2e8916e7b2b957b2d208b27e03c9c6 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sat, 26 Jun 2010 12:30:09 +0000 Subject: [PATCH 13/16] Merge documentation fixes. * Use `doc/src/*.css` instead of `doc/html/*.css`. * Remove wiki and people directories. * Some documentation fixes. * Left out `minimal.css` changes and boostbook changes because of clashes. [SVN r63347] --- doc/Jamfile.v2 | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 41c0dcc..422ea5e 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -7,9 +7,10 @@ doxygen reference : [ glob ../../../boost/logic/tribool.hpp ] [ glob ../../../boost/logic/tribool_io.hpp ] ; boostbook tribool - : - tribool.boostbook - : + : + tribool.boostbook + : + boost.root=../../../.. pdf:boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html reference - ; + ; From 5ad06c7370337a7133823f80a63292decd3a1b75 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 24 Mar 2011 20:55:46 +0000 Subject: [PATCH 14/16] Logic: merge old warning fixes. - [53429] Fix `gcc -Wshadow` warnings. Fixes #3093. - [58007] Remove unused parameter. Fixes #3600. [SVN r70520] --- include/boost/logic/tribool.hpp | 4 ++-- include/boost/logic/tribool_io.hpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/boost/logic/tribool.hpp b/include/boost/logic/tribool.hpp index 229feb4..90cba3e 100644 --- a/include/boost/logic/tribool.hpp +++ b/include/boost/logic/tribool.hpp @@ -93,7 +93,7 @@ public: * * \throws nothrow */ - tribool(bool value) : value(value? true_value : false_value) {} + tribool(bool initial_value) : value(initial_value? true_value : false_value) {} /** * Construct a new 3-state boolean value with an indeterminate value. @@ -452,7 +452,7 @@ namespace boost { #define BOOST_TRIBOOL_THIRD_STATE(Name) \ inline bool \ Name(boost::logic::tribool x, \ - boost::logic::detail::indeterminate_t dummy = \ + boost::logic::detail::indeterminate_t = \ boost::logic::detail::indeterminate_t()) \ { return x.value == boost::logic::tribool::indeterminate_value; } diff --git a/include/boost/logic/tribool_io.hpp b/include/boost/logic/tribool_io.hpp index 3a05927..9ee34d4 100644 --- a/include/boost/logic/tribool_io.hpp +++ b/include/boost/logic/tribool_io.hpp @@ -140,7 +140,8 @@ public: indeterminate_name() : name_(get_default_indeterminate_name()) {} /// Construct the facet with the given name for the indeterminate value - explicit indeterminate_name(const string_type& name) : name_(name) {} + explicit indeterminate_name(const string_type& initial_name) + : name_(initial_name) {} /// Returns the name for the indeterminate value string_type name() const { return name_; } From aede53315c9ec2ba20e1a570140bec506e33b561 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Fri, 27 May 2011 11:53:52 +0000 Subject: [PATCH 15/16] Merge root index file, and logic redirect. [SVN r72210] --- index.html | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 index.html diff --git a/index.html b/index.html new file mode 100644 index 0000000..6ae39d4 --- /dev/null +++ b/index.html @@ -0,0 +1,16 @@ + + + + + + + + +Automatic redirection failed, please go to +../../doc/html/tribool.html + + From 8cb497225694a811bb669f2b0f7dd205d3992114 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 7 Oct 2016 23:07:34 -0500 Subject: [PATCH 16/16] Add, and update, documentation build targets. --- doc/Jamfile.v2 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 5088a46..8009e32 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -24,3 +24,13 @@ boostbook tribool pdf:boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html reference ; + +############################################################################### +alias boostdoc + : tribool/docbook + : + : + : ; +explicit boostdoc ; +alias boostrelease ; +explicit boostrelease ;