[med-svn] [relion] 01/07: d/p/0005: Correct compilation with gcc-6, Closes: #811641

[Gert Wollny]

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

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

commit 2345522f3bb1d64f0909a23dc0fcf36bbcf4c5cb
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Wed Jun 29 13:31:49 2016 +0000

    d/p/0005: Correct compilation with gcc-6, Closes: #811641
---
 debian/patches/0005-gcc-6.patch | 20 ++++++++++++++++++++
 debian/patches/series           |  1 +
 2 files changed, 21 insertions(+)

diff --git a/debian/patches/0005-gcc-6.patch b/debian/patches/0005-gcc-6.patch
new file mode 100644
index 0000000..3695df2
--- /dev/null
+++ b/debian/patches/0005-gcc-6.patch
@@ -0,0 +1,20 @@
+--- a/src/Healpix_2.15a/cxxutils.cc
++++ b/src/Healpix_2.15a/cxxutils.cc
+@@ -55,7 +55,7 @@
+ bool file_present (const string &filename)
+   {
+   ifstream dummy(filename.c_str());
+-  return dummy;
++  return dummy.good();
+   }
+ 
+ void assert_present (const string &filename)
+@@ -261,7 +261,7 @@
+   int lineno=0;
+   dict.clear();
+   ifstream inp(filename.c_str());
+-  planck_assert (inp,"Could not open parameter file "+filename);
++  planck_assert (inp.good(), "Could not open parameter file "+filename);
+   while (inp)
+     {
+     string line;
diff --git a/debian/patches/series b/debian/patches/series
index 4bf3b50..a803b43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-Add-ml_optimiser_mpi.cpp-length_fn_ctf-patch.patch
 0003-Add-enable-gui-flag-to-configure.patch
 0004-Fix-fltk-header-includes.patch
+0005-gcc-6.patch

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