diff --git a/asl-uninitialized-move.patch b/asl-uninitialized-move.patch index d4b931d..41c7514 100644 --- a/asl-uninitialized-move.patch +++ b/asl-uninitialized-move.patch @@ -18,33 +18,24 @@ index 5f005a4..e349b92 100644 namespace adobe { diff --git a/adobe/vector.hpp b/adobe/vector.hpp -index 926cfa9..2d23e59 100644 +index 2d23e59..8968b59 100644 --- a/adobe/vector.hpp +++ b/adobe/vector.hpp -@@ -354,7 +354,7 @@ typename vector::iterator vector::insert(iterator p, I f, I l, std:: - - if (n < after) { - append_move(last - n, last); -- move_backward(p, last - n, last); -+ adobe::move_backward(p, last - n, last); - std::copy(f, l, p); - } else { - I m = f; -@@ -387,7 +387,7 @@ typename vector::iterator vector::insert_move(iterator p, I f, I l) - - if (n < after) { - append_move(last - n, last); -- move_backward(p, last - n, last); -+ adobe::move_backward(p, last - n, last); - adobe::move(f, l, p); - } else { - I m = f; -@@ -430,7 +430,7 @@ typename vector::iterator vector::insert(iterator p, size_type n, co - - if (n < after) { - append_move(last - n, last); -- move_backward(p, last - n, last); -+ adobe::move_backward(p, last - n, last); - std::fill_n(p, n, x); - } else { - std::uninitialized_fill_n(last, n - after, x); +@@ -319,7 +319,7 @@ void vector::append_move(I f, I l, std::forward_iterator_tag) + size_type n(std::distance(f, l)); + + if (remaining() < n) reserve((adobe::max)(size() + n, 2 * size())); +- set_finish(uninitialized_move(f, l, end())); ++ set_finish(adobe::uninitialized_move(f, l, end())); + } + + template +@@ -406,7 +406,7 @@ void vector::reserve(size_type n) + if (capacity() < n) { + vector tmp; + tmp.header_m = allocate(get_allocator(), n); +- tmp.header_m->finish() = uninitialized_move(begin(), end(), tmp.end()); ++ tmp.header_m->finish() = adobe::uninitialized_move(begin(), end(), tmp.end()); + swap(tmp); + } + }