From 5c463507dbdeb78f8e749c8cfa5afa364dc25328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Tue, 26 Dec 2017 21:55:14 +0100 Subject: [PATCH] Qualify boost::move calls to avoid ADL ambiguities --- include/boost/move/algo/detail/insertion_sort.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/boost/move/algo/detail/insertion_sort.hpp b/include/boost/move/algo/detail/insertion_sort.hpp index 3328f75..5c378c3 100644 --- a/include/boost/move/algo/detail/insertion_sort.hpp +++ b/include/boost/move/algo/detail/insertion_sort.hpp @@ -101,21 +101,21 @@ void insertion_sort_uninitialized_copy typedef typename iterator_traits::value_type value_type; if (first1 != last1){ BirdirectionalRawIterator last2 = first2; - ::new((iterator_to_raw_pointer)(last2), boost_move_new_t()) value_type(move(*first1)); + ::new((iterator_to_raw_pointer)(last2), boost_move_new_t()) value_type(::boost::move(*first1)); destruct_n d(first2); d.incr(); for (++last2; ++first1 != last1; ++last2){ BirdirectionalRawIterator j2 = last2; BirdirectionalRawIterator k2 = j2; if (comp(*first1, *--k2)){ - ::new((iterator_to_raw_pointer)(j2), boost_move_new_t()) value_type(move(*k2)); + ::new((iterator_to_raw_pointer)(j2), boost_move_new_t()) value_type(::boost::move(*k2)); d.incr(); for (--j2; k2 != first2 && comp(*first1, *--k2); --j2) - *j2 = move(*k2); - *j2 = move(*first1); + *j2 = ::boost::move(*k2); + *j2 = ::boost::move(*first1); } else{ - ::new((iterator_to_raw_pointer)(j2), boost_move_new_t()) value_type(move(*first1)); + ::new((iterator_to_raw_pointer)(j2), boost_move_new_t()) value_type(::boost::move(*first1)); d.incr(); } }