diff options
| author | martin <martin@pkgsrc.org> | 2006-11-09 13:45:33 +0000 |
|---|---|---|
| committer | martin <martin@pkgsrc.org> | 2006-11-09 13:45:33 +0000 |
| commit | 343fc520f8ea1becfe212fe5c3b59e5aaa110845 (patch) | |
| tree | 4ea536f704c9474d11cb07e6d5687a3336bc4645 /games/xmahjongg/patches | |
| parent | d82a54acd1ab6cdb2d726114125ecc61b591d216 (diff) | |
| download | pkgsrc-343fc520f8ea1becfe212fe5c3b59e5aaa110845.tar.gz | |
Make it compile with gcc 4.x again
Diffstat (limited to 'games/xmahjongg/patches')
| -rw-r--r-- | games/xmahjongg/patches/patch-ac | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/games/xmahjongg/patches/patch-ac b/games/xmahjongg/patches/patch-ac index 565e772d9be..6c189076093 100644 --- a/games/xmahjongg/patches/patch-ac +++ b/games/xmahjongg/patches/patch-ac @@ -1,18 +1,18 @@ -$NetBSD: patch-ac,v 1.1 2006/11/05 18:46:58 rillig Exp $ +$NetBSD: patch-ac,v 1.2 2006/11/09 13:45:33 martin Exp $ SunPro sees an overloading ambiguity between operator bool() and -operator const char *(). +operator const char *(). ISO C++ and gcc 4.2 agree. --- permstr.cc.orig 2001-09-06 20:30:10.000000000 +0200 -+++ permstr.cc 2006-11-05 19:12:50.020399608 +0100 -@@ -183,8 +183,8 @@ PermString::static_initialize() ++++ permstr.cc 2006-11-09 14:35:55.000000000 +0100 +@@ -183,8 +183,8 @@ bool operator==(PermString a, const char *b) { - if (!a || !b) - return !a && !b; -+ if (a == false || !b) -+ return (a == false) && !b; ++ if (operator==(a, false) || !b) ++ return (operator==(a, false)) && !b; int l = strlen(b); return a.length() == l && memcmp(a.cc(), b, l) == 0; } |