[med-svn] [libmems] 03/09: correct line endings

[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 77f669e6e3e20b7878ec60972ededf3ad7f28222
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Mon Aug 17 11:11:28 2015 +0200

    correct line endings
---
 debian/patches/04_make_code_cxx11_save.patch | 40 ++++++++++++++--------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/debian/patches/04_make_code_cxx11_save.patch b/debian/patches/04_make_code_cxx11_save.patch
index e834cb3..a47841a 100644
--- a/debian/patches/04_make_code_cxx11_save.patch
+++ b/debian/patches/04_make_code_cxx11_save.patch
@@ -1,20 +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;
+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;

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