app-accessibility/epos: Fix building with GCC-7

Bug: https://bugs.gentoo.org/638596
Closes: https://bugs.gentoo.org/638596
Closes: https://github.com/gentoo/gentoo/pull/7760
Package-Manager: Portage-2.3.16, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7760

diff --git a/app-accessibility/epos/epos-2.5.37-r2.ebuild b/app-accessibility/epos/epos-2.5.37-r2.ebuild
index 65a83ff55fef1dabea9f38c010ac4cbba61c5e7b..216717c781b9a532ce0f80901ccc2a8f55934750 100644 (file)
--- a/app-accessibility/epos/epos-2.5.37-r2.ebuild
+++ b/app-accessibility/epos/epos-2.5.37-r2.ebuild
@@ -23,6 +23,7 @@ PATCHES=(
        "${FILESDIR}"/${PN}-2.5.37-gcc45.patch
        "${FILESDIR}"/${PN}-2.5.37-gcc47.patch
        "${FILESDIR}"/${PN}-2.5.37-disable-tests.patch
+       "${FILESDIR}"/${PN}-2.5.37-gcc7.patch
 )
 
 src_prepare() {

diff --git a/app-accessibility/epos/files/epos-2.5.37-gcc7.patch b/app-accessibility/epos/files/epos-2.5.37-gcc7.patch
new file mode 100644 (file)
index 0000000..6c889a6
--- /dev/null
+++ b/app-accessibility/epos/files/epos-2.5.37-gcc7.patch
@@ -0,0 +1,22 @@
+Bug: https://bugs.gentoo.org/638596
+
+--- a/src/nnet/matrix.cc
++++ b/src/nnet/matrix.cc
+@@ -63,7 +63,7 @@
+ template<class T> void CMatrix<T>::multiplyByTransponed (const CMatrix &y, CMatrix &retval)
+ {
+       int i,j,k;
+-      assert (cols == y.cols);
++      this->assert (cols == y.cols);
+       if (cols != y.cols) { retval.Realloc (0,0); return; }
+ 
+       T sum;
+@@ -80,7 +80,7 @@
+ template<class T> void CMatrix<T>::transponedMultiply (const CMatrix &y, CMatrix &retval)
+ {
+       int i,j,k;
+-      assert (rows == y.rows);
++      this->assert (rows == y.rows);
+       if (rows != y.rows) { retval.Realloc (0,0); return; }
+ 
+       T sum;