gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-util/bdelta: tweak for gcc-6, bug #594246

Browse Source 
c++11 intruduced next() helper
    http://en.cppreference.com/w/cpp/iterator/next
which does exactly the same.

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/594246

Package-Manager: portage-2.3.0
This commit is contained in:
Sergei Trofimovich
2016-09-18 19:59:16 +01:00
parent 41389eb583
commit eb4328c13b
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dev-util/bdelta/bdelta-0.3.1.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -28,6 +28,7 @@ IUSE=""
src_prepare() {
epatch "${FILESDIR}"/${P}-soname.patch
epatch "${FILESDIR}"/${P}-gcc-6.patch
}
src_compile() {

18
dev-util/bdelta/files/bdelta-0.3.1-gcc-6.patch Normal file
View File

@@ -0,0 +1,18 @@
diff --git a/src/libbdelta.cpp b/src/libbdelta.cpp
index b11bb2b..d769b0d 100644
--- a/src/libbdelta.cpp
+++ b/src/libbdelta.cpp
@@ -117,7 +117,3 @@ unsigned match_backward(BDelta_Instance *b, unsigned p1, unsigned p2, unsigned b
// Iterator helper function
-template <class T>
-inline T prior(T i) {return --i;}
-template <class T>
-inline T next(T i) {return ++i;}
-
+template <class T> inline T bdelta_next(T i) {return ++i;}
@@ -423,3 +419,3 @@ void bdelta_pass(BDelta_Instance *b, unsigned blocksize, unsigned minMatchSize,
if (! maxHoleSize || (u1.num <= maxHoleSize && u2.num <= maxHoleSize))
- if (! (flags & BDELTA_SIDES_ORDERED) || (next(u1.ml) == u1.mr && next(u2.ml) == u2.mr))
+ if (! (flags & BDELTA_SIDES_ORDERED) || (bdelta_next(u1.ml) == u1.mr && bdelta_next(u2.ml) == u2.mr))
bdelta_pass_2(b, blocksize, minMatchSize, &u1, 1, &u2, 1);