boostorg/container
1
0
Fork 1
mirror of https://github.com/boostorg/container.git synced 2025-08-02 14:04:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Ion Gaztañaga
2017-03-28 14:57:09 +02:00
parent dd2205bd6a e919196b8c
commit eebd4c8cf9
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/container.qbk
View File

@@ -1221,6 +1221,8 @@ use [*Boost.Container]? There are several reasons for that:
* [@https://svn.boost.org/trac/boost/ticket/12749 Trac #12749: ['"container::pmr::polymorphic_allocator compilation error"]]. * [@https://svn.boost.org/trac/boost/ticket/12749 Trac #12749: ['"container::pmr::polymorphic_allocator compilation error"]].
* [@https://svn.boost.org/trac/boost/ticket/12915 Trac #12915: ['"Buffer overflow in boost::container::vector (affects flat_set)"]]. * [@https://svn.boost.org/trac/boost/ticket/12915 Trac #12915: ['"Buffer overflow in boost::container::vector (affects flat_set)"]].
* [@https://github.com/boostorg/container/pull/45 GitHub #45: ['"emplace_back must return reference to back(), not to *end()"]]. * [@https://github.com/boostorg/container/pull/45 GitHub #45: ['"emplace_back must return reference to back(), not to *end()"]].
* [@https://github.com/boostorg/container/pull/46 GitHub #46: ['"Fix use of propagate_on_container_swap"]].
[endsect] [endsect]
[section:release_notes_boost_1_63_00 Boost 1.63 Release] [section:release_notes_boost_1_63_00 Boost 1.63 Release]

5
include/boost/container/node_handle.hpp
View File

@@ -131,6 +131,9 @@ class node_handle
nallocator_type &node_alloc() nallocator_type &node_alloc()
{ return *static_cast<nallocator_type*>(m_nalloc_storage.address()); } { return *static_cast<nallocator_type*>(m_nalloc_storage.address()); }
const nallocator_type &node_alloc() const
{ return *static_cast<const nallocator_type*>(m_nalloc_storage.address()); }
node_pointer release() node_pointer release()
{ {
node_pointer p(m_ptr); node_pointer p(m_ptr);
@@ -323,7 +326,7 @@ class node_handle
if(was_nh_non_null){ if(was_nh_non_null){
if(was_this_non_null){ if(was_this_non_null){
if(ator_traits::propagate_on_container_swap){ if(ator_traits::propagate_on_container_swap::value){
::boost::adl_move_swap(this->node_alloc(), nh.node_alloc()); ::boost::adl_move_swap(this->node_alloc(), nh.node_alloc());
} }
} }