merged from trunk

[SVN r49607]
post-review proto version
2025-06-26 20:41:34 +02:00 · 2008-11-06 00:15:47 +00:00 · 2008-04-05 18:00:00 +00:00
6 changed files with 28 additions and 28 deletions
--- a/CMakeLists.txt
+++ 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 
+)
+
+
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@ -6,11 +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 
-    :
-        <xsl:param>boost.root=../../../..
-        <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
-        <dependency>reference
-    ;
+boostbook tribool : tribool.boostbook ;
--- a/include/boost/logic/tribool.hpp
+++ b/include/boost/logic/tribool.hpp
@ -93,7 +93,7 @@ public:
   *
   * \throws nothrow
   */
-  tribool(bool initial_value) : value(initial_value? true_value : false_value) {}
+  tribool(bool value) : value(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 =                            \
+     boost::logic::detail::indeterminate_t dummy =                      \
       boost::logic::detail::indeterminate_t())                         \
 { return x.value == boost::logic::tribool::indeterminate_value; }

--- a/include/boost/logic/tribool_io.hpp
+++ b/include/boost/logic/tribool_io.hpp
@ -140,8 +140,7 @@ public:
  indeterminate_name() : name_(get_default_indeterminate_name<CharT>()) {}

  /// Construct the facet with the given name for the indeterminate value
-  explicit indeterminate_name(const string_type& initial_name)
-  : name_(initial_name) {}
+  explicit indeterminate_name(const string_type& name) : name_(name) {}

  /// Returns the name for the indeterminate value
  string_type name() const { return name_; }
--- a/index.html
+++ b/index.html
@ -1,16 +0,0 @@
-
-<!--
-Copyright 2011 Daniel James.
-Distributed under 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)
-->
-
-<html>
-<head>
-    <meta http-equiv="refresh" content="0; URL=../../doc/html/tribool.html">
-</head>
-<body>
-Automatic redirection failed, please go to
-<a href="../../doc/html/tribool.html">../../doc/html/tribool.html</a>
-</body>
-</html>
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@ -0,0 +1,3 @@
+boost_test_run(tribool_test)
+boost_test_run(tribool_rename_test)
+boost_test_run(tribool_io_test)
Author	SHA1	Message	Date
Eric Niebler	ab091535e5	merged from trunk [SVN r49607]	2008-11-06 00:15:47 +00:00
Eric Niebler	a50850668f	post-review proto version [SVN r44061]	2008-04-05 18:00:00 +00:00