Patches for Codegear C++ Builder 2009

[SVN r48981]
Branch for CodeGear (Borland) specific fixes
2025-12-23 23:28:18 +01:00 · 2008-09-27 08:59:20 +00:00 · 2007-09-17 20:28:43 +00:00
4 changed files with 13 additions and 31 deletions
--- 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
@@ -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

@@ -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
@@ -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
@@ -134,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>
Author	SHA1	Message	Date
Nicola Musatti	71605cba6d	Patches for Codegear C++ Builder 2009 [SVN r48981]	2008-09-27 08:59:20 +00:00
Nicola Musatti	a7c4f482bf	Branch for CodeGear (Borland) specific fixes [SVN r39356]	2007-09-17 20:28:43 +00:00