From owner-svn-ports-head@FreeBSD.ORG Fri Nov 15 18:50:18 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9AB00F69; Fri, 15 Nov 2013 18:50:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8ACA92DAA; Fri, 15 Nov 2013 18:50:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAFIoID6032327; Fri, 15 Nov 2013 18:50:18 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAFIoIEk032326; Fri, 15 Nov 2013 18:50:18 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201311151850.rAFIoIEk032326@svn.freebsd.org> From: Steve Wills Date: Fri, 15 Nov 2013 18:50:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333910 - head/net-p2p/bitcoin/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Nov 2013 18:50:18 -0000 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 (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::const_iterator first, std::vector::const_iterator last) + { + assert(last - first >= 0);