[med-svn] [jellyfish] 04/10: Update patches
Andreas Tille
tille at debian.org
Tue Aug 30 12:29:10 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository jellyfish.
commit f78384c80276b02a8a6080daad9a1630c7c900ab
Author: Andreas Tille <tille at debian.org>
Date: Tue Aug 30 13:39:48 2016 +0200
Update patches
---
...nable_c++11_error_deprecated-declarations.patch | 42 ----------------------
debian/patches/series | 1 -
2 files changed, 43 deletions(-)
diff --git a/debian/patches/enable_c++11_error_deprecated-declarations.patch b/debian/patches/enable_c++11_error_deprecated-declarations.patch
deleted file mode 100644
index b64973c..0000000
--- a/debian/patches/enable_c++11_error_deprecated-declarations.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Wed, 23 Dec 2015 21:01:45 +0100
-Bug-Debian: https://bugs.debian.org/808537
-Description: enable build with c++11 and -Werror=deprecated-declarations compile
- flag (thanks for the hint to Gert Wollny at
- https://lists.debian.org/debian-mentors/2015/12/msg00360.html
- )
-
-
---- a/jellyfish/merge_files.cc
-+++ b/jellyfish/merge_files.cc
-@@ -35,8 +35,8 @@ using jellyfish::file_header;
- using jellyfish::RectangularBinaryMatrix;
- using jellyfish::mer_dna;
- using jellyfish::cpp_array;
--typedef std::auto_ptr<binary_reader> binary_reader_ptr;
--typedef std::auto_ptr<text_reader> text_reader_ptr;
-+typedef std::unique_ptr<binary_reader> binary_reader_ptr;
-+typedef std::unique_ptr<text_reader> text_reader_ptr;
-
- struct file_info {
- std::ifstream is;
-@@ -47,7 +47,7 @@ struct file_info {
- header(is)
- { }
- };
--typedef std::auto_ptr<RectangularBinaryMatrix> matrix_ptr;
-+typedef std::unique_ptr<RectangularBinaryMatrix> matrix_ptr;
-
- template<typename reader_type, typename writer_type>
- void do_merge(cpp_array<file_info>& files, std::ostream& out, writer_type& writer,
---- a/sub_commands/count_main.cc
-+++ b/sub_commands/count_main.cc
-@@ -245,7 +245,7 @@ int count_main(int argc, char *argv[])
- if(args.disk_flag)
- ary.do_size_doubling(false);
-
-- std::auto_ptr<jellyfish::dumper_t<mer_array> > dumper;
-+ std::unique_ptr<jellyfish::dumper_t<mer_array> > dumper;
- if(args.text_flag)
- dumper.reset(new text_dumper(args.threads_arg, args.output_arg, &header));
- else
diff --git a/debian/patches/series b/debian/patches/series
index ea66f94..108e61a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
pkg-config-with-name
-enable_c++11_error_deprecated-declarations.patch
drop-rpath
modern-g++
spelling
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/jellyfish.git
More information about the debian-med-commit
mailing list