diff options
author | swills <swills@FreeBSD.org> | 2013-11-16 02:50:18 +0800 |
---|---|---|
committer | swills <swills@FreeBSD.org> | 2013-11-16 02:50:18 +0800 |
commit | 498455d36c2ae021d7f556f9f79b7e26bd02b052 (patch) | |
tree | 8a59013165bd94a8d6d4c41626983e2d713ea3b3 /net-p2p | |
parent | 31a5b1512f8e260e070a2624a490d55463a652e6 (diff) | |
download | freebsd-ports-gnome-498455d36c2ae021d7f556f9f79b7e26bd02b052.tar.gz freebsd-ports-gnome-498455d36c2ae021d7f556f9f79b7e26bd02b052.tar.zst freebsd-ports-gnome-498455d36c2ae021d7f556f9f79b7e26bd02b052.zip |
- Fix build on 10.0
PR: ports/182338
Submitted by: swills
Approved by: Robert Backhaus <robbak@robbak.com> (maintainer)
Diffstat (limited to 'net-p2p')
-rw-r--r-- | net-p2p/bitcoin/files/patch-src__serialize.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/net-p2p/bitcoin/files/patch-src__serialize.h b/net-p2p/bitcoin/files/patch-src__serialize.h new file mode 100644 index 000000000000..e13520bf9f7d --- /dev/null +++ b/net-p2p/bitcoin/files/patch-src__serialize.h @@ -0,0 +1,22 @@ +--- ./src/serialize.h.orig 2013-09-24 01:50:35.661706153 +0000 ++++ ./src/serialize.h 2013-09-24 01:50:52.913703572 +0000 +@@ -895,19 +895,6 @@ + iterator insert(iterator it, const char& x=char()) { return vch.insert(it, x); } + void insert(iterator it, size_type n, const char& x) { vch.insert(it, n, x); } + +- void insert(iterator it, const_iterator first, const_iterator last) +- { +- assert(last - first >= 0); +- if (it == vch.begin() + nReadPos && (unsigned int)(last - first) <= nReadPos) +- { +- // special case for inserting at the front when there's room +- nReadPos -= (last - first); +- memcpy(&vch[nReadPos], &first[0], last - first); +- } +- else +- vch.insert(it, first, last); +- } +- + void insert(iterator it, std::vector<char>::const_iterator first, std::vector<char>::const_iterator last) + { + assert(last - first >= 0); |