Branch for merging Boost.Build and Boost.Jam completely.

[SVN r59143]
2010-01-19 20:47:20 +00:00
4 changed files with 13 additions and 24 deletions
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -7,10 +7,9 @@ doxygen reference : [ glob ../../../boost/logic/tribool.hpp ]
                    [ glob ../../../boost/logic/tribool_io.hpp ]
                  ;
 boostbook tribool 
-    : 
-    tribool.boostbook 
-    :
-        <xsl:param>boost.root=../../../..
+	: 
+	tribool.boostbook 
+	:
        <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 defined(_MSC_VER)
+#if BOOST_WORKAROUND(_MSC_VER, >= 1200)
 #  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 defined(_MSC_VER)
+#if BOOST_WORKAROUND(_MSC_VER, >= 1200)
 #  pragma once
 #endif

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

-#ifndef BOOST_NO_WCHAR_T
+#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
 /// 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
@@ -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>