From fb7ef4cf639298b8fdd0b8d7faa4d2152c16d95d Mon Sep 17 00:00:00 2001 From: Daniel James Date: Wed, 25 Oct 2017 01:16:15 +0100 Subject: [PATCH 1/7] Build documentation using consistent ids --- doc/Jamfile.v2 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 6a5b7012..13ac5162 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -9,7 +9,9 @@ using quickbook ; path-constant images_location : ../ ; path-constant admonishment_location : ../../../../doc/src/images ; -xml unordered : unordered.qbk ; +xml unordered : unordered.qbk : + generate.consistent.ids=1 ; + boostbook standalone : unordered : chunk.first.sections=1 chunk.section.depth=2 @@ -21,6 +23,8 @@ boostbook standalone : unordered : boost.compact.function=0 boost.compact.enum=0 + generate.consistent.ids=1 + # HTML Options: html:boost.root=../../../.. From cf76763ab79b6631f957c10eef2494e0c7b25fe9 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sat, 28 Oct 2017 17:34:09 +0100 Subject: [PATCH 2/7] Fix node handle description --- doc/ref.php | 21 ++++++--------------- doc/ref.xml | 36 ++++++++++++------------------------ 2 files changed, 18 insertions(+), 39 deletions(-) diff --git a/doc/ref.php b/doc/ref.php index efbca895..95c4dbb8 100644 --- a/doc/ref.php +++ b/doc/ref.php @@ -1672,21 +1672,12 @@ function echo_node_handle_docs($map) unordered_multi, that can then be inserted into a compatible container type. - - - The name and template parameters of this type is implementation - defined, and should be obtained using the node_type - member typedef from the appropriate container. - - - In this version of Boost, node_type is different - for unordered_map and unordered_multimap,' : - 'unordered_set and unordered_multiset,'; - ?> this will be fixed in a future version of Boost. - - - + + The name and template parameters of this type are implementation + defined, and should be obtained using the node_type + member typedef from the appropriate container. + + typename Container::key_type diff --git a/doc/ref.xml b/doc/ref.xml index 68bfa02c..d6c4ca0f 100644 --- a/doc/ref.xml +++ b/doc/ref.xml @@ -2840,18 +2840,12 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) unordered_multiset, that can then be inserted into a compatible container type. - - - The name and template parameters of this type is implementation - defined, and should be obtained using the node_type - member typedef from the appropriate container. - - - In this version of Boost, node_type is different - for unordered_set and unordered_multiset, this will be fixed in a future version of Boost. - - - + + The name and template parameters of this type are implementation + defined, and should be obtained using the node_type + member typedef from the appropriate container. + + typename Container::value_type> @@ -5816,18 +5810,12 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) unordered_multimap, that can then be inserted into a compatible container type. - - - The name and template parameters of this type is implementation - defined, and should be obtained using the node_type - member typedef from the appropriate container. - - - In this version of Boost, node_type is different - for unordered_map and unordered_multimap, this will be fixed in a future version of Boost. - - - + + The name and template parameters of this type are implementation + defined, and should be obtained using the node_type + member typedef from the appropriate container. + + typename Container::key_type From 9e18dc14012ea2e497289394c4dd0f826a432bf7 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sat, 28 Oct 2017 17:36:25 +0100 Subject: [PATCH 3/7] Oops, fix properly --- doc/ref.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/ref.php b/doc/ref.php index 95c4dbb8..35df3f49 100644 --- a/doc/ref.php +++ b/doc/ref.php @@ -1677,7 +1677,7 @@ function echo_node_handle_docs($map) defined, and should be obtained using the node_type member typedef from the appropriate container. - + typename Container::key_type From adfc7f4d5d13bc1462dc43be10b5d53f7ccf6c01 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sat, 28 Oct 2017 22:58:21 +0100 Subject: [PATCH 4/7] Generate ref.xml --- doc/ref.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/ref.xml b/doc/ref.xml index d6c4ca0f..05f23c87 100644 --- a/doc/ref.xml +++ b/doc/ref.xml @@ -2845,7 +2845,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) defined, and should be obtained using the node_type member typedef from the appropriate container. - + typename Container::value_type> @@ -5815,7 +5815,7 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) defined, and should be obtained using the node_type member typedef from the appropriate container. - + typename Container::key_type From 8f7b7ca7b3600092f3727413043ac3372ce9195b Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sun, 29 Oct 2017 16:52:46 +0000 Subject: [PATCH 5/7] Update clang format comment for 4.0.0 --- _clang-format | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_clang-format b/_clang-format index b8a4f24c..d892b414 100644 --- a/_clang-format +++ b/_clang-format @@ -3,8 +3,8 @@ # 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) -# Using clang format 3.8 -# http://llvm.org/releases/3.8.0/tools/clang/docs/ClangFormatStyleOptions.html +# Using clang format 4.0 +# http://llvm.org/releases/4.0.0/tools/clang/docs/ClangFormatStyleOptions.html # Becuase you have to start somewhere. BasedOnStyle: LLVM From c50ba694a56ee1996605f9dbdef9f894f137cffa Mon Sep 17 00:00:00 2001 From: Daniel James Date: Fri, 10 Nov 2017 15:12:09 +0000 Subject: [PATCH 6/7] Use quickbook 1.7 --- doc/unordered.qbk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/unordered.qbk b/doc/unordered.qbk index a12aaa62..f3f4ebe8 100644 --- a/doc/unordered.qbk +++ b/doc/unordered.qbk @@ -3,7 +3,8 @@ / file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) ] [library Boost.Unordered - [quickbook 1.5] + [quickbook 1.7] + [compatibility-mode 1.5] [authors [James, Daniel]] [copyright 2003 2004 Jeremy B. Maitin-Shepard] [copyright 2005 2006 2007 2008 Daniel James] From b90da4a8024b0570a43ab2f5dd34a0968e596104 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Fri, 10 Nov 2017 15:12:37 +0000 Subject: [PATCH 7/7] 1.66.0 release notes --- doc/changes.qbk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/doc/changes.qbk b/doc/changes.qbk index 9fa3f753..0f7f9fbe 100644 --- a/doc/changes.qbk +++ b/doc/changes.qbk @@ -6,6 +6,8 @@ [template ticket[number]''''''#[number]''''''] +[template pull_request[number][@https://github.com/boostorg/unordered/pull/[number] GitHub #[number]]] + [section:changes Change Log] [h2 Review Version] @@ -320,4 +322,9 @@ C++11 support has resulted in some breaking changes: * `noexpect` specs for `swap` free functions. * Add missing `insert(P&&)` methods. +[h2 Boost 1.66.0] + +* Simpler move construction implementation. +* Documentation fixes ([pull_request 6]). + [endsect]