summaryrefslogtreecommitdiff
path: root/boost/container/node_handle.hpp
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2017-09-13 11:08:07 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2017-09-13 11:09:00 +0900
commitb5c87084afaef42b2d058f68091be31988a6a874 (patch)
treeadef9a65870a41181687e11d57fdf98e7629de3c /boost/container/node_handle.hpp
parent34bd32e225e2a8a94104489b31c42e5801cc1f4a (diff)
downloadboost-b5c87084afaef42b2d058f68091be31988a6a874.tar.gz
boost-b5c87084afaef42b2d058f68091be31988a6a874.tar.bz2
boost-b5c87084afaef42b2d058f68091be31988a6a874.zip
Imported Upstream version 1.64.0upstream/1.64.0
Change-Id: Id9212edd016dd55f21172c427aa7894d1d24148b Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'boost/container/node_handle.hpp')
-rw-r--r--boost/container/node_handle.hpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/boost/container/node_handle.hpp b/boost/container/node_handle.hpp
index 300b4713ad..c46313cc4f 100644
--- a/boost/container/node_handle.hpp
+++ b/boost/container/node_handle.hpp
@@ -131,6 +131,9 @@ class node_handle
nallocator_type &node_alloc()
{ 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 p(m_ptr);
@@ -323,7 +326,7 @@ class node_handle
if(was_nh_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());
}
}