Merge pull request #1 from boostorg/develop

Merge to master.
Create merge base for git.
2025-06-26 12:31:40 +02:00 · 2014-05-16 08:40:43 -06:00 · 2014-04-06 14:12:46 +01:00 · 2013-09-30 00:22:10 +00:00 · 2013-09-26 13:02:51 +00:00 · 2011-05-27 11:53:52 +00:00
5 changed files with 34 additions and 15 deletions
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@ -6,4 +6,11 @@ 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 
+    :
+        <xsl:param>boost.root=../../../..
+        <format>pdf:<xsl:param>boost.url.prefix=http://www.boost.org/doc/libs/release/doc/html
+        <dependency>reference
+    ;
--- a/include/boost/logic/tribool.hpp
+++ b/include/boost/logic/tribool.hpp
@ -14,7 +14,7 @@
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>

-#if BOOST_WORKAROUND(_MSC_VER, >= 1200)
+#if defined(_MSC_VER)
 #  pragma once
 #endif

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

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

--- a/include/boost/logic/tribool_io.hpp
+++ b/include/boost/logic/tribool_io.hpp
@ -11,7 +11,7 @@
 #include <boost/detail/workaround.hpp>
 #include <boost/noncopyable.hpp>

-#if BOOST_WORKAROUND(_MSC_VER, >= 1200)
+#if defined(_MSC_VER)
 #  pragma once
 #endif

@ -104,17 +104,11 @@ template<>
 inline std::basic_string<char> get_default_indeterminate_name<char>()
 { return "indeterminate"; }

-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-// 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...
-#else
-#  ifndef BOOST_NO_WCHAR_T
+#ifndef BOOST_NO_WCHAR_T
 /// Returns the wide character string L"indeterminate".
 template<>
 inline std::basic_string<wchar_t> get_default_indeterminate_name<wchar_t>()
 { return L"indeterminate"; }
-#  endif
 #endif

 // http://www.cantrip.org/locale.html
@ -140,7 +134,8 @@ 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& 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_; }
--- a/index.html
+++ b/index.html
@ -0,0 +1,16 @@
+
+<!--
+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/tribool_io_test.cpp
+++ b/test/tribool_io_test.cpp
@ -8,6 +8,7 @@
 #include <sstream>
 #include <string>
 #include <iostream>
+#include <ios>     // for std::boolalpha

 #ifndef BOOST_NO_STD_LOCALE
 #  include <locale>
Author	SHA1	Message	Date
Marshall Clow	1dab9cd10a	Merge pull request #1 from boostorg/develop Merge to master.	2014-05-16 08:40:43 -06:00
Daniel James	2afd1a9ec6	Create merge base for git.	2014-04-06 14:12:46 +01:00
Stephen Kelly	95baf1910a	Logic: Remove obsolete MSVC version check. [SVN r86041]	2013-09-30 00:22:10 +00:00
Stephen Kelly	9f9a1e7656	Remove obsolete MSVC check from pragma guard git grep -h -B1 "^#\s*pragma once" \| grep -v pragma \| sort \| uniq is now clean. [SVN r85952]	2013-09-26 13:02:51 +00:00
Daniel James	aede53315c	Merge root index file, and logic redirect. [SVN r72210]	2011-05-27 11:53:52 +00:00
Daniel James	31af87e6ae	Tribool: add a redirect to the docs. [SVN r71603]	2011-04-29 11:03:48 +00:00
Daniel James	5ad06c7370	Logic: merge old warning fixes. - [53429] Fix `gcc -Wshadow` warnings. Fixes #3093. - [58007] Remove unused parameter. Fixes #3600. [SVN r70520]	2011-03-24 20:55:46 +00:00
Daniel James	c053ade60f	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]	2010-06-26 12:30:09 +00:00
Daniel James	9c4577cce3	Detab some jamfiles. [SVN r63343]	2010-06-26 12:10:47 +00:00
Daniel James	9e230b17ef	Update various libraries' documentation build. Mostly to use the images and css files under doc/src instead of doc/html, usually be deleting the settings in order to use the defaults. Also add 'boost.root' to some builds in order to fix links which rely on it. [SVN r63146]	2010-06-20 18:00:48 +00:00
Jeremiah Willcock	62e9529e09	Removed unused parameter; fixes #3600 [SVN r58007]	2009-11-28 17:05:54 +00:00
Troy D. Straszheim	6c6cc7dce3	rm cmake from trunk. I'm not entirely sure this is necessary to satisfy the inspect script, but I'm not taking any chances, and it is easy to put back [SVN r56942]	2009-10-17 02:07:38 +00:00
Troy D. Straszheim	b86917fe43	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]	2009-10-17 01:10:45 +00:00
John Maddock	987080a8c7	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]	2009-08-24 10:31:43 +00:00
Daniel James	5aaba307a6	Add depencies on doxygen documentation to standalone documentation targets. This seems to be needed for building pdfs. [SVN r55729]	2009-08-23 10:07:25 +00:00
Troy D. Straszheim	a582587b22	Copyrights on CMakeLists.txt to keep them from clogging up the inspect reports. This is essentially the same commit as r55095 on the release branch. [SVN r55159]	2009-07-26 00:49:56 +00:00
Troy D. Straszheim	bd737d03b0	Add basic copyright/license to keep cmake out of the inspection report [SVN r55095]	2009-07-22 21:51:01 +00:00
Vladimir Prus	246d1ee6df	Fix gcc -Wshadow warnings in tribool. Fixes #3093. 1/2 of the patch provided by Dustin Spicuzza. [SVN r53429]	2009-05-30 06:36:18 +00:00
John Maddock	58cd700623	Merge PDF build changes from Trunk. [SVN r51417]	2009-02-23 18:39:32 +00:00
John Maddock	233cfca75c	Add PDF generation options to fix external links to point to the web site. Added a few more Boostbook based libs that were missed first time around. Fixed PDF naming issues. [SVN r51284]	2009-02-17 10:05:58 +00:00
Troy D. Straszheim	951486c794	merge of cmake build files from trunk per beman [SVN r50756]	2009-01-24 18:57:20 +00:00
Michael A. Jackson	44aa483237	Updating dependency information for modularized libraries. [SVN r49628]	2008-11-07 17:05:27 +00:00
Michael A. Jackson	84313760a5	Updating CMake files to latest trunk. Added dependency information for regression tests and a few new macros for internal use. [SVN r49627]	2008-11-07 17:02:56 +00:00
Michael A. Jackson	9df9f3daf6	Continuing merge of CMake build system files into trunk with the encouragement of Doug Gregor [SVN r49510]	2008-11-01 13:15:41 +00:00
Douglas Gregor	f1d8f513bf	Merged from trunk [SVN r42973]	2008-01-25 21:18:27 +00:00
Douglas Gregor	24117db3ae	Include <ios> to get std::boolalpha. Fixes #1586 [SVN r42972]	2008-01-25 21:07:14 +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
Douglas Gregor	15b34d0bf4	Fix warnings from GCC 4.3. Fixes #1337 [SVN r40299]	2007-10-22 19:37:05 +00:00
Beman Dawes	5749fb9ef1	Starting point for releases [SVN r39706]	2007-10-05 14:25:06 +00:00
nobody	03a2600bf5	This commit was manufactured by cvs2svn to create tag 'Version_1_34_1'. [SVN r38286]	2007-07-24 19:28:14 +00:00
Rene Rivera	9e9489c7bd	Remove obsolete Boost.Build v1 files. [SVN r35880]	2006-11-06 17:10:46 +00:00
nobody	73cce598c7	This commit was manufactured by cvs2svn to create branch 'RC_1_34_0'. [SVN r33417]	2006-03-21 02:26:31 +00:00