[Pkg-octave-commit] [octave] 10/14: d/p/gcc-6-abs-overload.patch: Drop patch (Octave compiles now with GCC v6

[Rafael Laboissiere]

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

rafael pushed a commit to branch master
in repository octave.

commit d8c70b56a38d9c29ff5466f3f05b3cd4fa7e066a
Author: Rafael Laboissiere <rafael at debian.org>
Date:   Thu Nov 24 09:29:59 2016 -0200

    d/p/gcc-6-abs-overload.patch: Drop patch (Octave compiles now with GCC v6
---
 debian/patches/gcc-6-abs-overload.patch | 28 ----------------------------
 debian/patches/series                   |  1 -
 2 files changed, 29 deletions(-)

diff --git a/debian/patches/gcc-6-abs-overload.patch b/debian/patches/gcc-6-abs-overload.patch
deleted file mode 100644
index afd579b..0000000
--- a/debian/patches/gcc-6-abs-overload.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Work around abs overload changes in gcc 6
- In gcc 6, abs(unsigned int&) is illegal.  This patch declares local inline
- replacements.
- .
- See https://gcc.gnu.org/gcc-6/porting_to.html
-Origin: vendor, http://pkgs.fedoraproject.org/cgit/rpms/octave.git/tree/octave-abs.patch
-Forwarded: not-needed
-Reviewed-by: Mike Miller <mtmiller at debian.org>
-Last-Update: 2016-08-11
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/libinterp/corefcn/pr-output.cc
-+++ b/libinterp/corefcn/pr-output.cc
-@@ -3145,6 +3145,14 @@ PRINT_INT_SCALAR_INTERNAL (uint32_t)
- PRINT_INT_SCALAR_INTERNAL (int64_t)
- PRINT_INT_SCALAR_INTERNAL (uint64_t)
- 
-+inline unsigned int abs (unsigned int x) { return x; }
-+inline long unsigned int abs (long unsigned int x) { return x; }
-+inline long long unsigned int abs (long long unsigned int x) { return x; }
-+inline short unsigned int abs (short unsigned int x) { return x; }
-+inline unsigned char abs (unsigned char x) { return x; }
-+inline signed char abs (signed char x) { return abs((int)x); }
-+inline short int abs (short int x) { return abs((int)x); }
-+
- template <class T>
- /* static */ inline void
- octave_print_internal_template (std::ostream& os, const intNDArray<T>& nda,
diff --git a/debian/patches/series b/debian/patches/series
index 4ce2f3f..90fc17f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,5 +6,4 @@ mkoctfile-mpi.diff
 always-build-octave-jar.patch
 hdf5-flags.patch
 hdf5-mkoctfile.patch
-gcc-6-abs-overload.patch
 gcc-6-include-math-stdlib.patch

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git