[med-svn] [express] 01/06: Add patch to compile with gcc-6

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository express.

commit 6211199d6e270cdc02cc49a1bd39181352744e48
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Tue Jul 26 18:27:20 2016 +0000

    Add patch to compile with gcc-6
---
 debian/changelog           |  7 +++++++
 debian/patches/gcc-6.patch | 21 +++++++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6711bb5..6be6130 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+berkeley-express (1.5.1-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * d/p/gcc-6: Fix compilation with gcc-6, Closes: #811859
+
+ -- Gert Wollny <gw.fossdev at gmail.com>  Tue, 26 Jul 2016 18:26:14 +0000
+
 berkeley-express (1.5.1-1) unstable; urgency=low
 
   * Initial release (Closes: #778589)
diff --git a/debian/patches/gcc-6.patch b/debian/patches/gcc-6.patch
new file mode 100644
index 0000000..4058494
--- /dev/null
+++ b/debian/patches/gcc-6.patch
@@ -0,0 +1,21 @@
+Description: Fix compilation with gcc-6
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Bug-Debian: https://bugs.debian.org/811859
+
+--- a/src/targets.cpp
++++ b/src/targets.cpp
+@@ -113,12 +113,12 @@
+ 
+   double ll = LOG_1;
+   double tot_mass = mass(with_pseudo);
+-  double tot_eff_len = cached_effective_length(lib.bias_table);
++  double tot_eff_len = cached_effective_length(static_cast<bool>(lib.bias_table));
+   if (neighbors) {
+     foreach (const Target* neighbor, *neighbors) {
+       tot_mass = log_add(tot_mass, neighbor->mass(with_pseudo));
+       tot_eff_len = log_add(tot_eff_len,
+-                            neighbor->cached_effective_length(lib.bias_table));
++                            neighbor->cached_effective_length(static_cast<bool>(lib.bias_table)));
+     }
+   }
+   ll += tot_mass - tot_eff_len;
diff --git a/debian/patches/series b/debian/patches/series
index 52d84db..6dde7f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 spelling-fixes
 fix-bamtools-path
 drop-zlib
+gcc-6.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/express.git