[gfan] 05/06: debian/patches/gcc6_compat.patch: New patch borrowed from Gentoo. Fixes ambiguous reference errors when compiled with gcc-6 (Closes: #811805).

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository gfan.

commit a94e4948315f1c0a8d0aaf409cf6bab5d422be3b
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Wed Jul 13 19:55:31 2016 -0400

    debian/patches/gcc6_compat.patch: New patch borrowed from Gentoo.
    Fixes ambiguous reference errors when compiled with gcc-6 (Closes: #811805).
---
 debian/patches/gcc6_compat.patch | 76 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series            |  1 +
 2 files changed, 77 insertions(+)

diff --git a/debian/patches/gcc6_compat.patch b/debian/patches/gcc6_compat.patch
new file mode 100644
index 0000000..1d3b808
--- /dev/null
+++ b/debian/patches/gcc6_compat.patch
@@ -0,0 +1,76 @@
+Description: Fix ambiguous reference error.  (Patch borrowed from Gentoo.)
+Author: Thomas Kahle <tomka at gentoo.org>
+Origin: https://gitweb.gentoo.org/repo/gentoo.git/tree/sci-mathematics/gfan/files/gfan-0.5-gcc6.1-compat.patch
+Bug-Debian: https://bugs.debian.org/811805
+Last-Update: 2016-07-13
+
+--- a/app_fiberpolytope.cpp
++++ b/app_fiberpolytope.cpp
+@@ -63,7 +63,7 @@
+ 
+ 	    /* If the vector configuration B does not have full rank then
+ 	       change coordinates. */
+-	    if(rank(B)!=B.getHeight())
++	    if(rank_(B)!=B.getHeight())
+ 	      {
+ 	        FieldMatrix M=integerMatrixToFieldMatrix(B,Q);
+ 	        M.reduce(false,true);//force integer operations - preserving volume
+@@ -83,7 +83,7 @@
+ 	    log1 debug<<"Done computing restricting cone\n";
+ 
+ 	    debug<<B.getRows();
+-	    debug<<int(rank(B));
++	    debug<<int(rank_(B));
+ 
+ 	    Triangulation2 t(B);
+ log1 debug<<"Computing initial triangulation\n";
+@@ -143,7 +143,7 @@
+ */
+     /* If the vector configuration A does not have full rank then
+        change coordinates. */
+-/*    if(rank(A)!=A.getHeight())
++/*    if(rank_(A)!=A.getHeight())
+       {
+ 	FieldMatrix M=integerMatrixToFieldMatrix(A,Q);
+ 	M.reduce(false,true);//force integer operations - preserving volume
+--- a/app_secondaryfan.cpp
++++ b/app_secondaryfan.cpp
+@@ -307,7 +307,7 @@
+ 
+     if(scaleOption.getValue())
+       {
+-	if(rank(A)!=A.getHeight())
++	if(rank_(A)!=A.getHeight())
+ 	  {
+ 	    cerr << "The vector configuration must have full rank in order to use the scale option.\n";
+ 	    assert(0);
+@@ -342,7 +342,7 @@
+ 
+     /* If the vector configuration A does not have full rank then
+        change coordinates. */
+-    if(rank(A)!=A.getHeight())
++    if(rank_(A)!=A.getHeight())
+       {
+ 	FieldMatrix M=integerMatrixToFieldMatrix(A,Q);
+ 	M.reduce(false,true);//force integer operations - preserving volume
+--- a/matrix.cpp
++++ b/matrix.cpp
+@@ -61,7 +61,7 @@
+ 
+ #include "linalg.h"
+ 
+-int rank(IntegerMatrix const &m)
++int rank_(IntegerMatrix const &m)
+ {
+   return integerMatrixToFieldMatrix(m,Q).rank();
+ }
+--- a/matrix.h
++++ b/matrix.h
+@@ -147,6 +147,6 @@
+ 
+ FloatMatrix integerToFloatMatrix(IntegerMatrix const &m);
+ IntegerVector flattenMatrix(IntegerMatrix const &m);
+-int rank(IntegerMatrix const &m);
++int rank_(IntegerMatrix const &m);
+ 
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 025ed37..5c75a56 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ remove_failing_tests_on_32bits.patch
 fix_GetUniqueGenerators_symmetry.patch
 fix_compilation_clang.diff
 fix_other_warnings_clang.diff
+gcc6_compat.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gfan.git