Merge pull request #1 from boostorg/develop

Merge to master.
Create merge base for git.
2025-07-29 11:47:35 +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
3 changed files with 23 additions and 12 deletions
--- 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.
@ -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>
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	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
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
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	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
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	24117db3ae	Include <ios> to get std::boolalpha. Fixes #1586 [SVN r42972]	2008-01-25 21:07:14 +00:00
Douglas Gregor	15b34d0bf4	Fix warnings from GCC 4.3. Fixes #1337 [SVN r40299]	2007-10-22 19:37:05 +00:00
Vladimir Prus	d1f46c8f98	Remove V1 Jamfiles [SVN r38516]	2007-08-08 19:02:26 +00:00
Eric Niebler	23af176127	fix typo [SVN r37572]	2007-05-03 03:28:53 +00:00
Eric Niebler	196865d37f	fix xincludes of doxygen-generated reference sections [SVN r37571]	2007-05-03 01:18:48 +00:00