Partial fix for the Clang build due to bad template use.

5 files changed, 102 insertions, 1 deletions

diff --git a/devel/sfslite/distinfo b/devel/sfslite/distinfo
index 328db102a6b..a68118582e0 100644
--- a/devel/sfslite/distinfo
+++ b/devel/sfslite/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2012/06/18 03:28:55 dholland Exp $
+$NetBSD: distinfo,v 1.3 2013/03/28 21:21:17 joerg Exp $
 
 SHA1 (sfslite-1.2.7.tar.gz) = 774c1defc74d9f354622f60aa5c038400b401c5b
 RMD160 (sfslite-1.2.7.tar.gz) = 3e72a4d6cb0975c13b51f13ff615e8a390c36e3b
@@ -6,4 +6,9 @@ Size (sfslite-1.2.7.tar.gz) = 1379432 bytes
 SHA1 (patch-aa) = 9c13092b1fe5e9d7c25eea9293fadbbaab096299
 SHA1 (patch-ab) = 0bfc67711150e5dc8eb74fba29e9abd5272e62db
 SHA1 (patch-ac) = 88294e8dc9785a68019f66d0513c6d043a6b9f2e
+SHA1 (patch-arpc_acallrpc.C) = da39a3ee5e6b4b0d3255bfef95601890afd80709
+SHA1 (patch-async_ihash.h) = 6ae910ad516739f04f0fd29849912c8eb457eca2
+SHA1 (patch-async_itree.h) = a777c376d2e8ac2a4ffdd84ec319325edc2ebb9b
+SHA1 (patch-async_qhash.h) = c145936da65369dce93092df3535e6fad921d030
 SHA1 (patch-async_rwfd_c) = be0075129d6bfe3eda7f86721a8a977acd5296d2
+SHA1 (patch-async_vec.h) = 6f73867864f650de1c760228fc2f39f951554df5
diff --git a/devel/sfslite/patches/patch-async_ihash.h b/devel/sfslite/patches/patch-async_ihash.h
new file mode 100644
index 00000000000..71c7927f5a2
--- /dev/null
+++ b/devel/sfslite/patches/patch-async_ihash.h
@@ -0,0 +1,33 @@
+$NetBSD: patch-async_ihash.h,v 1.1 2013/03/28 21:21:18 joerg Exp $
+
+--- async/ihash.h.orig	2013-03-25 14:13:37.000000000 +0000
++++ async/ihash.h
+@@ -248,7 +248,7 @@ public:
+   ihash () : eq (E ()), hash (H ()) {}
+   ihash (const E &e, const H &h) : eq (e), hash (h) {}
+ 
+-  bool insert (V *elm) { return insert_val (elm, hash (elm->*key)); }
++  bool insert (V *elm) { return this->insert_val (elm, hash (elm->*key)); }
+ 
+ #if 0
+   template<class T> V *operator[] (const T &k) const {
+@@ -256,16 +256,16 @@ public:
+   V *operator[] (const K &k) const {
+ #endif
+     V *v;
+-    for (v = lookup_val (hash (k));
++    for (v = this->lookup_val (hash (k));
+ 	 v && !eq (k, v->*key);
+-	 v = next_val (v))
++	 v = this->next_val (v))
+       ;
+     return v;
+   }
+ 
+   V *nextkeq (V *v) {
+     const K &k = v->*key;
+-    while ((v = next_val (v)) && !eq (k, v->*key))
++    while ((v = this->next_val (v)) && !eq (k, v->*key))
+       ;
+     return v;
+   };
diff --git a/devel/sfslite/patches/patch-async_itree.h b/devel/sfslite/patches/patch-async_itree.h
new file mode 100644
index 00000000000..caa87952bd4
--- /dev/null
+++ b/devel/sfslite/patches/patch-async_itree.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-async_itree.h,v 1.1 2013/03/28 21:21:18 joerg Exp $
+
+--- async/itree.h.orig	2013-03-25 14:16:45.000000000 +0000
++++ async/itree.h
+@@ -245,12 +245,12 @@ public:
+ #if 0
+   template<class T> V *operator[] (const T &k) {
+     int (itree::*fn) (const T *, const V *) = &kvcmp<T>;
+-    return search (wrap (this, fn, &k));
++    return this->search (wrap (this, fn, &k));
+   }
+ #else
+   V *operator[] (const K &k) {
+     // return search (wrap (this, &kvcmp, &k));
+-    return search (skvcmp, &kcmp, &k);
++    return this->search (skvcmp, &kcmp, &k);
+   }
+ #endif
+ };
diff --git a/devel/sfslite/patches/patch-async_qhash.h b/devel/sfslite/patches/patch-async_qhash.h
new file mode 100644
index 00000000000..447b06ed244
--- /dev/null
+++ b/devel/sfslite/patches/patch-async_qhash.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-async_qhash.h,v 1.1 2013/03/28 21:21:18 joerg Exp $
+
+--- async/qhash.h.orig	2013-03-25 14:17:11.000000000 +0000
++++ async/qhash.h
+@@ -71,7 +71,7 @@ private:
+ 
+   slot *getslot (const K &k) const {
+     slot *s;
+-    for (s = lookup_val (hash (k)); s && !eq (s->key, k); s = next_val (s))
++    for (s = this->lookup_val (hash (k)); s && !eq (s->key, k); s = this->next_val (s))
+       ;
+     return s;
+   }
+@@ -180,7 +180,7 @@ private:
+ 
+   slot *getslot (const K &k) const {
+     slot *s;
+-    for (s = lookup_val (hash (k)); s && !eq (s->key, k); s = next_val (s))
++    for (s = this->lookup_val (hash (k)); s && !eq (s->key, k); s = this->next_val (s))
+       ;
+     return s;
+   }
diff --git a/devel/sfslite/patches/patch-async_vec.h b/devel/sfslite/patches/patch-async_vec.h
new file mode 100644
index 00000000000..63fa2ef3d76
--- /dev/null
+++ b/devel/sfslite/patches/patch-async_vec.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-async_vec.h,v 1.1 2013/03/28 21:21:18 joerg Exp $
+
+--- async/vec.h.orig	2013-03-25 14:13:21.000000000 +0000
++++ async/vec.h
+@@ -121,7 +121,7 @@ protected:
+   static void destroy (elm_t &e) { e.~elm_t (); }
+ 
+   void init () { lastp = firstp = basep = def_basep (); limp = def_limp (); }
+-  void del () { while (firstp < lastp) firstp++->~elm_t (); bfree (basep); }
++  void del () { while (firstp < lastp) firstp++->~elm_t (); this->bfree (basep); }
+ 
+ #define append(v)						\
+ do {								\
+@@ -164,7 +164,7 @@ public:
+       elm_t *obasep = basep;
+       move (static_cast<elm_t *> (txmalloc (nalloc * sizeof (elm_t))));
+       limp = basep + nalloc;
+-      bfree (obasep);
++      this->bfree (obasep);
+     }
+     else
+       move (basep);