diff options
| author | Daniel Sabogal <dsabogalcc@gmail.com> | 2016-12-27 17:40:58 -0500 |
|---|---|---|
| committer | Daniel Sabogal <dsabogalcc@gmail.com> | 2017-01-10 13:05:19 -0500 |
| commit | 5b4443b042567905ed74fa6b0aa854785a046e8c (patch) | |
| tree | 93f75adc1f491861615c5d2b74aa5b4a1bca9f48 /testing/octave/abs.patch | |
| parent | e1b2607769e2d38cfa1849586bd13ceb2de2714d (diff) | |
| download | aports-5b4443b042567905ed74fa6b0aa854785a046e8c.tar.bz2 aports-5b4443b042567905ed74fa6b0aa854785a046e8c.tar.xz | |
testing/octave: upgrade to 4.2.0
Diffstat (limited to 'testing/octave/abs.patch')
| -rw-r--r-- | testing/octave/abs.patch | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/testing/octave/abs.patch b/testing/octave/abs.patch index e7059f3cc0..3b892f3b5a 100644 --- a/testing/octave/abs.patch +++ b/testing/octave/abs.patch @@ -1,16 +1,6 @@ -diff -up octave-4.0.0/libinterp/corefcn/pr-output.cc.abs octave-4.0.0/libinterp/corefcn/pr-output.cc ---- octave-4.0.0/libinterp/corefcn/pr-output.cc.abs 2015-05-23 08:21:53.000000000 -0600 -+++ octave-4.0.0/libinterp/corefcn/pr-output.cc 2016-02-21 08:59:30.966291273 -0700 -@@ -21,7 +21,7 @@ along with Octave; see the file COPYING. - */ - - #ifdef HAVE_CONFIG_H --#include <config.h> -+#include "config.h" - #endif - - #include <cfloat> -@@ -3145,6 +3145,14 @@ PRINT_INT_SCALAR_INTERNAL (uint32_t) +--- octave-4.2.0/libinterp/corefcn/pr-output.cc.orig ++++ octave-4.2.0/libinterp/corefcn/pr-output.cc +@@ -3152,6 +3152,14 @@ PRINT_INT_SCALAR_INTERNAL (int64_t) PRINT_INT_SCALAR_INTERNAL (uint64_t) @@ -22,6 +12,6 @@ diff -up octave-4.0.0/libinterp/corefcn/pr-output.cc.abs octave-4.0.0/libinterp/ +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> + template <typename T> /* static */ inline void octave_print_internal_template (std::ostream& os, const intNDArray<T>& nda, |