Date: Fri, 15 Nov 2013 18:50:18 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333910 - head/net-p2p/bitcoin/files Message-ID: <201311151850.rAFIoIEk032326@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Fri Nov 15 18:50:18 2013 New Revision: 333910 URL: http://svnweb.freebsd.org/changeset/ports/333910 Log: - Fix build on 10.0 PR: ports/182338 Submitted by: swills Approved by: Robert Backhaus <robbak@robbak.com> (maintainer) Added: head/net-p2p/bitcoin/files/patch-src__serialize.h (contents, props changed) Added: head/net-p2p/bitcoin/files/patch-src__serialize.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/bitcoin/files/patch-src__serialize.h Fri Nov 15 18:50:18 2013 (r333910) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311151850.rAFIoIEk032326>