Add missing generic-type arguments of delegates

https://bugzilla.gnome.org/show_bug.cgi?id=772204

3 files changed, 15 insertions, 15 deletions

diff --git a/gee/arraylist.vala b/gee/arraylist.vala
index 5d2b392d8..fe398e432 100644
--- a/gee/arraylist.vala
+++ b/gee/arraylist.vala
@@ -32,18 +32,18 @@ public class Vala.ArrayList<G> : List<G> {
 		get { return _size; }
 	}
 
-	public EqualFunc equal_func {
+	public EqualFunc<G> equal_func {
 		set { _equal_func = value; }
 	}
 
 	private G[] _items = new G[4];
 	private int _size;
-	private EqualFunc _equal_func;
+	private EqualFunc<G> _equal_func;
 
 	// concurrent modification protection
 	private int _stamp = 0;
 
-	public ArrayList (EqualFunc equal_func = GLib.direct_equal) {
+	public ArrayList (EqualFunc<G> equal_func = GLib.direct_equal) {
 		this.equal_func = equal_func;
 	}
 
diff --git a/gee/hashmap.vala b/gee/hashmap.vala
index 33c2ef9bd..9085f10e4 100644
--- a/gee/hashmap.vala
+++ b/gee/hashmap.vala
@@ -32,15 +32,15 @@ public class Vala.HashMap<K,V> : Map<K,V> {
 		get { return _nnodes; }
 	}
 
-	public HashFunc key_hash_func {
+	public HashFunc<K> key_hash_func {
 		set { _key_hash_func = value; }
 	}
 
-	public EqualFunc key_equal_func {
+	public EqualFunc<K> key_equal_func {
 		set { _key_equal_func = value; }
 	}
 
-	public EqualFunc value_equal_func {
+	public EqualFunc<V> value_equal_func {
 		set { _value_equal_func = value; }
 	}
 
@@ -51,14 +51,14 @@ public class Vala.HashMap<K,V> : Map<K,V> {
 	// concurrent modification protection
 	private int _stamp = 0;
 
-	private HashFunc _key_hash_func;
-	private EqualFunc _key_equal_func;
-	private EqualFunc _value_equal_func;
+	private HashFunc<K> _key_hash_func;
+	private EqualFunc<K> _key_equal_func;
+	private EqualFunc<V> _value_equal_func;
 
 	private const int MIN_SIZE = 11;
 	private const int MAX_SIZE = 13845163;
 
-	public HashMap (HashFunc key_hash_func = GLib.direct_hash, EqualFunc key_equal_func = GLib.direct_equal, EqualFunc value_equal_func = GLib.direct_equal) {
+	public HashMap (HashFunc<K> key_hash_func = GLib.direct_hash, EqualFunc<K> key_equal_func = GLib.direct_equal, EqualFunc<V> value_equal_func = GLib.direct_equal) {
 		this.key_hash_func = key_hash_func;
 		this.key_equal_func = key_equal_func;
 		this.value_equal_func = value_equal_func;
diff --git a/gee/hashset.vala b/gee/hashset.vala
index 01452c669..6ca0dfa22 100644
--- a/gee/hashset.vala
+++ b/gee/hashset.vala
@@ -32,11 +32,11 @@ public class Vala.HashSet<G> : Set<G> {
 		get { return _nnodes; }
 	}
 
-	public HashFunc hash_func {
+	public HashFunc<G> hash_func {
 		set { _hash_func = value; }
 	}
 
-	public EqualFunc equal_func {
+	public EqualFunc<G> equal_func {
 		set { _equal_func = value; }
 	}
 
@@ -47,13 +47,13 @@ public class Vala.HashSet<G> : Set<G> {
 	// concurrent modification protection
 	private int _stamp = 0;
 
-	private HashFunc _hash_func;
-	private EqualFunc _equal_func;
+	private HashFunc<G> _hash_func;
+	private EqualFunc<G> _equal_func;
 
 	private const int MIN_SIZE = 11;
 	private const int MAX_SIZE = 13845163;
 
-	public HashSet (HashFunc hash_func = GLib.direct_hash, EqualFunc equal_func = GLib.direct_equal) {
+	public HashSet (HashFunc<G> hash_func = GLib.direct_hash, EqualFunc<G> equal_func = GLib.direct_equal) {
 		this.hash_func = hash_func;
 		this.equal_func = equal_func;
 		_array_size = MIN_SIZE;