feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Daniel James
2017-11-11 18:38:48 +00:00
parent 04a0909105 b90da4a802
commit a600ef6cbb
6 changed files with 31 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
_clang-format
View File

@ -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

6
doc/Jamfile.v2
View File

@ -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 :
<xsl:param>generate.consistent.ids=1 ;
boostbook standalone : unordered :
<xsl:param>chunk.first.sections=1
<xsl:param>chunk.section.depth=2
@ -21,6 +23,8 @@ boostbook standalone : unordered :
<xsl:param>boost.compact.function=0
<xsl:param>boost.compact.enum=0
<xsl:param>generate.consistent.ids=1
# HTML Options:
<format>html:<xsl:param>boost.root=../../../..

7
doc/changes.qbk
View File

@ -6,6 +6,8 @@
[template ticket[number]'''<ulink
url="https://svn.boost.org/trac/boost/ticket/'''[number]'''">'''#[number]'''</ulink>''']
[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]

19
doc/ref.php
View File

@ -1672,20 +1672,11 @@ function echo_node_handle_docs($map)
<classname>unordered_multi<?php echo $type ?></classname>, that
can then be inserted into a compatible container type.
</para>
<notes>
<para>
The name and template parameters of this type is implementation
defined, and should be obtained using the <code>node_type</code>
member typedef from the appropriate container.
</para>
<para>
In this version of Boost, <code>node_type</code> is different
for <?php echo $map ?
'<code>unordered_map</code> and <code>unordered_multimap</code>,' :
'<code>unordered_set</code> and <code>unordered_multiset</code>,';
?> this will be fixed in a future version of Boost.
</para>
</notes>
<para>
The name and template parameters of this type are implementation
defined, and should be obtained using the <code>node_type</code>
member typedef from the appropriate container.
</para>
</purpose>
<?php if ($map): ?>
<typedef name="key_type">

32
doc/ref.xml
View File

@ -2840,17 +2840,11 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
<classname>unordered_multiset</classname>, that
can then be inserted into a compatible container type.
</para>
<notes>
<para>
The name and template parameters of this type is implementation
defined, and should be obtained using the <code>node_type</code>
member typedef from the appropriate container.
</para>
<para>
In this version of Boost, <code>node_type</code> is different
for <code>unordered_set</code> and <code>unordered_multiset</code>, this will be fixed in a future version of Boost.
</para>
</notes>
<para>
The name and template parameters of this type are implementation
defined, and should be obtained using the <code>node_type</code>
member typedef from the appropriate container.
</para>
</purpose>
<typedef name="value_type">
<type>typename Container::value_type></type>
@ -5816,17 +5810,11 @@ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
<classname>unordered_multimap</classname>, that
can then be inserted into a compatible container type.
</para>
<notes>
<para>
The name and template parameters of this type is implementation
defined, and should be obtained using the <code>node_type</code>
member typedef from the appropriate container.
</para>
<para>
In this version of Boost, <code>node_type</code> is different
for <code>unordered_map</code> and <code>unordered_multimap</code>, this will be fixed in a future version of Boost.
</para>
</notes>
<para>
The name and template parameters of this type are implementation
defined, and should be obtained using the <code>node_type</code>
member typedef from the appropriate container.
</para>
</purpose>
<typedef name="key_type">
<type>typename Container::key_type</type>

3
doc/unordered.qbk
View File

@ -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]