[med-svn] [libmems] 02/09: Add a patch to alliviate future problems with C++11

[Gert Wollny]

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

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

commit be29d269d36d53453fdff08222a0c6aea3006dd6
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Mon Aug 17 11:02:35 2015 +0200

    Add a patch to alliviate future problems with C++11
---
 debian/patches/04_make_code_cxx11_save.patch | 20 ++++++++++++++++++++
 debian/patches/series                        |  1 +
 2 files changed, 21 insertions(+)

diff --git a/debian/patches/04_make_code_cxx11_save.patch b/debian/patches/04_make_code_cxx11_save.patch
new file mode 100644
index 0000000..e834cb3
--- /dev/null
+++ b/debian/patches/04_make_code_cxx11_save.patch
@@ -0,0 +1,20 @@
+Description: Make the code compile with c++11 flag on 
+ C++11 provides std::make_tuple which conflicts with boost::make_tuple
+ This patch makes sure that everything boost is used.    
+ .
+Author: Gert Wollny <gw.fossdev at gmail.com>
+
+Forwarded: no
+Last-Update:  2015-08-17
+
+--- libmems-1.6.0+4725.orig/libMems/ProgressiveAligner.cpp
++++ libmems-1.6.0+4725/libMems/ProgressiveAligner.cpp
+@@ -1599,7 +1599,7 @@ void ProgressiveAligner::constructLcbTra
+ 		c.SetLeftEnd(child_1, ancestral_matches[mI]->LeftEnd(1));
+ 		c.SetOrientation(child_1, ancestral_matches[mI]->Orientation(1));
+ 		c.SetLength(ancestral_matches[mI]->Length(1), child_1);
+-		cga_list.push_back(make_tuple(c.Copy(), &bs[mI], ancestral_matches[mI]));
++		cga_list.push_back(boost::make_tuple(c.Copy(), &bs[mI], ancestral_matches[mI]));
+ 	}
+ 
+ 	stack<node_id_t> node_stack;
diff --git a/debian/patches/series b/debian/patches/series
index dde51c2..ba41452 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02_fix_a_Wformat.patch
 pkg-config-directive.patch
 03_update_boost_m4_to_git_d9ff75.patch
+04_make_code_cxx11_save.patch

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