[med-svn] [libmems] 04/09: update line endingscd debian/patches/

[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 03f6b8280261b039d37c82b1092f598e2533ba2d
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Mon Aug 17 11:16:46 2015 +0200

    update line endingscd debian/patches/
---
 debian/patches/04_make_code_cxx11_save.patch | 42 ++++++++++++++++++++--------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/debian/patches/04_make_code_cxx11_save.patch b/debian/patches/04_make_code_cxx11_save.patch
index a47841a..a6fa1b1 100644
--- a/debian/patches/04_make_code_cxx11_save.patch
+++ b/debian/patches/04_make_code_cxx11_save.patch
@@ -1,15 +1,33 @@
-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
+diff --git a/debian/patches/04_make_code_cxx11_save.patch b/debian/patches/04_make_code_cxx11_save.patch
+index a47841a..e69de29 100644
+--- a/debian/patches/04_make_code_cxx11_save.patch
++++ b/debian/patches/04_make_code_cxx11_save.patch
+@@ -1,20 +0,0 @@
+-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/libMems/ProgressiveAligner.cpp b/libMems/ProgressiveAligner.cpp
+index 50381c5..443ab08 100644
+--- a/libMems/ProgressiveAligner.cpp
++++ b/libMems/ProgressiveAligner.cpp
+@@ -1599,7 +1599,7 @@ void ProgressiveAligner::constructLcbTrackingMatches(
  		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);

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