dev-cpp/tree: Fix building against GCC 11

Closes: https://bugs.gentoo.org/787614
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap@gentoo.org>
This commit is contained in:
David Seifert
2021-05-07 18:57:21 +02:00
parent c7035d48a6
commit 91acb76103
2 changed files with 38 additions and 3 deletions

View File

@@ -0,0 +1,33 @@
--- "ORIG/simple tree.hpp"
+++ "MOD/simple tree.hpp"
@@ -323,7 +323,7 @@
public:
compare_nodes(StrictWeakOrdering comp) : comp_(comp) {};
- bool operator()(const tree_node *a, const tree_node *b)
+ bool operator()(const tree_node *a, const tree_node *b) const
{
return comp_(a->data, b->data);
}
--- a/tree.hh
+++ b/tree.hh
@@ -422,7 +422,7 @@
public:
compare_nodes(StrictWeakOrdering comp) : comp_(comp) {};
- bool operator()(const tree_node *a, const tree_node *b)
+ bool operator()(const tree_node *a, const tree_node *b) const
{
return comp_(a->data, b->data);
}
--- a/xinlin.hh
+++ b/xinlin.hh
@@ -332,7 +332,7 @@
public:
compare_nodes(StrictWeakOrdering comp) : comp_(comp) {};
- bool operator()(const tree_node *a, const tree_node *b)
+ bool operator()(const tree_node *a, const tree_node *b) const
{
return comp_(a->data, b->data);
}

View File

@@ -8,15 +8,17 @@ inherit toolchain-funcs
DESCRIPTION="An STL-like tree class"
HOMEPAGE="http://www.aei.mpg.de/~peekas/tree/"
SRC_URI="http://www.aei.mpg.de/~peekas/tree/${P}.tar.gz"
S="${WORKDIR}/${P}/src"
LICENSE="|| ( GPL-2 GPL-3 )"
SLOT="0"
KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc"
S="${WORKDIR}/${P}/src"
PATCHES=( "${FILESDIR}"/${P}-test.patch )
PATCHES=(
"${FILESDIR}"/${P}-test.patch
"${FILESDIR}"/${P}-gcc11.patch
)
src_configure() {
tc-export CXX