From ce9a8538f2396c00b3e8e48342d7181100fa3b52 Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Fri, 30 Jan 2015 15:28:08 -0700 Subject: [PATCH 1/2] Correct spelling of "suppress" --- test/Jamfile.v2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index d25f8d0d..a2668649 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -6,7 +6,7 @@ # accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -# Added warning supression Paul A. Bristow 25 Nov 2008 +# Added warning suppression Paul A. Bristow 25 Nov 2008 # Bring in rules for testing. import testing ; From 2c88fa2f27d1793e93ac7acb8fa9d96d237234d9 Mon Sep 17 00:00:00 2001 From: Alexander Merry Date: Tue, 21 Apr 2015 09:02:26 +0100 Subject: [PATCH 2/2] Use boost/move/adl_move_swap.hpp to perform swaps. --- include/boost/circular_buffer/base.hpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/include/boost/circular_buffer/base.hpp b/include/boost/circular_buffer/base.hpp index 3efa8de1..1dec2f21 100644 --- a/include/boost/circular_buffer/base.hpp +++ b/include/boost/circular_buffer/base.hpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -1399,11 +1400,11 @@ class circular_buffer */ void swap(circular_buffer& cb) BOOST_NOEXCEPT { swap_allocator(cb, is_stateless()); - std::swap(m_buff, cb.m_buff); - std::swap(m_end, cb.m_end); - std::swap(m_first, cb.m_first); - std::swap(m_last, cb.m_last); - std::swap(m_size, cb.m_size); + adl_move_swap(m_buff, cb.m_buff); + adl_move_swap(m_end, cb.m_end); + adl_move_swap(m_first, cb.m_first); + adl_move_swap(m_last, cb.m_last); + adl_move_swap(m_size, cb.m_size); #if BOOST_CB_ENABLE_DEBUG invalidate_all_iterators(); cb.invalidate_all_iterators(); @@ -2627,7 +2628,7 @@ class circular_buffer //! Specialized method for swapping the allocator. void swap_allocator(circular_buffer& cb, const false_type&) { - std::swap(m_alloc, cb.m_alloc); + adl_move_swap(m_alloc, cb.m_alloc); } //! Specialized assign method.