pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math/octave Don't force std::pow into the global names...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5e25edd59adc
branches:  trunk
changeset: 635431:5e25edd59adc
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jun 05 18:33:07 2014 +0000

description:
Don't force std::pow into the global namespace. See comment for further
details.

diffstat:

 math/octave/distinfo                              |   3 ++-
 math/octave/patches/patch-liboctave_mx-inlines.cc |  17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r fcbea27c5a03 -r 5e25edd59adc math/octave/distinfo
--- a/math/octave/distinfo      Thu Jun 05 18:28:34 2014 +0000
+++ b/math/octave/distinfo      Thu Jun 05 18:33:07 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2014/03/06 23:09:04 jperkin Exp $
+$NetBSD: distinfo,v 1.41 2014/06/05 18:33:07 joerg Exp $
 
 SHA1 (octave-3.6.4.tar.bz2) = 3cc9366b6dbbd336eaf90fe70ad16e63705d82c4
 RMD160 (octave-3.6.4.tar.bz2) = b0356f0c5d9366b8129d72ac58bbde837fee1a95
@@ -10,6 +10,7 @@
 SHA1 (patch-fseeko-fpos_t.c) = ca846a014f9adfd47f7bbcf6557bf26a53f4a8e9
 SHA1 (patch-libgnu_stdio.in.h) = 20950b67577e0ff34e761b02ac15338c9cfc4cb9
 SHA1 (patch-libgnu_string.in.h) = 4af39b76faa3ac90454a9d664919b7a6cd45fa9d
+SHA1 (patch-liboctave_mx-inlines.cc) = 0b69e1166902ef3d5e8737e4f72449e2d202477a
 SHA1 (patch-liboctave_oct-time.cc) = 40c21f509b6c95942e6ba43c52494d1d707ed515
 SHA1 (patch-scripts_audio_wavread.m) = e679a41cb49eeb32d98d44b81fd5e3d535dd2767
 SHA1 (patch-scripts_io_strread.m) = e1b6199e64354f3138f329dbaac831715ed41be5
diff -r fcbea27c5a03 -r 5e25edd59adc math/octave/patches/patch-liboctave_mx-inlines.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/octave/patches/patch-liboctave_mx-inlines.cc Thu Jun 05 18:33:07 2014 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-liboctave_mx-inlines.cc,v 1.1 2014/06/05 18:33:07 joerg Exp $
+
+std::pow is required to promote numeric arguments to the smallest
+common float type. octave_int<> provides another test of template
+specialisations for pow() as well as explicit cast operators.
+The combination of both leads to ambiguous resolutions.
+
+--- liboctave/mx-inlines.cc.orig       2014-06-04 22:00:01.000000000 +0000
++++ liboctave/mx-inlines.cc
+@@ -306,7 +306,6 @@ inline void F (size_t n, R *r, X x, cons
+ 
+ // Let the compiler decide which pow to use, whichever best matches the
+ // arguments provided.
+-using std::pow;
+ DEFMXMAPPER2X (mx_inline_pow, pow)
+ 
+ // Arbitrary function appliers. The function is a template parameter to enable



Home | Main Index | Thread Index | Old Index