diff options
author | joerg <joerg@pkgsrc.org> | 2011-12-29 16:33:09 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2011-12-29 16:33:09 +0000 |
commit | 977c3e0aca26b6d8a564709244dcbc9b1eca6d53 (patch) | |
tree | 6b77cc20c7e0628b016c5c33ed5b77bd3b89b282 /math/blitz++ | |
parent | c01f34c3e607f6b918c1e81f0a7a1d8735572082 (diff) | |
download | pkgsrc-977c3e0aca26b6d8a564709244dcbc9b1eca6d53.tar.gz |
Don't try to use namespace with math functions, it doesn't work reliable
with different compilers.
Diffstat (limited to 'math/blitz++')
-rw-r--r-- | math/blitz++/distinfo | 3 | ||||
-rw-r--r-- | math/blitz++/patches/patch-blitz_compiler.h | 35 |
2 files changed, 37 insertions, 1 deletions
diff --git a/math/blitz++/distinfo b/math/blitz++/distinfo index 138e6430d3c..917d9fa4e3b 100644 --- a/math/blitz++/distinfo +++ b/math/blitz++/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2008/06/20 01:09:24 joerg Exp $ +$NetBSD: distinfo,v 1.7 2011/12/29 16:33:09 joerg Exp $ SHA1 (blitz-0.8.tar.gz) = e1396cdfdbf4ec93bfc69ca581b8e9a64d745ca1 RMD160 (blitz-0.8.tar.gz) = 95b8eb6ee8a99f0632a0c510eafd0051053c1e0e @@ -7,3 +7,4 @@ SHA1 (patch-aa) = deb437da8741a87c18f56883a880a03a6e94c84d SHA1 (patch-ab) = 30b268204142b5f8a63ca7d3273d323d82e82077 SHA1 (patch-ac) = bd1622d79769cf0b99ebbcbe614d86fda728ff1b SHA1 (patch-ad) = 8161f42442c069affded125d607583749e9636e9 +SHA1 (patch-blitz_compiler.h) = f2e4ddb3ae290b56fd041e4269a8ef37edcc337d diff --git a/math/blitz++/patches/patch-blitz_compiler.h b/math/blitz++/patches/patch-blitz_compiler.h new file mode 100644 index 00000000000..ab3ccb5b7aa --- /dev/null +++ b/math/blitz++/patches/patch-blitz_compiler.h @@ -0,0 +1,35 @@ +$NetBSD: patch-blitz_compiler.h,v 1.1 2011/12/29 16:33:09 joerg Exp $ + +--- blitz/compiler.h.orig 2011-12-29 14:24:12.000000000 +0000 ++++ blitz/compiler.h +@@ -114,27 +114,9 @@ + #error In <blitz/config.h>: Your compiler does not support enum computations. You may have to rerun compiler/bzconfig. + #endif + +-#if defined(BZ_MATH_FN_IN_NAMESPACE_STD) +- #define BZ_MATHFN_SCOPE(x) std::x +-#elif defined(BZ_HAVE_NAMESPACES) +- #define BZ_MATHFN_SCOPE(x) ::x +-#else +- #define BZ_MATHFN_SCOPE(x) x +-#endif +- +-#if defined(BZ_HAVE_COMPLEX_MATH_IN_NAMESPACE_STD) +- #define BZ_CMATHFN_SCOPE(x) std::x +-#elif defined(BZ_HAVE_NAMESPACES) +- #define BZ_CMATHFN_SCOPE(x) ::x +-#else +- #define BZ_CMATHFN_SCOPE(x) x +-#endif +- +-#if defined(BZ_HAVE_NAMESPACES) +- #define BZ_IEEEMATHFN_SCOPE(x) ::x +-#else +- #define BZ_IEEEMATHFN_SCOPE(x) x +-#endif ++#define BZ_MATHFN_SCOPE(x) x ++#define BZ_CMATHFN_SCOPE(x) x ++#define BZ_IEEEMATHFN_SCOPE(x) x + + #if defined(BZ_HAVE_NAMESPACES) + #define BZ_BLITZ_SCOPE(x) blitz::x |