feedc0de/boost_move
1
0
Fork 0
forked from boostorg/move
Code Pull Requests Activity

Fixes #7830

Browse Source 
[SVN r82206]
This commit is contained in:
Ion Gaztañaga
2012-12-25 23:07:01 +00:00
parent e38f7faaf6
commit 5bbb9bbf0f
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/boost/move/algorithm.hpp
View File

@@ -19,6 +19,7 @@
#include <boost/move/utility.hpp> #include <boost/move/utility.hpp>
#include <boost/move/iterator.hpp> #include <boost/move/iterator.hpp>
#include <boost/move/algorithm.hpp> #include <boost/move/algorithm.hpp>
#include <boost/detail/no_exceptions_support.hpp>
#include <algorithm> //copy, copy_backward #include <algorithm> //copy, copy_backward
#include <memory> //uninitialized_copy #include <memory> //uninitialized_copy
@@ -110,10 +111,22 @@ F uninitialized_move(I f, I l, F r
) )
{ {
typedef typename std::iterator_traits<I>::value_type input_value_type; typedef typename std::iterator_traits<I>::value_type input_value_type;
F back = r;
BOOST_TRY{
while (f != l) { while (f != l) {
::new(static_cast<void*>(&*r)) input_value_type(boost::move(*f)); void * const addr = static_cast<void*>(::boost::move_detail::addressof(*r));
::new(addr) input_value_type(::boost::move(*f));
++f; ++r; ++f; ++r;
} }
}
BOOST_CATCH(...){
for (; back != r; ++back){
back->~input_value_type();
}
BOOST_RETHROW;
}
BOOST_CATCH_END
return r; return r;
} }