diff options
author | makc <makc@FreeBSD.org> | 2012-05-17 00:08:12 +0800 |
---|---|---|
committer | makc <makc@FreeBSD.org> | 2012-05-17 00:08:12 +0800 |
commit | 94609fcbde8cf6edad454f2425c0a96eb5b856cc (patch) | |
tree | 5c4f4e42437646f66bb313b3d79ded5a45eaaa78 /x11-toolkits/gigi/files/patch-GG-adobe-vector.hpp | |
parent | 0a2384ab6b5473e47ed78c37af7252b0f73afe06 (diff) | |
download | freebsd-ports-gnome-94609fcbde8cf6edad454f2425c0a96eb5b856cc.tar.gz freebsd-ports-gnome-94609fcbde8cf6edad454f2425c0a96eb5b856cc.tar.zst freebsd-ports-gnome-94609fcbde8cf6edad454f2425c0a96eb5b856cc.zip |
Add patches to fix build with boost-1.48.0
PR: ports/156253
Submitted by: Alexander Churanov
Approved by: oliver (maintainer)
Diffstat (limited to 'x11-toolkits/gigi/files/patch-GG-adobe-vector.hpp')
-rw-r--r-- | x11-toolkits/gigi/files/patch-GG-adobe-vector.hpp | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/x11-toolkits/gigi/files/patch-GG-adobe-vector.hpp b/x11-toolkits/gigi/files/patch-GG-adobe-vector.hpp new file mode 100644 index 000000000000..7da94c93f6ab --- /dev/null +++ b/x11-toolkits/gigi/files/patch-GG-adobe-vector.hpp @@ -0,0 +1,29 @@ +--- GG/adobe/vector.hpp.orig 2012-01-27 18:38:56.000000000 +0300 ++++ GG/adobe/vector.hpp 2012-01-27 18:40:58.000000000 +0300 +@@ -343,7 +343,7 @@ + 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 <typename T, typename A> +@@ -430,7 +430,7 @@ + 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); + } + } +@@ -469,7 +469,7 @@ + template <typename T, typename A> + typename vector<T, A>::iterator vector<T, A>::erase(iterator f, iterator l) + { +- iterator i = move(l, end(), f); ++ iterator i = ::adobe::move(l, end(), f); + for (iterator b(i), e(end()); b != e; ++b) { + b->~value_type(); + } |