Fix syntax of WeakPtr class.

4 files changed, 34 insertions, 2 deletions

diff --git a/multimedia/kmplayer-kde3/distinfo b/multimedia/kmplayer-kde3/distinfo
index 7d51fe059d2..50249aaafc0 100644
--- a/multimedia/kmplayer-kde3/distinfo
+++ b/multimedia/kmplayer-kde3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2012/04/15 22:18:38 dholland Exp $
+$NetBSD: distinfo,v 1.4 2012/12/25 21:06:31 joerg Exp $
 
 SHA1 (kmplayer-0.10.0c.tar.bz2) = 52bfa017e1360fdc60c10445090c867039da4830
 RMD160 (kmplayer-0.10.0c.tar.bz2) = 4f7f291733f9a73f5838e028af5e5268d1a0ee10
@@ -6,4 +6,5 @@ Size (kmplayer-0.10.0c.tar.bz2) = 1047729 bytes
 SHA1 (patch-aa) = 7e0c7d32ded98070438532c6365cafc0ef8bfd1f
 SHA1 (patch-ab) = 6d0635e5d9ea62de7363f761493d80d9d9734857
 SHA1 (patch-ac) = d91f1a27a0768e19c856079328db54d563e96128
+SHA1 (patch-src_kmplayershared.h) = 0fdac5e1f1cc6e976025fa3f98368b9d263e25a4
 SHA1 (patch-src_xineplayer_cpp) = 2676560e14461c15d8662450eb15cbaa4af4ffe2
diff --git a/multimedia/kmplayer-kde3/patches/patch-src_kmplayershared.h b/multimedia/kmplayer-kde3/patches/patch-src_kmplayershared.h
new file mode 100644
index 00000000000..1685d3ca2fb
--- /dev/null
+++ b/multimedia/kmplayer-kde3/patches/patch-src_kmplayershared.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_kmplayershared.h,v 1.1 2012/12/25 21:06:31 joerg Exp $
+
+--- src/kmplayershared.h.orig	2012-12-25 18:26:14.000000000 +0000
++++ src/kmplayershared.h
+@@ -186,8 +186,8 @@ struct WeakPtr {
+     // operator bool () const { return data && !!data->ptr; }
+     bool operator == (const WeakPtr<T> & w) const { return data == w.data; }
+     bool operator == (const SharedPtr<T> & s) const { return data == s.data; }
+-    bool operator == (const T * t) const { return (!t && !data) || (data && data.ptr == t); }
+-    bool operator == (T * t) const { return (!t && !data) || (data && data.ptr == t); }
++    bool operator == (const T * t) const { return (!t && !data) || (data && data->ptr == t); }
++    bool operator == (T * t) const { return (!t && !data) || (data && data->ptr == t); }
+     bool operator != (const WeakPtr<T> & w) const { return data != w.data; }
+     bool operator != (const SharedPtr<T> & s) const { return data != s.data; }
+     operator T * () { return data ? data->ptr : 0L; }
diff --git a/multimedia/kmplayer/distinfo b/multimedia/kmplayer/distinfo
index 21adcd23a20..a15c95ed856 100644
--- a/multimedia/kmplayer/distinfo
+++ b/multimedia/kmplayer/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.22 2012/11/23 20:28:03 markd Exp $
+$NetBSD: distinfo,v 1.23 2012/12/25 21:06:31 joerg Exp $
 
 SHA1 (kmplayer-0.11.3d.tar.bz2) = f43651d4252cf6d878b5b014c1e5e9b18b2e31c4
 RMD160 (kmplayer-0.11.3d.tar.bz2) = 39cf21c28c176697632d60b8f2993e78a9e3dd0f
 Size (kmplayer-0.11.3d.tar.bz2) = 573173 bytes
 SHA1 (patch-aa) = 85d6f4f17a2c8afff505298f62b3105979a9e9f1
 SHA1 (patch-ab) = 975524f4ef0163d47c452f16ab98016acebead09
+SHA1 (patch-src_kmplayershared.h) = b314dc90f44fc5154dcfcb4fa889008d78b59980
diff --git a/multimedia/kmplayer/patches/patch-src_kmplayershared.h b/multimedia/kmplayer/patches/patch-src_kmplayershared.h
new file mode 100644
index 00000000000..9e60a6cf46c
--- /dev/null
+++ b/multimedia/kmplayer/patches/patch-src_kmplayershared.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_kmplayershared.h,v 1.1 2012/12/25 21:06:31 joerg Exp $
+
+--- src/kmplayershared.h.orig	2012-12-25 18:21:29.000000000 +0000
++++ src/kmplayershared.h
+@@ -214,8 +214,8 @@ struct WeakPtr {
+     // operator bool () const { return data && !!data->ptr; }
+     bool operator == (const WeakPtr<T> & w) const { return data == w.data; }
+     bool operator == (const SharedPtr<T> & s) const { return data == s.data; }
+-    bool operator == (const T * t) const { return (!t && !data) || (data && data.ptr == t); }
+-    bool operator == (T * t) const { return (!t && !data) || (data && data.ptr == t); }
++    bool operator == (const T * t) const { return (!t && !data) || (data && data->ptr == t); }
++    bool operator == (T * t) const { return (!t && !data) || (data && data->ptr == t); }
+     bool operator != (const WeakPtr<T> & w) const { return data != w.data; }
+     bool operator != (const SharedPtr<T> & s) const { return data != s.data; }
+     operator T * () { return data ? data->ptr : 0L; }