Thu Jun 5 18:33:07 2014 UTC ()
Don't force std::pow into the global namespace. See comment for further
details.


(joerg)
diff -r1.40 -r1.41 pkgsrc/math/octave/distinfo
diff -r0 -r1.1 pkgsrc/math/octave/patches/patch-liboctave_mx-inlines.cc
cvs diff -r1.40 -r1.41 pkgsrc/math/octave/distinfo (expand / switch to unified diff)

--- pkgsrc/math/octave/distinfo 2014/03/06 23:09:04 1.40
+++ pkgsrc/math/octave/distinfo 2014/06/05 18:33:07 1.41
@@ -1,25 +1,26 @@ @@ -1,25 +1,26 @@
1$NetBSD: distinfo,v 1.40 2014/03/06 23:09:04 jperkin Exp $ 1$NetBSD: distinfo,v 1.41 2014/06/05 18:33:07 joerg Exp $
2 2
3SHA1 (octave-3.6.4.tar.bz2) = 3cc9366b6dbbd336eaf90fe70ad16e63705d82c4 3SHA1 (octave-3.6.4.tar.bz2) = 3cc9366b6dbbd336eaf90fe70ad16e63705d82c4
4RMD160 (octave-3.6.4.tar.bz2) = b0356f0c5d9366b8129d72ac58bbde837fee1a95 4RMD160 (octave-3.6.4.tar.bz2) = b0356f0c5d9366b8129d72ac58bbde837fee1a95
5Size (octave-3.6.4.tar.bz2) = 15627315 bytes 5Size (octave-3.6.4.tar.bz2) = 15627315 bytes
6SHA1 (patch-configure) = 627b8868d2cdd3c3a44e1485c8e7c47f481ca63e 6SHA1 (patch-configure) = 627b8868d2cdd3c3a44e1485c8e7c47f481ca63e
7SHA1 (patch-doc_interpreter_plot.txi) = b205f704ce625694a25ab57f4fad4460d1fbc0e9 7SHA1 (patch-doc_interpreter_plot.txi) = b205f704ce625694a25ab57f4fad4460d1fbc0e9
8SHA1 (patch-doc_liboctave_liboctave.texi) = c53484c70adea766ba1378a1f118942c924a88a5 8SHA1 (patch-doc_liboctave_liboctave.texi) = c53484c70adea766ba1378a1f118942c924a88a5
9SHA1 (patch-fflush-fpos_t.c) = 24ed7f95f8431b59bc5ee0dfb0e6624b8029f512 9SHA1 (patch-fflush-fpos_t.c) = 24ed7f95f8431b59bc5ee0dfb0e6624b8029f512
10SHA1 (patch-fseeko-fpos_t.c) = ca846a014f9adfd47f7bbcf6557bf26a53f4a8e9 10SHA1 (patch-fseeko-fpos_t.c) = ca846a014f9adfd47f7bbcf6557bf26a53f4a8e9
11SHA1 (patch-libgnu_stdio.in.h) = 20950b67577e0ff34e761b02ac15338c9cfc4cb9 11SHA1 (patch-libgnu_stdio.in.h) = 20950b67577e0ff34e761b02ac15338c9cfc4cb9
12SHA1 (patch-libgnu_string.in.h) = 4af39b76faa3ac90454a9d664919b7a6cd45fa9d 12SHA1 (patch-libgnu_string.in.h) = 4af39b76faa3ac90454a9d664919b7a6cd45fa9d
 13SHA1 (patch-liboctave_mx-inlines.cc) = 0b69e1166902ef3d5e8737e4f72449e2d202477a
13SHA1 (patch-liboctave_oct-time.cc) = 40c21f509b6c95942e6ba43c52494d1d707ed515 14SHA1 (patch-liboctave_oct-time.cc) = 40c21f509b6c95942e6ba43c52494d1d707ed515
14SHA1 (patch-scripts_audio_wavread.m) = e679a41cb49eeb32d98d44b81fd5e3d535dd2767 15SHA1 (patch-scripts_audio_wavread.m) = e679a41cb49eeb32d98d44b81fd5e3d535dd2767
15SHA1 (patch-scripts_io_strread.m) = e1b6199e64354f3138f329dbaac831715ed41be5 16SHA1 (patch-scripts_io_strread.m) = e1b6199e64354f3138f329dbaac831715ed41be5
16SHA1 (patch-scripts_miscellaneous_getappdata.m) = 55f9c9d5f30c85b3e8b5af82a271f1db90896fca 17SHA1 (patch-scripts_miscellaneous_getappdata.m) = 55f9c9d5f30c85b3e8b5af82a271f1db90896fca
17SHA1 (patch-scripts_miscellaneous_license.m) = 79f0f590df09a1659aea7b157ed4735ec1be55c4 18SHA1 (patch-scripts_miscellaneous_license.m) = 79f0f590df09a1659aea7b157ed4735ec1be55c4
18SHA1 (patch-scripts_miscellaneous_ver.m) = 62a23545f808bdd5895ffbb107ed7ca58f157f98 19SHA1 (patch-scripts_miscellaneous_ver.m) = 62a23545f808bdd5895ffbb107ed7ca58f157f98
19SHA1 (patch-scripts_pkg_pkg.m) = e6fa838e3910d52164d7cb3ca084c748cd68abb9 20SHA1 (patch-scripts_pkg_pkg.m) = e6fa838e3910d52164d7cb3ca084c748cd68abb9
20SHA1 (patch-scripts_plot_daspect.m) = 34281cae27ce447feb5ee9f1dc0d7a29e0c621a4 21SHA1 (patch-scripts_plot_daspect.m) = 34281cae27ce447feb5ee9f1dc0d7a29e0c621a4
21SHA1 (patch-scripts_plot_legend.m) = 3932ce6e6d19c89e852be35809502afa05a6ac4c 22SHA1 (patch-scripts_plot_legend.m) = 3932ce6e6d19c89e852be35809502afa05a6ac4c
22SHA1 (patch-scripts_plot_pbaspect.m) = 193f186be2c3e3ffc170cb0ed84900e14ab4e81b 23SHA1 (patch-scripts_plot_pbaspect.m) = 193f186be2c3e3ffc170cb0ed84900e14ab4e81b
23SHA1 (patch-scripts_plot_print.m) = dbcb7c3efbb0abee3b4afbc9c490dd8d27539efb 24SHA1 (patch-scripts_plot_print.m) = dbcb7c3efbb0abee3b4afbc9c490dd8d27539efb
24SHA1 (patch-scripts_polynomial_polyval.m) = d6655d2b9d2755788a02720c2a28ecf2e11a45e2 25SHA1 (patch-scripts_polynomial_polyval.m) = d6655d2b9d2755788a02720c2a28ecf2e11a45e2
25SHA1 (patch-scripts_set_union.m) = ff976eaa4aa76d19ad73144192aee81c8e60d8bc 26SHA1 (patch-scripts_set_union.m) = ff976eaa4aa76d19ad73144192aee81c8e60d8bc
File Added: pkgsrc/math/octave/patches/Attic/patch-liboctave_mx-inlines.cc
$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