Package: relion / 1.4+dfsg-4

0005-gcc-6.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
From: Gert Wollny <gw.fossdev@gmail.com>
Date: Wed, 29 Jun 2014 16:07:43 +0200
Subject: Fix compilation with g++-6
Bug-Debian: https://bugs.debian.org/811641

--- 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;
--- a/src/mpi.cpp
+++ b/src/mpi.cpp
@@ -83,7 +83,7 @@
 //#define VERBOSE_MPISENDRECV
 int MpiNode::relion_MPI_Send(void *buf, std::ptrdiff_t count, MPI_Datatype datatype, int dest, int tag, MPI_Comm comm) {
 
-    int result(0);
+    int result = 0;
     DOUBLE start_time = MPI_Wtime();
 
 //#define ONLY_NORMAL_SEND
--- a/src/mpi.h
+++ b/src/mpi.h
@@ -82,7 +82,7 @@
     int relion_MPI_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, MPI_Comm comm);
 
     /* Better error handling of MPI error messages */
-    void report_MPI_ERROR(int errno);
+    void report_MPI_ERROR(int error_code);
 
 };