This is an automated email from the git hooks/post-receive script. plessy pushed a commit to branch master in repository jellyfish.
commit 7731ef1ef1781499c4c5591078b3c6858ffd53f9 Author: Charles Plessy <[email protected]> Date: Wed Jun 17 18:22:40 2015 +0900 Removed yaggo and clang patches, obsoleted upstream. See https://github.com/gmarcais/Jellyfish/pull/21 --- debian/changelog | 2 +- debian/patches/clang-compilation.patch | 56 ---------------------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 58 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3c276a3..c6c2fcf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ jellyfish (2.2.1-1) UNRELEASED; urgency=medium [ Charles Plessy ] * New upstream release. - * Removed yaggo patch, obsoleted upstream. + * Removed yaggo and clang patches, obsoleted upstream. -- Andreas Tille <[email protected]> Thu, 09 Oct 2014 16:01:07 +0200 diff --git a/debian/patches/clang-compilation.patch b/debian/patches/clang-compilation.patch deleted file mode 100644 index d9bd7f0..0000000 --- a/debian/patches/clang-compilation.patch +++ /dev/null @@ -1,56 +0,0 @@ -Description: Fix compilation using the "clang" compiler - This fixes 2 issues with the clang compilation: - 1.) The length of the array defined locally in array::_get_val - cannot be detected to be constant by a standard C++ compiler. - GCC's g++ accepts the code anyway because of its ample support - for variable-length arrays (VLAs). Clang doesn't support VLAs - for non-POD (Plain Old Type) types. Starting from version 3.5, - however, it is able to detect the constant nature of the value - used (using non-standard language features, too) and therefore - doesn't need LVAs here. However, clang compilers before 3.5 as - well as compilers that support only pure C++ need this patching. - 2.) The clang compiler warns about the "register" keyword being - deprecated in C++11. As the Jellyfish build system treats - warnings as errors, this breaks the build with clang. I suggest - to remove the keyword instead of silencing the warning because - most modern compilers (e.g. the recent versions of GCC, clang - and Visual Studio) ignore the keyword in their optimization - algorithms anyway. -Author: Martin Steghöfer <[email protected]> -Forwarded: https://github.com/gmarcais/Jellyfish/pull/21 -Bug-Debian: http://bugs.debian.org/749136 - ---- a/include/jellyfish/large_hash_array.hpp -+++ b/include/jellyfish/large_hash_array.hpp -@@ -444,7 +444,7 @@ - bool get_key_id(const key_type& key, size_t* id, key_type& tmp_key, const word** w, const offset_t** o, const size_t oid) const { - // This static_assert makes clang++ happy - static_assert(std::is_pod<prefetch_info>::value, "prefetch_info must be a POD"); -- prefetch_info info_ary[prefetch_buffer::capacity()]; -+ prefetch_info info_ary[prefetch_buffer::capacityConstant]; - prefetch_buffer buffer(info_ary); - warm_up_cache(buffer, oid); - ---- a/include/jellyfish/simple_circular_buffer.hpp -+++ b/include/jellyfish/simple_circular_buffer.hpp -@@ -106,6 +106,7 @@ - class pre_alloc : public base<T, pre_alloc<T, capa> > { - typedef base<T, pre_alloc<T, capa> > super; - public: -+ static const int capacityConstant = capa; - explicit pre_alloc(T* data) : super(data) { } - static int capacity() { return capa; } - }; ---- a/include/jellyfish/rectangular_binary_matrix.hpp -+++ b/include/jellyfish/rectangular_binary_matrix.hpp -@@ -261,8 +261,8 @@ - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wuninitialized" - #endif -- register xmm_t acc = acc ^ acc; // Set acc to 0 -- register xmm_t load = load ^ load; -+ xmm_t acc = acc ^ acc; // Set acc to 0 -+ xmm_t load = load ^ load; - #ifdef __clang__ - #pragma clang diagnostic pop - #endif diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 1eaf3aa..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -clang-compilation.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/jellyfish.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
