From 03248b5fd8879b751cf1f66d5f248706b6452090 Mon Sep 17 00:00:00 2001
From: nobody
Date: Tue, 21 Mar 2006 02:26:31 +0000
Subject: [PATCH 01/23] This commit was manufactured by cvs2svn to create
branch 'RC_1_34_0'.
[SVN r33417]
From 0961a6598a4001fec58ea93ff19e52bd4a5f86b7 Mon Sep 17 00:00:00 2001
From: Hartmut Kaiser
Date: Thu, 8 Jun 2006 01:39:40 +0000
Subject: [PATCH 02/23] Disambiguated certain constructs.
[SVN r34226]
---
include/boost/optional/optional.hpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/boost/optional/optional.hpp b/include/boost/optional/optional.hpp
index 47340b5..7219be0 100644
--- a/include/boost/optional/optional.hpp
+++ b/include/boost/optional/optional.hpp
@@ -133,7 +133,7 @@ class optional_base : public optional_tag
{
private :
- typedef BOOST_DEDUCED_TYPENAME detail::make_reference_content::type internal_type ;
+ typedef BOOST_DEDUCED_TYPENAME ::boost::detail::make_reference_content::type internal_type ;
typedef aligned_storage storage_type ;
From 9ccefc8349f92b516b690f8db1fe000a8266efa7 Mon Sep 17 00:00:00 2001
From: Dave Abrahams
Date: Mon, 12 Jun 2006 19:02:41 +0000
Subject: [PATCH 03/23] workaround for Borland
[SVN r34288]
---
include/boost/optional/optional.hpp | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/include/boost/optional/optional.hpp b/include/boost/optional/optional.hpp
index 7219be0..4421f4a 100644
--- a/include/boost/optional/optional.hpp
+++ b/include/boost/optional/optional.hpp
@@ -133,7 +133,11 @@ class optional_base : public optional_tag
{
private :
- typedef BOOST_DEDUCED_TYPENAME ::boost::detail::make_reference_content::type internal_type ;
+ typedef
+#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564))
+ BOOST_DEDUCED_TYPENAME
+#endif
+ ::boost::detail::make_reference_content::type internal_type ;
typedef aligned_storage storage_type ;
From 4599ae0bfde05e1961d039cd9d414356b295cbcd Mon Sep 17 00:00:00 2001
From: Gennaro Prota
Date: Thu, 20 Jul 2006 23:23:09 +0000
Subject: [PATCH 04/23] merge from head [removed unnamed namespace (see
http://lists.boost.org/Archives/boost/2006/07/107873.php); usual
copyright/license/url fixes]
[SVN r34647]
---
include/boost/none.hpp | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/include/boost/none.hpp b/include/boost/none.hpp
index 693dbdf..b0e94a2 100644
--- a/include/boost/none.hpp
+++ b/include/boost/none.hpp
@@ -1,10 +1,10 @@
// Copyright (C) 2003, Fernando Luis Cacciola Carballal.
//
-// Use, modification, and distribution is subject to the Boost Software
-// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// 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)
//
-// See http://www.boost.org/lib/optional for documentation.
+// See http://www.boost.org/lib/optional/ for documentation.
//
// You are welcome to contact the author at:
// fernando_cacciola@hotmail.com
@@ -16,15 +16,12 @@
// NOTE: Borland users have to include this header outside any precompiled headers
// (bcc<=5.64 cannot include instance data in a precompiled header)
+// -- * To be verified, now that there's no unnamed namespace
namespace boost {
-namespace {
-
none_t const none = ((none_t)0) ;
-}
-
} // namespace boost
#endif
From 5182283649b87ecf1e1daeaff62edeb3d92fee8c Mon Sep 17 00:00:00 2001
From: Dave Abrahams
Date: Sat, 4 Nov 2006 02:13:53 +0000
Subject: [PATCH 05/23] misused "precedence" changed to "precedent"
[SVN r35831]
---
doc/optional.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/optional.html b/doc/optional.html
index 895312d..8143319 100644
--- a/doc/optional.html
+++ b/doc/optional.html
@@ -127,7 +127,7 @@ undefined behavior
which in our case is either T
or nil_t
.
Using the Boost.Variant library, this model can be implemented
in terms of boost::variant<T,nil_t>
.
- There is precedence for a discriminated union as a model for an optional value: the
+ There is precedent for a discriminated union as a model for an optional value: the
Haskell Maybe built-in type constructor.
Thus, a discriminated union T+nil_t
serves as a conceptual foundation.
A variant<T,nil_t>
follows naturally from the traditional idiom of extending
@@ -1611,4 +1611,4 @@ the latest version of this file can be found at www.boost.org, and the boost
discussion lists