summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2016-09-27 17:26:52 +0200
committerJürg Billeter <j@bitron.ch>2016-09-27 17:28:22 +0200
commit71c884b0a7fe19bc43de7280cda248407821d1f2 (patch)
tree55616bc51b391010e17ccee702a2d52fab40e19c
parentb8babe694859fe02a6113c4b7ab3cc2a8b3649b2 (diff)
downloadlibgee-71c884b0a7fe19bc43de7280cda248407821d1f2.tar.gz
Fix type parameters in TreeMap
-rw-r--r--gee/treemap.vala16
1 files changed, 8 insertions, 8 deletions
diff --git a/gee/treemap.vala b/gee/treemap.vala
index 3b08c12..c8db122 100644
--- a/gee/treemap.vala
+++ b/gee/treemap.vala
@@ -809,8 +809,8 @@ public class Gee.TreeMap<K,V> : Gee.AbstractBidirSortedMap<K,V> {
}
}
- private weak SortedSet<Entry<K,V>>? _entries;
- public override Set<Entry<K,V>> entries {
+ private weak SortedSet<Map.Entry<K,V>>? _entries;
+ public override Set<Map.Entry<K,V>> entries {
owned get {
var entries = _entries;
if (_entries == null) {
@@ -1917,11 +1917,11 @@ public class Gee.TreeMap<K,V> : Gee.AbstractBidirSortedMap<K,V> {
return true;
}
- public Gee.Iterator<Entry<K,V>>[] tee (uint forks) {
+ public Gee.Iterator<Map.Entry<K,V>>[] tee (uint forks) {
if (forks == 0) {
- return new Iterator<Entry<K,V>>[0];
+ return new Iterator<Map.Entry<K,V>>[0];
} else {
- Gee.Iterator<Entry<K,V>>[] result = new Gee.Iterator<Entry<K,V>>[forks];
+ Gee.Iterator<Map.Entry<K,V>>[] result = new Gee.Iterator<Map.Entry<K,V>>[forks];
result[0] = this;
for (uint i = 1; i < forks; i++) {
result[i] = new EntryIterator<K,V>.from_iterator (this);
@@ -1967,11 +1967,11 @@ public class Gee.TreeMap<K,V> : Gee.AbstractBidirSortedMap<K,V> {
return true;
}
- public Gee.Iterator<Entry<K,V>>[] tee (uint forks) {
+ public Gee.Iterator<Map.Entry<K,V>>[] tee (uint forks) {
if (forks == 0) {
- return new Iterator<Entry<K,V>>[0];
+ return new Iterator<Map.Entry<K,V>>[0];
} else {
- Gee.Iterator<Entry<K,V>>[] result = new Gee.Iterator<Entry<K,V>>[forks];
+ Gee.Iterator<Map.Entry<K,V>>[] result = new Gee.Iterator<Map.Entry<K,V>>[forks];
result[0] = this;
for (uint i = 1; i < forks; i++) {
result[i] = new SubEntryIterator<K,V>.from_iterator (this);