diff options
| author | joerg <joerg@pkgsrc.org> | 2014-06-05 18:33:07 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2014-06-05 18:33:07 +0000 |
| commit | befbd41537442baac07ef9e28c6c31964e21bb7c (patch) | |
| tree | 20f873d925aed678f118264bf2860c1540fc05a4 | |
| parent | 12cc5963d870a9b013ac7b112818b5942d6b6405 (diff) | |
| download | pkgsrc-befbd41537442baac07ef9e28c6c31964e21bb7c.tar.gz | |
Don't force std::pow into the global namespace. See comment for further
details.
| -rw-r--r-- | math/octave/distinfo | 3 | ||||
| -rw-r--r-- | math/octave/patches/patch-liboctave_mx-inlines.cc | 17 |
2 files changed, 19 insertions, 1 deletions
diff --git a/math/octave/distinfo b/math/octave/distinfo index d0b43839ca5..465a934e858 100644 --- a/math/octave/distinfo +++ b/math/octave/distinfo @@ -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-fflush-fpos_t.c) = 24ed7f95f8431b59bc5ee0dfb0e6624b8029f512 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 --git a/math/octave/patches/patch-liboctave_mx-inlines.cc b/math/octave/patches/patch-liboctave_mx-inlines.cc new file mode 100644 index 00000000000..50fa87f9240 --- /dev/null +++ b/math/octave/patches/patch-liboctave_mx-inlines.cc @@ -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 |