From 5b4443b042567905ed74fa6b0aa854785a046e8c Mon Sep 17 00:00:00 2001 From: Daniel Sabogal Date: Tue, 27 Dec 2016 17:40:58 -0500 Subject: testing/octave: upgrade to 4.2.0 --- testing/octave/abs.patch | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'testing/octave/abs.patch') 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 -+#include "config.h" - #endif - - #include -@@ -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 + template /* static */ inline void octave_print_internal_template (std::ostream& os, const intNDArray& nda, -- cgit v1.2.3