Merge pull request #1 from boostorg/develop

Merge to master.
Create merge base for git.
2025-06-26 04:21: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
4 changed files with 24 additions and 13 deletions
--- 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 
+    :
+        <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

--- 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
--- 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	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
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
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
John Maddock	58cd700623	Merge PDF build changes from Trunk. [SVN r51417]	2009-02-23 18:39:32 +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
Douglas Gregor	f1d8f513bf	Merged from trunk [SVN r42973]	2008-01-25 21:18:27 +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
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