[med-svn] [mia] 02/07: d/p/02: Add patch for stricter includes Closes: #822503

Gert Wollny gert-guest at moszumanska.debian.org
Mon Apr 25 20:17:09 UTC 2016


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

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

commit 9f3aa3f348cfa19622352225000038560ee4a725
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Mon Apr 25 10:14:53 2016 +0000

    d/p/02: Add patch for stricter includes Closes: #822503
---
 .../02_accumulate-not-declared-mia-2.2.7.patch     | 124 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 2 files changed, 125 insertions(+)

diff --git a/debian/patches/02_accumulate-not-declared-mia-2.2.7.patch b/debian/patches/02_accumulate-not-declared-mia-2.2.7.patch
new file mode 100644
index 0000000..fabf550
--- /dev/null
+++ b/debian/patches/02_accumulate-not-declared-mia-2.2.7.patch
@@ -0,0 +1,124 @@
+Description: Correct includes because of stricter handling by g++
+Author: Gert Wollny <gw.fossdev at gmail.com>
+
+Origin: upstream
+Forwarded: not-needed
+Last-Update: 2016-04-25
+
+--- a/mia/core/waveletslopeclassifier.cc
++++ b/mia/core/waveletslopeclassifier.cc
+@@ -20,6 +20,7 @@
+ 
+ #include <map>
+ #include <algorithm>
++#include <numeric>
+ #include <stdexcept>
+ #include <cmath>
+ 
+--- a/mia/3d/cost/ngf.cc
++++ b/mia/3d/cost/ngf.cc
+@@ -21,6 +21,7 @@
+ #include <mia/3d/cost/ngf.hh>
+ #include <mia/3d/nfg.hh>
+ 
++#include <numeric> 
+ 
+ NS_BEGIN(ngf_3dimage_cost)
+ 
+--- a/mia/3d/ppmatrix.cc
++++ b/mia/3d/ppmatrix.cc
+@@ -32,6 +32,8 @@
+ #include <emmintrin.h>
+ #endif
+ 
++#include <numeric>
++
+ using namespace tbb;
+ using namespace std; 
+ 
+--- a/debian/patches/series
++++ b/debian/patches/series
+@@ -1,2 +1,3 @@
++mia-2.2.7-accumulate-not-declared.patch
+ 01_spellcheck_corrections.patch
+ mia-2.2.7-accumulate-not-declared.patch
+--- a/mia/core/test_sparse_solver.cc
++++ b/mia/core/test_sparse_solver.cc
+@@ -22,6 +22,7 @@
+ 
+ #include <mia/internal/autotest.hh>
+ #include <mia/core/sparse_solver.hh>
++#include <numeric> 
+ 
+ /**
+    This test only tests the general idea of the unified solver class, and 
+--- a/src/2dmyocard-segment.cc
++++ b/src/2dmyocard-segment.cc
+@@ -43,6 +43,8 @@
+ #include <mia/2d/transformfactory.hh>
+ #include <mia/2d/datafield.cxx>
+ 
++#include <numeric> 
++
+ NS_MIA_USE;
+ using namespace std; 
+ 
+--- a/src/2dsegment-fuzzyw.cc
++++ b/src/2dsegment-fuzzyw.cc
+@@ -29,6 +29,7 @@
+ 
+ #include <memory>
+ #include <vector>
++#include <numeric>
+ 
+ using namespace mia;
+ using namespace std; 
+--- a/src/2dseries-segdistance.cc
++++ b/src/2dseries-segdistance.cc
+@@ -37,6 +37,8 @@
+ #include <mia/2d/imageio.hh>
+ #include <mia/2d/filter.hh>
+ 
++#include <numeric> 
++
+ using namespace std;
+ using namespace mia;
+ using xmlpp::DomParser;
+--- a/src/wavelettrans.cc
++++ b/src/wavelettrans.cc
+@@ -20,6 +20,7 @@
+ 
+ #define VSTREAM_DOMAIN "wavelet"
+ 
++#include <cmath>
+ #include <fstream>
+ #include <sstream>
+ #include <iostream>
+--- a/mia/core/test_slopestatistics.cc
++++ b/mia/core/test_slopestatistics.cc
+@@ -19,12 +19,11 @@
+  */
+ 
+ #include <mia/internal/autotest.hh>
++#include <mia/core/slopestatistics.hh>
+ 
+ #include <stdexcept>
+ #include <cmath>
+-
+-#include <mia/core/slopestatistics.hh>
+-
++#include <numeric> 
+ 
+ using namespace std;
+ NS_MIA_USE
+--- a/test/test_minimizer.cc
++++ b/test/test_minimizer.cc
+@@ -27,7 +27,7 @@
+ #include <mia/core/minimizer.hh>
+ #include <mia/core/cmdlineparser.hh>
+ #include <mia/core/msgstream.hh>
+-
++#include <numeric>
+ 
+ 
+ using namespace std; 
diff --git a/debian/patches/series b/debian/patches/series
index 751bedc..adb8975 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01_spellcheck_corrections.patch
+02_accumulate-not-declared-mia-2.2.7.patch

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



More information about the debian-med-commit mailing list