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

sci-libs/coinor-couenne: fix build with GCC 11

Browse Source 
Closes: https://bugs.gentoo.org/792798
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2021-06-15 04:43:52 +00:00
parent 29f8bb9ea6
commit 8d3a84b70c
2 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sci-libs/coinor-couenne/coinor-couenne-0.5.8-r1.ebuild
View File

@@ -32,6 +32,10 @@ BDEPEND="
virtual/latex-base
)"
PATCHES=(
"${FILESDIR}"/${PN}-0.5.8-fix-build-with-gcc11.patch
)
src_prepare() {
default
# Prevent unneeded call to pkg-config that needs ${ED}'s in path.

43
sci-libs/coinor-couenne/files/coinor-couenne-0.5.8-fix-build-with-gcc11.patch Normal file
View File

@@ -0,0 +1,43 @@
https://bugs.gentoo.org/792798
From debc5de2d0ac9654c01db080448df064b808c56e Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Tue, 15 Jun 2021 04:24:22 +0000
Subject: [PATCH] Fix build with GCC 11
diff --git a/src/problem/CouenneProblem.hpp b/src/problem/CouenneProblem.hpp
index e5b54a5..db28cfd 100644
--- a/src/problem/CouenneProblem.hpp
+++ b/src/problem/CouenneProblem.hpp
@@ -74,7 +74,7 @@ class Nauty;
#define COUENNE_EPS_SYMM 1e-8
struct myclass0 {
- inline bool operator() (register const Node &a, register const Node &b) {
+ inline bool operator() (register const Node &a, register const Node &b) const {
return (( a.get_code () < b.get_code ()) ||
(( a.get_code () == b.get_code () &&
@@ -120,7 +120,7 @@ class Nauty;
struct myclass {
- inline bool operator() (register const Node &a, register const Node &b) {
+ inline bool operator() (register const Node &a, register const Node &b) const {
return (a.get_index() < b.get_index() );
}
};
--- a/src/cut/sdpcuts/CouenneMatrix.hpp
+++ b/src/cut/sdpcuts/CouenneMatrix.hpp
@@ -69,7 +69,7 @@ namespace Couenne {
struct compare_scalars {
inline bool operator() (register CouenneScalar * const &a,
- register CouenneScalar * const &b)
+ register CouenneScalar * const &b) const
{return a -> getIndex () < b -> getIndex ();}
};
--
2.32.0