Djam/boost
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/boost.git synced 2025-04-11 08:44:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

1.74.0

Browse source
This commit is contained in:
alexander stefanov 2020-12-08 15:05:46 +00:00
parent 5ddc3fa832
commit 401b64b240
12 changed files with 14 additions and 1097 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,2 +1,2 @@
sources:
boost_1_73_0.tar.bz2: 6d6ed02b29c860fd21b274fc4e1f820855e765e9
boost_1_74_0.tar.bz2: f82c0d8685b4d0e3971e8e2a8f9ef1551412c125

485
10.patch
View file

@ -1,485 +0,0 @@
diff -up boost_1_73_0/boost/bimap/container_adaptor/support/iterator_facade_converters.hpp.12~ boost_1_73_0/boost/bimap/container_adaptor/support/iterator_facade_converters.hpp
--- boost_1_73_0/boost/bimap/container_adaptor/support/iterator_facade_converters.hpp.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/boost/bimap/container_adaptor/support/iterator_facade_converters.hpp 2020-04-29 14:31:09.750214421 +0200
@@ -28,7 +28,7 @@ namespace support {
/// \brief Converter for Boost.Iterators based iterators.
/**
-Container adaptor is dessigned to play well with Boost.Iterators. This
+Container adaptor is designed to play well with Boost.Iterators. This
converter can be used if this library is used to adapt the iterators.
**/
template
diff -up boost_1_73_0/boost/bimap/detail/bimap_core.hpp.12~ boost_1_73_0/boost/bimap/detail/bimap_core.hpp
--- boost_1_73_0/boost/bimap/detail/bimap_core.hpp.12~ 2020-04-29 14:31:09.748214394 +0200
+++ boost_1_73_0/boost/bimap/detail/bimap_core.hpp 2020-04-29 14:31:09.750214421 +0200
@@ -266,7 +266,7 @@ class bimap_core
// If it is based either on the left or on the right, then only the side
// indices are needed. But the set type of the relation can be completely
- // diferent from the one used for the sides in wich case we have to add yet
+ // different from the one used for the sides in which case we have to add yet
// another index to the core.
// TODO
@@ -309,7 +309,7 @@ class bimap_core
relation_set_type_of;
// Logic tags
- // This is a necesary extra level of indirection to allow unconstrained
+ // This is a necessary extra level of indirection to allow unconstrained
// sets to be plug in the design. The bimap constructors use this logic
// tags.
@@ -452,7 +452,7 @@ class bimap_core
typedef bimap_core bimap_core_;
};
-// Two auxiliar metafunctions to compute the map view types
+// Two auxiliary metafunctions to compute the map view types
// The map view type can not be computed inside the bimap core because a
// they need the bimap core to be parsed first.
diff -up boost_1_73_0/boost/bimap/detail/concept_tags.hpp.12~ boost_1_73_0/boost/bimap/detail/concept_tags.hpp
--- boost_1_73_0/boost/bimap/detail/concept_tags.hpp.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/boost/bimap/detail/concept_tags.hpp 2020-04-29 14:31:09.750214421 +0200
@@ -34,7 +34,7 @@ metafunctions. For example now is easy t
struct set_type_of_tag {};
-/// \brief Tag of {SetType}_of_relation defition classes
+/// \brief Tag of {SetType}_of_relation definition classes
struct set_type_of_relation_tag {};
@@ -68,7 +68,7 @@ See also left_based.
struct left_based : ::boost::bimaps::detail::side_based_tag
{
// I run into troubles if I do not define bind for side based tags.
- // Maybe a more coherent way of binding the relation can be developped.
+ // Maybe a more coherent way of binding the relation can be developed.
template< class Relation > struct bind_to { typedef void type; };
typedef mpl::bool_<true> left_mutable_key;
@@ -78,7 +78,7 @@ struct left_based : ::boost::bimaps::det
struct right_based : ::boost::bimaps::detail::side_based_tag
{
// I run into troubles if I do not define bind for side based tags.
- // Maybe a more coherent way of binding the relation can be developped.
+ // Maybe a more coherent way of binding the relation can be developed.
template< class Relation > struct bind_to { typedef void type; };
typedef mpl::bool_<true> left_mutable_key;
diff -up boost_1_73_0/boost/bimap/relation/member_at.hpp.12~ boost_1_73_0/boost/bimap/relation/member_at.hpp
--- boost_1_73_0/boost/bimap/relation/member_at.hpp.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/boost/bimap/relation/member_at.hpp 2020-04-29 14:31:09.750214421 +0200
@@ -25,7 +25,7 @@ namespace relation {
/// \brief member_at::side idiom to access relation values and types using metaprogramming.
/**
-This tags are used to specify which member you want to acces when using a metafunction over
+This tags are used to specify which member you want to access when using a metafunction over
a symmetrical type. The idea is to be able to write code like:
\code
@@ -44,7 +44,7 @@ namespace member_at {
/// \brief Member at left tag
/**
- See also member_at, rigth.
+ See also member_at, right.
**/
struct left {};
diff -up boost_1_73_0/boost/bimap/relation/structured_pair.hpp.12~ boost_1_73_0/boost/bimap/relation/structured_pair.hpp
--- boost_1_73_0/boost/bimap/relation/structured_pair.hpp.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/boost/bimap/relation/structured_pair.hpp 2020-04-29 14:31:09.750214421 +0200
@@ -254,7 +254,7 @@ class mutant_relation;
/// \brief A std::pair signature compatible class that allows you to control
/// the internal structure of the data.
/**
-This class allows you to specify the order in wich the two data types will be
+This class allows you to specify the order in which the two data types will be
in the layout of the class.
**/
diff -up boost_1_73_0/boost/bimap/relation/support/get.hpp.12~ boost_1_73_0/boost/bimap/relation/support/get.hpp
--- boost_1_73_0/boost/bimap/relation/support/get.hpp.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/boost/bimap/relation/support/get.hpp 2020-04-29 14:31:09.750214421 +0200
@@ -60,13 +60,13 @@ namespace relation {
namespace support {
// Since it is very error-prone to directly write the hole bunch
-// of relation accesor. They are buil from litle macro blocks that
+// of relation accesor. They are built from little macro blocks that
// are both more readable, leading to self docummenting code and a
-// lot more easier to understand and mantain.
+// lot more easier to understand and maintain.
// It is very important to note that the three building blocks have
// to laid in the same namespace in order to work. There is also
// important to keep them in order.
-// The forward declaration are not necesary but they help a lot to
+// The forward declaration are not necessary but they help a lot to
// the reader, as they undercover what is the signature of the
// result code.
// In the end, it is not quicker to do it in this way because you
diff -up boost_1_73_0/boost/bimap/relation/support/is_tag_of_member_at.hpp.12~ boost_1_73_0/boost/bimap/relation/support/is_tag_of_member_at.hpp
--- boost_1_73_0/boost/bimap/relation/support/is_tag_of_member_at.hpp.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/boost/bimap/relation/support/is_tag_of_member_at.hpp 2020-04-29 14:31:09.750214421 +0200
@@ -27,7 +27,7 @@
/** \struct boost::bimaps::relation::support::is_tag_of_member_at_left
-\brief Metafunction to test if a user tag is refering to the left member.
+\brief Metafunction to test if a user tag is referring to the left member.
\code
@@ -53,7 +53,7 @@ See also member_with_tag, member_at, is_
/** \struct boost::bimaps::relation::support::is_tag_of_member_at_right
-\brief Metafunction to test if a user tag is refering to the left member.
+\brief Metafunction to test if a user tag is referring to the left member.
\code
diff -up boost_1_73_0/boost/bimap/relation/support/pair_by.hpp.12~ boost_1_73_0/boost/bimap/relation/support/pair_by.hpp
--- boost_1_73_0/boost/bimap/relation/support/pair_by.hpp.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/boost/bimap/relation/support/pair_by.hpp 2020-04-29 14:31:09.750214421 +0200
@@ -54,13 +54,13 @@ namespace support {
// Since it is very error-prone to directly write the hole bunch
-// of relation accesor. They are buil from litle macro blocks that
+// of relation accesor. They are built from little macro blocks that
// are both more readable, leading to self docummenting code and a
-// lot more easier to understand and mantain.
+// lot more easier to understand and maintain.
// It is very important to note that the three building blocks have
// to laid in the same namespace in order to work. There is also
// important to keep them in order.
-// The forward declaration are not necesary but they help a lot to
+// The forward declaration are not necessary but they help a lot to
// the reader, as they undercover what is the signature of the
// result code.
// In the end, it is not quicker to do it in this way because you
diff -up boost_1_73_0/boost/bimap/relation/symmetrical_base.hpp.12~ boost_1_73_0/boost/bimap/relation/symmetrical_base.hpp
--- boost_1_73_0/boost/bimap/relation/symmetrical_base.hpp.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/boost/bimap/relation/symmetrical_base.hpp 2020-04-29 14:31:09.750214421 +0200
@@ -32,7 +32,7 @@ namespace boost {
namespace bimaps {
namespace relation {
-/// \brief Base of symetrical tagged types.
+/// \brief Base of symmetrical tagged types.
/**
**/
diff -up boost_1_73_0/boost/bimap/support/map_by.hpp.12~ boost_1_73_0/boost/bimap/support/map_by.hpp
--- boost_1_73_0/boost/bimap/support/map_by.hpp.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/boost/bimap/support/map_by.hpp 2020-04-29 14:31:09.750214421 +0200
@@ -68,13 +68,13 @@ namespace bimaps {
namespace support {
// Since it is very error-prone to directly write the hole bunch
-// of relation accesor. They are buil from litle macro blocks that
+// of relation accesor. They are built from little macro blocks that
// are both more readable, leading to self docummenting code and a
-// lot more easier to understand and mantain.
+// lot more easier to understand and maintain.
// It is very important to note that the three building blocks have
// to laid in the same namespace in order to work. There is also
// important to keep them in order.
-// The forward declaration are not necesary but they help a lot to
+// The forward declaration are not necessary but they help a lot to
// the reader, as they undercover what is the signature of the
// result code.
// In the end, it is not quicker to do it in this way because you
diff -up boost_1_73_0/boost/bimap/tags/support/apply_to_value_type.hpp.12~ boost_1_73_0/boost/bimap/tags/support/apply_to_value_type.hpp
--- boost_1_73_0/boost/bimap/tags/support/apply_to_value_type.hpp.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/boost/bimap/tags/support/apply_to_value_type.hpp 2020-04-29 14:31:09.751214434 +0200
@@ -38,7 +38,7 @@ struct apply_to_value_type
\endcode
This higher order metafunctions is very useful, and it can be used with lambda
-expresions.
+expressions.
See also tagged.
**/
diff -up boost_1_73_0/boost/bimap/tags/support/tag_of.hpp.12~ boost_1_73_0/boost/bimap/tags/support/tag_of.hpp
--- boost_1_73_0/boost/bimap/tags/support/tag_of.hpp.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/boost/bimap/tags/support/tag_of.hpp 2020-04-29 14:31:09.751214434 +0200
@@ -7,7 +7,7 @@
// http://www.boost.org/LICENSE_1_0.txt)
/// \file tags/support/tag_of.hpp
-/// \brief Safe way to acces the tag of a type
+/// \brief Safe way to access the tag of a type
#ifndef BOOST_BIMAP_TAGS_SUPPORT_TAG_OF_HPP
#define BOOST_BIMAP_TAGS_SUPPORT_TAG_OF_HPP
diff -up boost_1_73_0/boost/bimap/tags/support/value_type_of.hpp.12~ boost_1_73_0/boost/bimap/tags/support/value_type_of.hpp
--- boost_1_73_0/boost/bimap/tags/support/value_type_of.hpp.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/boost/bimap/tags/support/value_type_of.hpp 2020-04-29 14:31:09.751214434 +0200
@@ -32,7 +32,7 @@ struct value_type_of
\endcode
If the type is tagged this metafunction returns Type::value_type, and if it is not
-tagged it return the same type. This allows to work consistenly with tagged and
+tagged it return the same type. This allows to work consistently with tagged and
untagged types.
See also tagged, tag_of.
diff -up boost_1_73_0/boost/bimap/tags/tagged.hpp.12~ boost_1_73_0/boost/bimap/tags/tagged.hpp
--- boost_1_73_0/boost/bimap/tags/tagged.hpp.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/boost/bimap/tags/tagged.hpp 2020-04-29 14:31:09.751214434 +0200
@@ -92,7 +92,7 @@ struct tagged
\brief Metafunctions to work with tagged types.
This metafunctions aims to make easier the manage of tagged types. They are all mpl
-compatible metafunctions and can be used with lambda expresions.
+compatible metafunctions and can be used with lambda expressions.
The metafunction value_type_of and tag_of get the data in a tagged type in a secure
and consistent way.
default_tagged and overwrite_tagged allows to work with the tag of a tagged type,
diff -up boost_1_73_0/libs/bimap/doc/bimap_and_boost.qbk.12~ boost_1_73_0/libs/bimap/doc/bimap_and_boost.qbk
--- boost_1_73_0/libs/bimap/doc/bimap_and_boost.qbk.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/libs/bimap/doc/bimap_and_boost.qbk 2020-04-29 14:31:09.749214408 +0200
@@ -328,7 +328,7 @@ The following code snippet
[code_bimap_and_boost_typeof_not_using_auto]
-can be rewrited as
+can be rewritten as
[code_bimap_and_boost_typeof_using_auto]
diff -up boost_1_73_0/libs/bimap/doc/compiler_specifics.qbk.12~ boost_1_73_0/libs/bimap/doc/compiler_specifics.qbk
--- boost_1_73_0/libs/bimap/doc/compiler_specifics.qbk.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/libs/bimap/doc/compiler_specifics.qbk 2020-04-29 14:31:09.749214408 +0200
@@ -52,7 +52,7 @@ can be cause buffer overruns or other po
See http://msdn.microsoft.com/msdnmag/issues/05/05/SafeCandC/default.aspx
But the wording of the warning is misleading and unsettling, there are no
portable alternative functions, and VC++ 8.0's own libraries use the
-functions in question. In order to turn off the warnings add the followings
+functions in question. In order to turn off the warnings add the following
defines at the begging of your .cpp files:
#define _CRT_SECURE_NO_DEPRECATE
diff -up boost_1_73_0/libs/bimap/doc/html/boost_bimap/bimap_and_boost/boost_libraries_that_work_well_with_boost_bimap.html.12~ boost_1_73_0/libs/bimap/doc/html/boost_bimap/bimap_and_boost/boost_libraries_that_work_well_with_boost_bimap.html
--- boost_1_73_0/libs/bimap/doc/html/boost_bimap/bimap_and_boost/boost_libraries_that_work_well_with_boost_bimap.html.12~ 2020-04-22 15:41:02.000000000 +0200
+++ boost_1_73_0/libs/bimap/doc/html/boost_bimap/bimap_and_boost/boost_libraries_that_work_well_with_boost_bimap.html 2020-04-29 14:31:09.749214408 +0200
@@ -352,7 +352,7 @@
<td width="5%" valign="top" align="left"><p><a name="boost_bimap.bimap_and_boost.boost_libraries_that_work_well_with_boost_bimap.boost_serialization.c3"></a><a href="#boost_bimap.bimap_and_boost.boost_libraries_that_work_well_with_boost_bimap.boost_serialization.c2"><img src="../../../../../../doc/src/images/callouts/2.png" alt="2" border="0"></a> </p></td>
<td valign="top" align="left"><p>
We can only serialize iterators if the bimap was serialized first.
- Note that the const cast is not requiered here because we create our
+ Note that the const cast is not required here because we create our
iterators as const.
</p></td>
</tr>
@@ -768,7 +768,7 @@
<p>
</p>
<p>
- can be rewrited as
+ can be rewritten as
</p>
<p>
</p>
diff -up boost_1_73_0/libs/bimap/doc/html/boost_bimap/compiler_specifics.html.12~ boost_1_73_0/libs/bimap/doc/html/boost_bimap/compiler_specifics.html
--- boost_1_73_0/libs/bimap/doc/html/boost_bimap/compiler_specifics.html.12~ 2020-04-22 15:41:04.000000000 +0200
+++ boost_1_73_0/libs/bimap/doc/html/boost_bimap/compiler_specifics.html 2020-04-29 14:31:09.749214408 +0200
@@ -345,7 +345,7 @@
See http://msdn.microsoft.com/msdnmag/issues/05/05/SafeCandC/default.aspx But
the wording of the warning is misleading and unsettling, there are no portable
alternative functions, and VC++ 8.0's own libraries use the functions in question.
- In order to turn off the warnings add the followings defines at the begging
+ In order to turn off the warnings add the following defines at the begging
of your .cpp files:
</p>
<pre class="programlisting"><span class="preprocessor">#define</span> <span class="identifier">_CRT_SECURE_NO_DEPRECATE</span>
diff -up boost_1_73_0/libs/bimap/doc/html/boost_bimap/examples/multiindex_to_bimap_path___hashed_indices.html.12~ boost_1_73_0/libs/bimap/doc/html/boost_bimap/examples/multiindex_to_bimap_path___hashed_indices.html
--- boost_1_73_0/libs/bimap/doc/html/boost_bimap/examples/multiindex_to_bimap_path___hashed_indices.html.12~ 2020-04-22 15:41:05.000000000 +0200
+++ boost_1_73_0/libs/bimap/doc/html/boost_bimap/examples/multiindex_to_bimap_path___hashed_indices.html 2020-04-29 14:31:09.749214408 +0200
@@ -63,7 +63,7 @@
<span class="keyword">using</span> <span class="keyword">namespace</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">multi_index</span><span class="special">;</span>
<span class="keyword">namespace</span> <span class="identifier">bl</span> <span class="special">=</span> <span class="identifier">boost</span><span class="special">::</span><span class="identifier">lambda</span><span class="special">;</span>
-<span class="comment">// word_counter keeps the ocurrences of words inserted. A hashed</span>
+<span class="comment">// word_counter keeps the occurrences of words inserted. A hashed</span>
<span class="comment">// index allows for fast checking of preexisting entries.</span>
<span class="keyword">struct</span> <span class="identifier">word_counter_entry</span>
diff -up boost_1_73_0/libs/bimap/doc/html/boost_bimap/rationale.html.12~ boost_1_73_0/libs/bimap/doc/html/boost_bimap/rationale.html
--- boost_1_73_0/libs/bimap/doc/html/boost_bimap/rationale.html.12~ 2020-04-22 15:41:05.000000000 +0200
+++ boost_1_73_0/libs/bimap/doc/html/boost_bimap/rationale.html 2020-04-29 14:31:09.749214408 +0200
@@ -277,7 +277,7 @@
you can build other container that behaves exactly as a <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">set</span><span class="special">&lt;</span><span class="keyword">int</span><span class="special">&gt;</span></code> using
<code class="computeroutput"><span class="identifier">set_adaptor</span></code> and <code class="literal">iterator_adaptor</code>.
The combined use of this two tools is very powerful. A <code class="literal">container_adaptor</code>
- can take classes that do not fulfil all the requirements of the adapted container.
+ can take classes that do not fulfill all the requirements of the adapted container.
The new container must define these missing functions.
</p>
</div>
diff -up boost_1_73_0/libs/bimap/doc/html/boost_bimap/reference/set_of_reference.html.12~ boost_1_73_0/libs/bimap/doc/html/boost_bimap/reference/set_of_reference.html
--- boost_1_73_0/libs/bimap/doc/html/boost_bimap/reference/set_of_reference.html.12~ 2020-04-22 15:41:03.000000000 +0200
+++ boost_1_73_0/libs/bimap/doc/html/boost_bimap/reference/set_of_reference.html 2020-04-29 14:31:09.749214408 +0200
@@ -1100,7 +1100,7 @@
<p>
The symmetry of bimap imposes some constraints on <code class="computeroutput"><span class="keyword">operator</span><span class="special">[]</span></code> and the non constant version of at()
that are not found in <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">maps</span></code>.
- Tey are only provided if the other collection type is mutable (<code class="computeroutput"><span class="identifier">list_of</span></code>, <code class="computeroutput"><span class="identifier">vector_of</span></code>
+ They are only provided if the other collection type is mutable (<code class="computeroutput"><span class="identifier">list_of</span></code>, <code class="computeroutput"><span class="identifier">vector_of</span></code>
and <code class="computeroutput"><span class="identifier">unconstrained_set_of</span></code>).
</p>
<a name="reference_set_of_operator_bracket_key"></a><pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">class</span> <span class="identifier">CompatibleKey</span> <span class="special">&gt;</span>
diff -up boost_1_73_0/libs/bimap/doc/html/boost_bimap/reference/unordered_set_of_reference.html.12~ boost_1_73_0/libs/bimap/doc/html/boost_bimap/reference/unordered_set_of_reference.html
--- boost_1_73_0/libs/bimap/doc/html/boost_bimap/reference/unordered_set_of_reference.html.12~ 2020-04-22 15:41:04.000000000 +0200
+++ boost_1_73_0/libs/bimap/doc/html/boost_bimap/reference/unordered_set_of_reference.html 2020-04-29 14:31:09.750214421 +0200
@@ -1013,7 +1013,7 @@
<p>
The symmetry of bimap imposes some constraints on <code class="computeroutput"><span class="keyword">operator</span><span class="special">[]</span></code> and the non constant version of at()
that are not found in <code class="computeroutput"><span class="identifier">std</span><span class="special">::</span><span class="identifier">maps</span></code>.
- Tey are only provided if the other collection type is mutable (<code class="computeroutput"><span class="identifier">list_of</span></code>, <code class="computeroutput"><span class="identifier">vector_of</span></code>
+ They are only provided if the other collection type is mutable (<code class="computeroutput"><span class="identifier">list_of</span></code>, <code class="computeroutput"><span class="identifier">vector_of</span></code>
and <code class="computeroutput"><span class="identifier">unconstrained_set_of</span></code>).
</p>
<a name="reference_unordered_set_of_operator_bracket_key"></a><pre class="programlisting"><span class="keyword">template</span><span class="special">&lt;</span> <span class="keyword">class</span> <span class="identifier">CompatibleKey</span> <span class="special">&gt;</span>
diff -up boost_1_73_0/libs/bimap/doc/html/boost_bimap/the_tutorial/bimaps_with_user_defined_names.html.12~ boost_1_73_0/libs/bimap/doc/html/boost_bimap/the_tutorial/bimaps_with_user_defined_names.html
--- boost_1_73_0/libs/bimap/doc/html/boost_bimap/the_tutorial/bimaps_with_user_defined_names.html.12~ 2020-04-29 14:31:09.750214421 +0200
+++ boost_1_73_0/libs/bimap/doc/html/boost_bimap/the_tutorial/bimaps_with_user_defined_names.html 2020-04-29 14:34:20.490735801 +0200
@@ -171,8 +171,8 @@
<span class="identifier">bm_type</span><span class="special">::</span><span class="identifier">right_iterator</span> <span class="identifier">right_iter</span> <span class="special">=</span> <span class="identifier">bm</span><span class="special">.</span><span class="identifier">right</span><span class="special">.</span><span class="identifier">begin</span><span class="special">();</span>
</pre>
<div class="table">
-<a name="boost_bimap.the_tutorial.bimaps_with_user_defined_names.t0"></a><p class="title"><b>Table 1.3. Equivalence of expresions using user defined names</b></p>
-<div class="table-contents"><table class="table" summary="Equivalence of expresions using user defined names">
+<a name="boost_bimap.the_tutorial.bimaps_with_user_defined_names.t0"></a><p class="title"><b>Table 1.3. Equivalence of expressions using user defined names</b></p>
+<div class="table-contents"><table class="table" summary="Equivalence of expressions using user defined names">
<colgroup>
<col>
<col>
diff -up boost_1_73_0/libs/bimap/doc/rationale.qbk.12~ boost_1_73_0/libs/bimap/doc/rationale.qbk
--- boost_1_73_0/libs/bimap/doc/rationale.qbk.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/libs/bimap/doc/rationale.qbk 2020-04-29 14:31:09.750214421 +0200
@@ -206,7 +206,7 @@ iterators instead of the originals. For
`std::set<int*>`, you can build other container that behaves exactly as a
`std::set<int>` using `set_adaptor` and [^iterator_adaptor]. The combined use
of this two tools is very powerful. A [^container_adaptor] can take classes
-that do not fulfil all the requirements of the adapted container. The
+that do not fulfill all the requirements of the adapted container. The
new container must define these missing functions.
[endsect]
diff -up boost_1_73_0/libs/bimap/doc/reference/list_of.qbk.12~ boost_1_73_0/libs/bimap/doc/reference/list_of.qbk
--- boost_1_73_0/libs/bimap/doc/reference/list_of.qbk.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/libs/bimap/doc/reference/list_of.qbk 2020-04-29 14:31:09.750214421 +0200
@@ -528,7 +528,7 @@ for ['Set View]. `position` is a valid d
for ['Set View] where `e` is the element pointed to by `position` and
rearranges `*position` into all the views of the `bimap`.
Rearrangement on `list_of` views does not change the position of the element
-with respect to the view; rearrangement on other views may or might not suceed.
+with respect to the view; rearrangement on other views may or might not succeed.
If the rearrangement fails, the element is erased.
* [*Postconditions:] Validity of `position` is preserved if the operation succeeds.
* [*Returns: ] `true` if the operation succeeded, `false` otherwise.
diff -up boost_1_73_0/libs/bimap/doc/reference/set_of.qbk.12~ boost_1_73_0/libs/bimap/doc/reference/set_of.qbk
--- boost_1_73_0/libs/bimap/doc/reference/set_of.qbk.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/libs/bimap/doc/reference/set_of.qbk 2020-04-29 14:31:09.750214421 +0200
@@ -818,7 +818,7 @@ throws `std::out_of_range` if such key d
The symmetry of bimap imposes some constraints on `operator[]` and the
non constant version of at() that are not found in `std::maps`.
-Tey are only provided if the other collection type is mutable
+They are only provided if the other collection type is mutable
(`list_of`, `vector_of` and `unconstrained_set_of`).
[#reference_set_of_operator_bracket_key]
diff -up boost_1_73_0/libs/bimap/doc/reference/unordered_set_of.qbk.12~ boost_1_73_0/libs/bimap/doc/reference/unordered_set_of.qbk
--- boost_1_73_0/libs/bimap/doc/reference/unordered_set_of.qbk.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/libs/bimap/doc/reference/unordered_set_of.qbk 2020-04-29 14:31:09.750214421 +0200
@@ -695,7 +695,7 @@ throws `std::out_of_range` if such key d
The symmetry of bimap imposes some constraints on `operator[]` and the
non constant version of at() that are not found in `std::maps`.
-Tey are only provided if the other collection type is mutable
+They are only provided if the other collection type is mutable
(`list_of`, `vector_of` and `unconstrained_set_of`).
diff -up boost_1_73_0/libs/bimap/doc/reference/vector_of.qbk.12~ boost_1_73_0/libs/bimap/doc/reference/vector_of.qbk
--- boost_1_73_0/libs/bimap/doc/reference/vector_of.qbk.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/libs/bimap/doc/reference/vector_of.qbk 2020-04-29 14:31:09.750214421 +0200
@@ -574,7 +574,7 @@ for ['Set View] where e is the element p
rearranges `*position` into all the views of the `bimap`.
Rearrangement on `vector_of` views does not change the position of the
element with respect to the view; rearrangement on other views may or
-might not suceed. If the rearrangement fails, the element is erased.
+might not succeed. If the rearrangement fails, the element is erased.
* [*Postconditions:] Validity of `position` is preserved if the operation succeeds.
* [*Returns: ] `true` if the operation succeeded, `false` otherwise.
* [link vector_of_complexity_signature [*Complexity:]] O(M(n)).
diff -up boost_1_73_0/libs/bimap/doc/tutorial.qbk.12~ boost_1_73_0/libs/bimap/doc/tutorial.qbk
--- boost_1_73_0/libs/bimap/doc/tutorial.qbk.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/libs/bimap/doc/tutorial.qbk 2020-04-29 14:31:09.750214421 +0200
@@ -811,7 +811,7 @@ the untagged version structures.
-[table Equivalence of expresions using user defined names
+[table Equivalence of expressions using user defined names
[[Untagged version] [Tagged version] ]
[[`bm.left`] [`bm.by<Left>()`] ]
[[`bm.right`] [`bm.by<Right>()`] ]
diff -up boost_1_73_0/libs/bimap/example/bimap_and_boost/serialization.cpp.12~ boost_1_73_0/libs/bimap/example/bimap_and_boost/serialization.cpp
--- boost_1_73_0/libs/bimap/example/bimap_and_boost/serialization.cpp.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/libs/bimap/example/bimap_and_boost/serialization.cpp 2020-04-29 14:31:09.750214421 +0200
@@ -52,7 +52,7 @@ int main()
rationale behind this decision >*/
/*<< We can only serialize iterators if the bimap was serialized first.
- Note that the const cast is not requiered here because we create
+ Note that the const cast is not required here because we create
our iterators as const. >>*/
const bm_type::left_iterator left_iter = bm.left.find("two");
oa << left_iter;
diff -up boost_1_73_0/libs/bimap/example/mi_to_b_path/mi_hashed_indices.cpp.12~ boost_1_73_0/libs/bimap/example/mi_to_b_path/mi_hashed_indices.cpp
--- boost_1_73_0/libs/bimap/example/mi_to_b_path/mi_hashed_indices.cpp.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/libs/bimap/example/mi_to_b_path/mi_hashed_indices.cpp 2020-04-29 14:31:09.750214421 +0200
@@ -29,7 +29,7 @@ Boost.MultiIndex
using namespace boost::multi_index;
namespace bl = boost::lambda;
-// word_counter keeps the ocurrences of words inserted. A hashed
+// word_counter keeps the occurrences of words inserted. A hashed
// index allows for fast checking of preexisting entries.
struct word_counter_entry
diff -up boost_1_73_0/libs/bimap/example/step_by_step.cpp.12~ boost_1_73_0/libs/bimap/example/step_by_step.cpp
--- boost_1_73_0/libs/bimap/example/step_by_step.cpp.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/libs/bimap/example/step_by_step.cpp 2020-04-29 14:31:09.750214421 +0200
@@ -23,7 +23,7 @@
#include <iostream>
#include <cassert>
-// A convinience header is avaiable in the boost directory:
+// A convenience header is available in the boost directory:
#include <boost/bimap.hpp>
int main()
diff -up boost_1_73_0/libs/bimap/test/test_structured_pair.cpp.12~ boost_1_73_0/libs/bimap/test/test_structured_pair.cpp
--- boost_1_73_0/libs/bimap/test/test_structured_pair.cpp.12~ 2020-04-22 15:34:51.000000000 +0200
+++ boost_1_73_0/libs/bimap/test/test_structured_pair.cpp 2020-04-29 14:31:09.751214434 +0200
@@ -70,7 +70,7 @@ void test_basic()
using namespace boost::bimaps::relation;
- // Instanciate two pairs and test the storage alignmentDataData
+ // Instantiate two pairs and test the storage alignmentDataData
typedef structured_pair< short, double, normal_layout > pair_type;
typedef structured_pair< double, short, mirror_layout > mirror_type;

156
12.patch
View file

@ -1,156 +0,0 @@
From 7daa6c1b158a1dd3699c3e6b06008b2ca984dfb2 Mon Sep 17 00:00:00 2001
From: CromwellEnage <32967088+CromwellEnage@users.noreply.github.com>
Date: Sun, 30 Sep 2018 02:53:54 -0400
Subject: [PATCH] Update unordered_associative_container_adaptor
The unordered_associative_container_adaptor base class now implements member functions hash_function(), key_eq(), and reserve().
---
...nordered_associative_container_adaptor.hpp | 15 +++++++++
test/test_bimap.hpp | 12 +++++++
test/test_bimap_unordered.cpp | 31 +++++++++++++++++++
3 files changed, 58 insertions(+)
diff --git a/boost/bimap/container_adaptor/unordered_associative_container_adaptor.hpp b/boost/bimap/container_adaptor/unordered_associative_container_adaptor.hpp
index 7ecffcf..b945f1c 100755
--- a/boost/bimap/container_adaptor/unordered_associative_container_adaptor.hpp
+++ b/boost/bimap/container_adaptor/unordered_associative_container_adaptor.hpp
@@ -184,6 +184,16 @@ class unordered_associative_container_adaptor :
// bucket interface:
+ hasher hash_function() const
+ {
+ return this->base().hash_function();
+ }
+
+ key_equal key_eq() const
+ {
+ return this->base().key_eq();
+ }
+
BOOST_DEDUCED_TYPENAME base_::size_type bucket_count() const
{
return this->base().bucket_count();
@@ -260,6 +270,11 @@ class unordered_associative_container_adaptor :
return this->base().rehash(n);
}
+ void reserve(BOOST_DEDUCED_TYPENAME base_::size_type count)
+ {
+ return this->base().reserve(count);
+ }
+
// We have redefined end and begin so we have to manually route the old ones
BOOST_DEDUCED_TYPENAME base_::iterator begin()
diff --git a/libs/bimap/test/test_bimap.hpp b/libs/bimap/test/test_bimap.hpp
index 973fb6f..3bc09ab 100644
--- a/libs/bimap/test/test_bimap.hpp
+++ b/libs/bimap/test/test_bimap.hpp
@@ -307,6 +307,7 @@ template< class Container, class Data >
void test_simple_unordered_associative_container(Container & c, const Data & d)
{
c.clear();
+ c.reserve( std::distance(d.begin(), d.end()) );
c.insert( d.begin(), d.end() );
BOOST_CHECK( c.bucket_count() * c.max_load_factor() >= d.size() );
@@ -326,9 +327,13 @@ void test_simple_unordered_associative_container(Container & c, const Data & d)
{
const Container & const_c = c;
+ // Hash collisions should have no effect on the correctness of an
+ // unordered simple associative container. -- Cromwell D. Enage
+/*
BOOST_CHECK(
const_c.bucket_size(const_c.bucket(*di)) == 1
);
+*/
typename Container::size_type nb =
const_c.bucket(*const_c.find(*di));
@@ -394,6 +399,7 @@ template< class Container, class Data >
void test_pair_unordered_associative_container(Container & c, const Data & d)
{
c.clear();
+ c.reserve( std::distance(d.begin(), d.end()) );
c.insert( d.begin(), d.end() );
BOOST_CHECK( c.bucket_count() * c.max_load_factor() >= d.size() );
@@ -414,7 +420,13 @@ void test_pair_unordered_associative_container(Container & c, const Data & d)
{
const Container & const_c = c;
+ // The test commented out below fails on 32-bit Windows platforms
+ // but works on 64-bit Windows platforms and others. Regardless,
+ // hash collisions should have no effect on the correctness of an
+ // unordered pair associative container. -- Cromwell D. Enage
+/*
BOOST_CHECK( const_c.bucket_size(const_c.bucket(di->first)) == 1 );
+*/
typename Container::size_type nb =
const_c.bucket(const_c.find(di->first)->first);
diff --git a/libs/bimap/test/test_bimap_unordered.cpp b/libs/bimap/test/test_bimap_unordered.cpp
index 6cba88b..8713642 100644
--- a/libs/bimap/test/test_bimap_unordered.cpp
+++ b/libs/bimap/test/test_bimap_unordered.cpp
@@ -79,6 +79,15 @@ void test_bimap()
test_unordered_set_unordered_multiset_bimap(
bm,data,left_data,right_data
);
+
+ BOOST_CHECK((
+ bm.left.hash_function()(' ') == bm.left.hash_function()(' ')
+ ));
+ BOOST_CHECK((
+ bm.right.hash_function()(" ") == bm.right.hash_function()(" ")
+ ));
+ BOOST_CHECK((bm.left.key_eq()(' ', ' ')));
+ BOOST_CHECK((bm.right.key_eq()(" ", " ")));
}
//--------------------------------------------------------------------
@@ -103,6 +112,15 @@ void test_bimap()
bm,data,left_data,right_data
);
test_tagged_bimap<left_tag,right_tag>(bm,data);
+
+ BOOST_CHECK((
+ bm.left.hash_function()(' ') == bm.left.hash_function()(' ')
+ ));
+ BOOST_CHECK((
+ bm.right.hash_function()(" ") == bm.right.hash_function()(" ")
+ ));
+ BOOST_CHECK((bm.left.key_eq()(' ', ' ')));
+ BOOST_CHECK((bm.right.key_eq()(" ", " ")));
}
//--------------------------------------------------------------------
@@ -128,6 +146,11 @@ void test_bimap()
test_basic_bimap(bm,data,left_data,right_data);
test_associative_container(bm,data);
test_simple_unordered_associative_container(bm,data);
+
+ BOOST_CHECK((
+ bm.right.hash_function()(" ") == bm.right.hash_function()(" ")
+ ));
+ BOOST_CHECK((bm.right.key_eq()(" ", " ")));
}
//--------------------------------------------------------------------
@@ -154,6 +177,14 @@ void test_bimap()
test_associative_container(bm,data);
test_simple_unordered_associative_container(bm,data);
+ BOOST_CHECK((
+ bm.left.hash_function()(' ') == bm.left.hash_function()(' ')
+ ));
+ BOOST_CHECK((
+ bm.right.hash_function()(" ") == bm.right.hash_function()(" ")
+ ));
+ BOOST_CHECK((bm.left.key_eq()(' ', ' ')));
+ BOOST_CHECK((bm.right.key_eq()(" ", " ")));
}
//--------------------------------------------------------------------
}

200
14.patch
View file

@ -1,200 +0,0 @@
From cf63a1169cc4d77ca8c9ff17dd11e6dc84c3970b Mon Sep 17 00:00:00 2001
From: CromwellEnage <32967088+CromwellEnage@users.noreply.github.com>
Date: Sun, 30 Sep 2018 08:55:10 -0400
Subject: [PATCH] Update test_bimap_modify.cpp
Added BOOST_CHECK statements, some as requested by previous code comments.
---
test/test_bimap_modify.cpp | 137 +++++++++++++++++++++++++++++++++++--
1 file changed, 130 insertions(+), 7 deletions(-)
diff --git a/libs/bimap/test/test_bimap_modify.cpp b/libs/bimap/test/test_bimap_modify.cpp
index 2f2cbaa..945978d 100644
--- a/libs/bimap/test/test_bimap_modify.cpp
+++ b/libs/bimap/test/test_bimap_modify.cpp
@@ -104,6 +104,7 @@ void test_bimap_modify()
BOOST_CHECK( b.size() == 1 );
BOOST_CHECK( i->left == 1 && i->right == 100 );
BOOST_CHECK( b.left.at(1) == 100 );
+ BOOST_CHECK( b.right.at(100) == 1 );
result = b.replace_left( i, 2 );
@@ -111,6 +112,7 @@ void test_bimap_modify()
BOOST_CHECK( b.size() == 1 );
BOOST_CHECK( i->left == 2 && i->right == 100 );
BOOST_CHECK( b.left.at(2) == 100 );
+ BOOST_CHECK( b.right.at(100) == 2 );
result = b.replace_right( b.begin(), 200 );
@@ -118,7 +120,7 @@ void test_bimap_modify()
BOOST_CHECK( b.size() == 1 );
BOOST_CHECK( i->left == 2 && i->right == 200 );
BOOST_CHECK( b.left.at(2) == 200 );
-
+ BOOST_CHECK( b.right.at(200) == 2 );
}
b.clear();
@@ -137,14 +139,88 @@ void test_bimap_modify()
BOOST_CHECK( b.left.at(1) == 100 );
BOOST_CHECK( b.left.at(2) == 200 );
+ result = b.left.replace_key( i, 2 );
+
+ BOOST_CHECK( ! result );
+ BOOST_CHECK( b.size() == 2 );
+ BOOST_CHECK( i->first == 1 && i->second == 100 );
+ BOOST_CHECK( b.left.at(1) == 100 );
+ BOOST_CHECK( b.left.at(2) == 200 );
+
+ result = b.left.replace_data( i, 200 );
- // Add checks for replace_key and replace_data
+ BOOST_CHECK( ! result );
+ BOOST_CHECK( b.size() == 2 );
+ BOOST_CHECK( i->first == 1 && i->second == 100 );
+ BOOST_CHECK( b.left.at(1) == 100 );
+ BOOST_CHECK( b.left.at(2) == 200 );
}
- // Add checks for fail to replace in right map view
+ // fail to replace in right map view
+ {
+ bm::right_iterator i = b.right.begin();
+
+ result = b.right.replace( i, bm::right_value_type(100,2) );
- // Add checks for fail to replace in set of relations view
+ BOOST_CHECK( !result );
+ BOOST_CHECK( b.size() == 2 );
+ BOOST_CHECK( (i->first == 100) && (i->second == 1) );
+ BOOST_CHECK( b.right.at(100) == 1 );
+ BOOST_CHECK( b.right.at(200) == 2 );
+
+ result = b.right.replace_key( i, 200 );
+
+ BOOST_CHECK( !result );
+ BOOST_CHECK( b.size() == 2 );
+ BOOST_CHECK( (i->first == 100) && (i->second == 1) );
+ BOOST_CHECK( b.right.at(100) == 1 );
+ BOOST_CHECK( b.right.at(200) == 2 );
+
+ result = b.right.replace_data( i, 2 );
+
+ BOOST_CHECK( !result );
+ BOOST_CHECK( b.size() == 2 );
+ BOOST_CHECK( (i->first == 100) && (i->second == 1) );
+ BOOST_CHECK( b.right.at(100) == 1 );
+ BOOST_CHECK( b.right.at(200) == 2 );
+ }
+
+ // fail to replace in set of relations view
+ {
+ bm::iterator i = b.begin();
+
+ result = b.replace( i, bm::value_type(2,100) );
+
+ BOOST_CHECK( !result );
+ BOOST_CHECK( b.size() == 2 );
+ BOOST_CHECK( i->left == 1 && i->right == 100 );
+ BOOST_CHECK( b.left.at(1) == 100 );
+ BOOST_CHECK( b.right.at(100) == 1 );
+ result = b.replace( i, bm::value_type(1,200) );
+
+ BOOST_CHECK( !result );
+ BOOST_CHECK( b.size() == 2 );
+ BOOST_CHECK( i->left == 1 && i->right == 100 );
+ BOOST_CHECK( b.left.at(1) == 100 );
+ BOOST_CHECK( b.right.at(100) == 1 );
+
+ result = b.replace_left( i, 2 );
+
+ BOOST_CHECK( !result );
+ BOOST_CHECK( b.size() == 2 );
+ BOOST_CHECK( i->left == 1 && i->right == 100 );
+ BOOST_CHECK( b.left.at(1) == 100 );
+ BOOST_CHECK( b.right.at(100) == 1 );
+
+ result = b.replace_right( b.begin(), 200 );
+
+ BOOST_CHECK( !result );
+ BOOST_CHECK( b.size() == 2 );
+ BOOST_CHECK( i->left == 1 && i->right == 100 );
+ BOOST_CHECK( b.left.at(1) == 100 );
+ BOOST_CHECK( b.right.at(100) == 1 );
+ }
// modify
// ----------------------------------------------------------------------
@@ -160,18 +236,65 @@ void test_bimap_modify()
BOOST_CHECK( b.size() == 1 );
BOOST_CHECK( b.left.at(2) == 100 );
- result = b.left.modify_data( b.left.begin() , _data = 200 );
+ result = b.left.modify_data( b.left.begin(), _data = 200 );
BOOST_CHECK( result );
BOOST_CHECK( b.size() == 1 );
BOOST_CHECK( b.left.at(2) == 200 );
}
- // Add checks for successful modify in right map view
+ // successful modify in right map view
+ {
+ result = b.right.modify_key( b.right.begin(), _key = 100 );
+
+ BOOST_CHECK( result );
+ BOOST_CHECK( b.size() == 1 );
+ BOOST_CHECK( b.right.at(100) == 2 );
+
+ result = b.right.modify_data( b.right.begin(), _data = 1 );
+
+ BOOST_CHECK( result );
+ BOOST_CHECK( b.size() == 1 );
+ BOOST_CHECK( b.right.at(100) == 1 );
+ }
+
+ // fail to modify in left map view
+ {
+ b.insert( bm::value_type(2,200) );
+ result = b.left.modify_key( b.left.begin(), _key = 2 );
+
+ BOOST_CHECK( !result );
+ BOOST_CHECK( b.size() == 1 );
+ BOOST_CHECK( b.left.find(1) == b.left.end() );
+ BOOST_CHECK( b.right.find(100) == b.right.end() );
+
+ b.insert( bm::value_type(1,100) );
+ result = b.left.modify_data( b.left.begin(), _data = 200 );
+
+ BOOST_CHECK( !result );
+ BOOST_CHECK( b.size() == 1 );
+ BOOST_CHECK( b.left.find(1) == b.left.end() );
+ BOOST_CHECK( b.right.find(100) == b.right.end() );
+ }
+
+ // fail to modify in right map view
+ {
+ b.insert( bm::value_type(1,100) );
+ result = b.right.modify_key( b.right.begin(), _key = 200 );
- // Add checks for fails to modify in left map view
+ BOOST_CHECK( !result );
+ BOOST_CHECK( b.size() == 1 );
+ BOOST_CHECK( b.left.find(1) == b.left.end() );
+ BOOST_CHECK( b.right.find(100) == b.right.end() );
+ b.insert( bm::value_type(1,100) );
+ result = b.right.modify_data( b.right.begin(), _data = 2 );
+ BOOST_CHECK( !result );
+ BOOST_CHECK( b.size() == 1 );
+ BOOST_CHECK( b.left.find(1) == b.left.end() );
+ BOOST_CHECK( b.right.find(100) == b.right.end() );
+ }
}
void test_bimap_replace_with_info()

117
15.patch
View file

@ -1,117 +0,0 @@
From 4745ef91c78d4d4eee4b52d78bd5d6e83445e7ce Mon Sep 17 00:00:00 2001
From: Tobias Loew <tobias.loew@steag.com>
Date: Mon, 29 Oct 2018 09:25:16 +0100
Subject: [PATCH 1/3] removed deprecated std::allocator<void>
replaced std::allocator<void> by std::allocator<char>
use std::allocator_traits for rebinding
---
include/boost/bimap/detail/bimap_core.hpp | 6 +++++-
.../boost/bimap/detail/manage_additional_parameters.hpp | 8 ++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/boost/bimap/detail/bimap_core.hpp b/boost/bimap/detail/bimap_core.hpp
index f642e96..c821a30 100644
--- a/boost/bimap/detail/bimap_core.hpp
+++ b/boost/bimap/detail/bimap_core.hpp
@@ -404,9 +404,13 @@ class bimap_core
<
relation,
core_indices,
+#ifdef BOOST_NO_CXX11_ALLOCATOR
BOOST_DEDUCED_TYPENAME parameters::allocator::
BOOST_NESTED_TEMPLATE rebind<relation>::other
-
+#else
+ BOOST_DEDUCED_TYPENAME std::allocator_traits< BOOST_DEDUCED_TYPENAME parameters::allocator >::
+ BOOST_NESTED_TEMPLATE rebind_alloc<relation>
+#endif
> core_type;
// Core metadata
diff --git a/boost/bimap/detail/manage_additional_parameters.hpp b/boost/bimap/detail/manage_additional_parameters.hpp
index d95a4f0..78d89ae 100644
--- a/boost/bimap/detail/manage_additional_parameters.hpp
+++ b/boost/bimap/detail/manage_additional_parameters.hpp
@@ -83,7 +83,7 @@ struct manage_additional_parameters
struct case_NNN
{
typedef left_based set_type_of_relation;
- typedef std::allocator<void> allocator;
+ typedef std::allocator<char> allocator;
typedef ::boost::mpl::na additional_info;
};
@@ -110,7 +110,7 @@ struct manage_additional_parameters
struct case_SNN
{
typedef AP1 set_type_of_relation;
- typedef std::allocator<void> allocator;
+ typedef std::allocator<char> allocator;
typedef ::boost::mpl::na additional_info;
};
@@ -137,7 +137,7 @@ struct manage_additional_parameters
struct case_HNN
{
typedef left_based set_type_of_relation;
- typedef std::allocator<void> allocator;
+ typedef std::allocator<char> allocator;
typedef BOOST_DEDUCED_TYPENAME AP1::value_type additional_info;
};
@@ -151,7 +151,7 @@ struct manage_additional_parameters
struct case_SHN
{
typedef AP1 set_type_of_relation;
- typedef std::allocator<void> allocator;
+ typedef std::allocator<char> allocator;
typedef BOOST_DEDUCED_TYPENAME AP2::value_type additional_info;
};
From 747a9df3d41fb0fd9f53793c0c5552cd24c38717 Mon Sep 17 00:00:00 2001
From: Tobias Loew <tobias.loew@steag.com>
Date: Thu, 8 Nov 2018 17:14:56 +0100
Subject: [PATCH 2/3] Update include/boost/bimap/detail/bimap_core.hpp
---
include/boost/bimap/detail/bimap_core.hpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/boost/bimap/detail/bimap_core.hpp b/boost/bimap/detail/bimap_core.hpp
index c821a30..e219f4e 100644
--- a/boost/bimap/detail/bimap_core.hpp
+++ b/boost/bimap/detail/bimap_core.hpp
@@ -18,6 +18,7 @@
#include <boost/config.hpp>
+#include <memory>
#include <boost/mpl/placeholders.hpp>
#include <boost/mpl/push_front.hpp>
#include <boost/mpl/if.hpp>
From 391e1d422199ab7a529789f10483ed75a7fe9808 Mon Sep 17 00:00:00 2001
From: Tobias Loew <tobias.loew@steag.com>
Date: Thu, 8 Nov 2018 17:17:57 +0100
Subject: [PATCH 3/3] Update include/boost/bimap/detail/bimap_core.hpp
---
include/boost/bimap/detail/bimap_core.hpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/boost/bimap/detail/bimap_core.hpp b/boost/bimap/detail/bimap_core.hpp
index e219f4e..be0e1ba 100644
--- a/boost/bimap/detail/bimap_core.hpp
+++ b/boost/bimap/detail/bimap_core.hpp
@@ -18,7 +18,9 @@
#include <boost/config.hpp>
+#ifndef BOOST_NO_CXX11_ALLOCATOR
#include <memory>
+#endif
#include <boost/mpl/placeholders.hpp>
#include <boost/mpl/push_front.hpp>
#include <boost/mpl/if.hpp>

29
18.patch
View file

@ -1,29 +0,0 @@
From 257664e0d09eefc690b192639813e9ef4ff33503 Mon Sep 17 00:00:00 2001
From: Romain Geissler <romain.geissler@amadeus.com>
Date: Fri, 28 Jun 2019 15:53:56 +0000
Subject: [PATCH] Avoid gcc 9 -Wdeprecated-copy warning (when you define the
copy constructor, you have to define to copy assignment operator too in C++
>= 11).
---
include/boost/bimap/detail/map_view_iterator.hpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/boost/bimap/detail/map_view_iterator.hpp b/boost/bimap/detail/map_view_iterator.hpp
index 17d43cb..7b9e196 100644
--- a/boost/bimap/detail/map_view_iterator.hpp
+++ b/boost/bimap/detail/map_view_iterator.hpp
@@ -166,6 +166,13 @@ struct const_map_view_iterator :
const_map_view_iterator(map_view_iterator<Tag,BimapCore> i)
: base_(i.base()) {}
+ const_map_view_iterator& operator=(const_map_view_iterator const & iter)
+ {
+ static_cast<base_&>(*this) = static_cast<const base_&>(iter);
+
+ return *this;
+ }
+
BOOST_DEDUCED_TYPENAME base_::reference dereference() const
{
return ::boost::bimaps::relation::support::pair_by<Tag>(*this->base());

20
boost-1.57.0-build-optflags.patch
View file

@ -1,25 +1,25 @@
diff -up boost_1_70_0/tools/build/src/tools/gcc.jam.0019~ boost_1_70_0/tools/build/src/tools/gcc.jam
--- boost_1_70_0/tools/build/src/tools/gcc.jam.0019~ 2019-04-09 21:36:57.000000000 +0200
+++ boost_1_70_0/tools/build/src/tools/gcc.jam 2019-04-12 14:23:10.519125908 +0200
@@ -569,7 +569,7 @@ rule compile.fortran ( targets * : sourc
diff -up boost_1_74_0/tools/build/src/tools/gcc.jam.9~ boost_1_74_0/tools/build/src/tools/gcc.jam
--- boost_1_74_0/tools/build/src/tools/gcc.jam.9~ 2020-08-11 16:57:21.000000000 +0200
+++ boost_1_74_0/tools/build/src/tools/gcc.jam 2020-08-14 17:43:55.676937535 +0200
@@ -577,7 +577,7 @@ rule compile.fortran ( targets * : sourc
actions compile.c++ bind PCH_FILE
{
- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)"
+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)"
- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" -c -o "$(<:W)" "$(>:W)"
+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" -c -o "$(<:W)" "$(>:W)"
}
actions compile.c bind PCH_FILE
@@ -579,7 +579,7 @@ actions compile.c bind PCH_FILE
@@ -587,7 +587,7 @@ actions compile.c bind PCH_FILE
actions compile.c++.preprocess bind PCH_FILE
{
- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)"
+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)"
- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" "$(>:W)" -E >"$(<:W)"
+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -include"$(FORCE_INCLUDES)" "$(>:W)" -E >"$(<:W)"
}
actions compile.c.preprocess bind PCH_FILE
@@ -702,13 +702,13 @@ actions compile.c.pch
@@ -704,13 +704,13 @@ actions compile.c.pch
###
# Declare flags and action for compilation.

46
boost-1.63.0-dual-python-build.patch
View file

@ -1,46 +0,0 @@
--- boost_1_63_0/tools/build/src/tools/python.jam.orig 2017-02-16 18:51:14.005483084 +0000
+++ boost_1_63_0/tools/build/src/tools/python.jam 2017-02-16 18:51:24.912497496 +0000
@@ -926,27 +926,27 @@
# for a particular target OS as the default. This makes it so that we can
# select a python interpreter with only knowledge of the target OS. And hence
# can configure different Pythons based on the target OS only.
- local toolset-requirements = [ toolset.requirements ] ;
- local toolset-target-os-requirements
- = [ property.evaluate-conditionals-in-context
- [ $(toolset-requirements).raw ] : <target-os>$(target-os) ] ;
- if ! <python> in $(toolset-target-os-requirements:G)
- {
- toolset.add-requirements <target-os>$(target-os):<python>$(version:E=default) ;
- }
+ #local toolset-requirements = [ toolset.requirements ] ;
+ #local toolset-target-os-requirements
+ # = [ property.evaluate-conditionals-in-context
+ # [ $(toolset-requirements).raw ] : <target-os>$(target-os) ] ;
+ #if ! <python> in $(toolset-target-os-requirements:G)
+ #{
+ # toolset.add-requirements <target-os>$(target-os):<python>$(version:E=default) ;
+ #}
# We also set a default requirement that assigns the first python configured
# for a particular target OS as the default. This makes it so that we can
# select a python interpreter with only knowledge of the target OS. And hence
# can configure different Pythons based on the target OS only.
- local toolset-requirements = [ toolset.requirements ] ;
- local toolset-target-os-requirements
- = [ property.evaluate-conditionals-in-context
- [ $(toolset-requirements).raw ] : <target-os>$(target-os) ] ;
- if ! <python> in $(toolset-target-os-requirements:G)
- {
- toolset.add-requirements <target-os>$(target-os):<python>$(version:E=default) ;
- }
+ #local toolset-requirements = [ toolset.requirements ] ;
+ #local toolset-target-os-requirements
+ # = [ property.evaluate-conditionals-in-context
+ # [ $(toolset-requirements).raw ] : <target-os>$(target-os) ] ;
+ #if ! <python> in $(toolset-target-os-requirements:G)
+ #{
+ # toolset.add-requirements <target-os>$(target-os):<python>$(version:E=default) ;
+ #}
# Register the right suffix for extensions.
register-extension-suffix $(extension-suffix) : $(target-requirements) ;

21
boost-1.68.0-atomics-buildfix.patch
View file

@ -1,21 +0,0 @@
diff -up boost_1_68_0/boost/atomic/detail/ops_gcc_x86_dcas.hpp.0006~ boost_1_68_0/boost/atomic/detail/ops_gcc_x86_dcas.hpp
--- boost_1_68_0/boost/atomic/detail/ops_gcc_x86_dcas.hpp.0006~ 2018-08-01 22:50:46.000000000 +0200
+++ boost_1_68_0/boost/atomic/detail/ops_gcc_x86_dcas.hpp 2018-08-10 01:08:54.617706383 +0200
@@ -119,7 +119,7 @@ struct gcc_dcas_x86
}
}
- static BOOST_FORCEINLINE storage_type load(storage_type const volatile& storage, memory_order) BOOST_NOEXCEPT
+ static BOOST_FORCEINLINE storage_type load(storage_type volatile& storage, memory_order) BOOST_NOEXCEPT
{
storage_type value;
@@ -404,7 +404,7 @@ struct gcc_dcas_x86_64
);
}
- static BOOST_FORCEINLINE storage_type load(storage_type const volatile& storage, memory_order) BOOST_NOEXCEPT
+ static BOOST_FORCEINLINE storage_type load(storage_type volatile& storage, memory_order) BOOST_NOEXCEPT
{
// Note that despite const qualification cmpxchg16b below may issue a store to the storage. The storage value
// will not change, but this prevents the storage to reside in read-only memory.

15
boost-unrecognized-option.patch
View file

@ -1,15 +0,0 @@
Index: boost_1_58_0/tools/build/src/tools/gcc.jam
===================================================================
--- boost_1_58_0.orig/tools/build/src/tools/gcc.jam
+++ boost_1_58_0/tools/build/src/tools/gcc.jam
@@ -453,10 +453,6 @@ rule setup-address-model ( targets * : s
local arch = [ feature.get-values architecture : $(properties) ] ;
if $(arch) != arm
{
- if $(model) = 32
- {
- option = -m32 ;
- }
}
# For darwin, the model can be 32_64. darwin.jam will handle that
# on its own.

3
boost.rpmlintrc
View file

@ -1,6 +1,3 @@
# For examples in boost-build
addFilter("E: devel-file-in-non-devel-package")
addFilter("W: no-dependency-on")
addFilter("W: no-documentation")
addFilter("W: obsolete-not-provided")

17
boost.spec
View file

@ -24,7 +24,7 @@
Summary: Portable C++ libraries
Name: boost
Version: 1.73.0
Version: 1.74.0
%if "%{beta}" != ""
Release: 0.%{beta}.1
Source0: https://dl.bintray.com/boostorg/beta/%{version}.%(echo %{beta} |sed -e 's,^b,beta.,')/source/boost_%{packver}_%{beta}.tar.bz2
@ -45,8 +45,6 @@ Patch4: boost-1.50.0-fix-non-utf8-files.patch
# http://www.boost.org/boost-build2/doc/html/bbv2/overview.html
Patch5: boost-1.48.0-add-bjam-man-page.patch
Patch6: boost-1.68.0-atomics-buildfix.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=756005
# https://svn.boost.org/trac/boost/ticket/6131
Patch7: boost-1.50.0-foreach.patch
@ -68,15 +66,6 @@ Patch18: boost-1.57.0-python-abi_letters.patch
Patch19: boost-1.57.0-build-optflags.patch
#Patch21: boost-unrecognized-option.patch
# Make boost-bimap compatible with current compilers
# https://github.com/boostorg/bimap/pull/15
Patch20: https://patch-diff.githubusercontent.com/raw/boostorg/bimap/pull/15.patch
# While at it, pull in other bimap fixes
Patch21: https://patch-diff.githubusercontent.com/raw/boostorg/bimap/pull/10.patch
Patch22: https://patch-diff.githubusercontent.com/raw/boostorg/bimap/pull/12.patch
Patch23: https://patch-diff.githubusercontent.com/raw/boostorg/bimap/pull/14.patch
Patch24: https://patch-diff.githubusercontent.com/raw/boostorg/bimap/pull/18.patch
BuildRequires: doxygen
BuildRequires: xsltproc
BuildRequires: bzip2-devel
@ -200,8 +189,8 @@ done)}
# There's no difference between develonly and develonly2. Just had to split
# them up because there's a limit on how big a %%expand-ed statement
# can get.
%define develonly accumulators algorithm archive asio assign attributes bimap bind circular_buffer compute convert dll dynamic_bitset exception flyweight format function functional fusion geometry hana integer lexical_cast metaparse mpi mpl msm multi_array multi_index multiprecision optional parameter phoenix poly_collection predef preprocessor process range ratio signals2 smart_ptr spirit stacktrace tr1 tti tuple type_traits units unordered utility uuid variant variant2 vmd xpressive
%define develonly2 align beast callable_traits container_hash core gil hof mp11 qvm type_index sort endian coroutine2 winapi yap safe_numerics histogram outcome static_string
%define develonly accumulators algorithm archive asio assign attributes bimap bind circular_buffer compute convert dll dynamic_bitset exception flyweight format function functional fusion geometry hana integer lexical_cast metaparse mpi mpl msm multi_array multi_index multiprecision optional parameter phoenix poly_collection predef preprocessor process range ratio signals2 smart_ptr spirit stacktrace stl_interfaces tr1 tti tuple type_traits units unordered utility uuid variant variant2 vmd xpressive
%define develonly2 align beast callable_traits container_hash core gil hof leaf mp11 pfr qvm type_index sort endian coroutine2 winapi yap safe_numerics histogram outcome static_string
%{expand:%(for lib in %develonly; do lib2=${lib/-/_}; cat <<EOF
%%global devname$lib2 %%mklibname -d boost_$lib