diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2021-10-15 12:40:06 +0200 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2021-10-15 13:23:04 +0200 |
commit | f0ccfe94ff731929e93601a38f931a12d52e5c2e (patch) | |
tree | 6646aba75cb5d274266c870df03f096307e263e3 /gee | |
parent | db2efd468d32832ed787165ddda555706d888aca (diff) | |
download | libgee-f0ccfe94ff731929e93601a38f931a12d52e5c2e.tar.gz |
Add more missing generic type arguments
Diffstat (limited to 'gee')
-rw-r--r-- | gee/arrayqueue.vala | 2 | ||||
-rw-r--r-- | gee/concurrentset.vala | 4 | ||||
-rw-r--r-- | gee/hashmap.vala | 10 | ||||
-rw-r--r-- | gee/task.vala | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/gee/arrayqueue.vala b/gee/arrayqueue.vala index d332af7..5dcfa60 100644 --- a/gee/arrayqueue.vala +++ b/gee/arrayqueue.vala @@ -364,7 +364,7 @@ public class Gee.ArrayQueue<G> : Gee.AbstractQueue<G>, Deque<G> { } } - protected ArrayQueue _queue; + protected ArrayQueue<G> _queue; protected int _stamp; protected int _offset = -1; protected bool _removed = false; diff --git a/gee/concurrentset.vala b/gee/concurrentset.vala index c5c7751..fe1741a 100644 --- a/gee/concurrentset.vala +++ b/gee/concurrentset.vala @@ -256,13 +256,13 @@ public class Gee.ConcurrentSet<G> : AbstractSortedSet<G> { }); private class Iterator<G> : Object, Traversable<G>, Gee.Iterator<G> { - public Iterator (ConcurrentSet cset, Tower<G> head) { + public Iterator (ConcurrentSet<G> cset, Tower<G> head) { _curr = head; _set = cset; assert (_curr != null); } - public Iterator.point_at (ConcurrentSet cset, ref TowerIter<G> prev, Tower<G> curr) { + public Iterator.point_at (ConcurrentSet<G> cset, ref TowerIter<G> prev, Tower<G> curr) { _curr = curr; _set = cset; _prev = prev; diff --git a/gee/hashmap.vala b/gee/hashmap.vala index b07d35e..a7bae9f 100644 --- a/gee/hashmap.vala +++ b/gee/hashmap.vala @@ -379,7 +379,7 @@ public class Gee.HashMap<K,V> : Gee.AbstractMap<K,V> { private class KeySet<K,V> : AbstractSet<K> { private HashMap<K,V> _map; - public KeySet (HashMap map) { + public KeySet (HashMap<K,V> map) { _map = map; } @@ -415,7 +415,7 @@ public class Gee.HashMap<K,V> : Gee.AbstractMap<K,V> { private class ValueCollection<K,V> : AbstractCollection<V> { private HashMap<K,V> _map; - public ValueCollection (HashMap map) { + public ValueCollection (HashMap<K,V> map) { _map = map; } @@ -491,7 +491,7 @@ public class Gee.HashMap<K,V> : Gee.AbstractMap<K,V> { } private abstract class NodeIterator<K,V> : Object { - protected NodeIterator (HashMap map) { + protected NodeIterator (HashMap<K,V> map) { _map = map; _stamp = _map._stamp; } @@ -549,7 +549,7 @@ public class Gee.HashMap<K,V> : Gee.AbstractMap<K,V> { } private class KeyIterator<K,V> : NodeIterator<K,V>, Traversable<K>, Iterator<K> { - public KeyIterator (HashMap map) { + public KeyIterator (HashMap<K,V> map) { base (map); } @@ -607,7 +607,7 @@ public class Gee.HashMap<K,V> : Gee.AbstractMap<K,V> { } private class MapIterator<K,V> : NodeIterator<K,V>, Gee.MapIterator<K,V> { - public MapIterator (HashMap map) { + public MapIterator (HashMap<K,V> map) { base (map); } diff --git a/gee/task.vala b/gee/task.vala index 00cf74f..155906d 100644 --- a/gee/task.vala +++ b/gee/task.vala @@ -69,8 +69,8 @@ namespace Gee { public void run() { promise.set_value(function()); } - private static GLib.Once<ThreadPool<TaskData>> async_pool; - internal static unowned ThreadPool<TaskData> get_async_pool () { + private static GLib.Once<ThreadPool<TaskData<G>>> async_pool; + internal static unowned ThreadPool<TaskData<G>> get_async_pool () { return async_pool.once(() => { int num_threads = (int)GLib.get_num_processors (); string? gee_num_threads_str = Environment.get_variable("GEE_NUM_THREADS"); @@ -81,7 +81,7 @@ namespace Gee { } } try { - return new ThreadPool<TaskData>.with_owned_data((tdata) => { + return new ThreadPool<TaskData<G>>.with_owned_data((tdata) => { tdata.run(); }, num_threads, false); } catch (ThreadError err) { |