diff options
| author | joerg <joerg@pkgsrc.org> | 2013-09-15 12:30:55 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-09-15 12:30:55 +0000 |
| commit | c4a4386374956c5a6985c4893dcea67f2a64915b (patch) | |
| tree | ba7a75e2fc8d862a9fef5d5ebb6cc0b638fbd0cb /math | |
| parent | 0928adb5769f5d24ca7ace3b117a29d996e7986b (diff) | |
| download | pkgsrc-c4a4386374956c5a6985c4893dcea67f2a64915b.tar.gz | |
Deal with C++11 vs TR1 headers.
Diffstat (limited to 'math')
| -rw-r--r-- | math/octave/distinfo | 3 | ||||
| -rw-r--r-- | math/octave/patches/patch-src_DLD-FUNCTIONS_rand.cc | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/math/octave/distinfo b/math/octave/distinfo index ff9d5e0815d..9b6c1bd6428 100644 --- a/math/octave/distinfo +++ b/math/octave/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.36 2013/02/23 13:11:06 asau Exp $ +$NetBSD: distinfo,v 1.37 2013/09/15 12:30:55 joerg Exp $ SHA1 (octave-3.6.4.tar.bz2) = 3cc9366b6dbbd336eaf90fe70ad16e63705d82c4 RMD160 (octave-3.6.4.tar.bz2) = b0356f0c5d9366b8129d72ac58bbde837fee1a95 @@ -8,4 +8,5 @@ SHA1 (patch-fseeko-fpos_t.c) = ca846a014f9adfd47f7bbcf6557bf26a53f4a8e9 SHA1 (patch-libgnu_string.in.h) = 4af39b76faa3ac90454a9d664919b7a6cd45fa9d SHA1 (patch-liboctave_oct-time.cc) = 40c21f509b6c95942e6ba43c52494d1d707ed515 SHA1 (patch-scripts_pkg_pkg.m) = e6fa838e3910d52164d7cb3ca084c748cd68abb9 +SHA1 (patch-src_DLD-FUNCTIONS_rand.cc) = 4992844f8ed53963e03e05adab2446397c2f4f02 SHA1 (patch-src_oct-conf.h.in) = d3fa5166db289fbd9eba355911341e891fb6d822 diff --git a/math/octave/patches/patch-src_DLD-FUNCTIONS_rand.cc b/math/octave/patches/patch-src_DLD-FUNCTIONS_rand.cc new file mode 100644 index 00000000000..21a80ad7935 --- /dev/null +++ b/math/octave/patches/patch-src_DLD-FUNCTIONS_rand.cc @@ -0,0 +1,18 @@ +$NetBSD: patch-src_DLD-FUNCTIONS_rand.cc,v 1.1 2013/09/15 12:30:55 joerg Exp $ + +--- src/DLD-FUNCTIONS/rand.cc.orig 2013-09-14 19:43:59.000000000 +0000 ++++ src/DLD-FUNCTIONS/rand.cc +@@ -1032,10 +1032,10 @@ rand(). All permutations are equally lik + @end deftypefn") + { + +-#ifdef USE_UNORDERED_MAP_WITH_TR1 +-using std::tr1::unordered_map; +-#else ++#if defined (HAVE_UNORDERED_MAP) + using std::unordered_map; ++#else ++using std::tr1::unordered_map; + #endif + + int nargin = args.length (); |