fix invalid variable initializers

2008-01-22  Juerg Billeter  <j@bitron.ch>

	* gee/hashmap.vala, gee/hashset.vala: fix invalid variable initializers

svn path=/trunk/; revision=19

diff --git a/ChangeLog b/ChangeLog
index 68dd5fa..9b6131e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-01-22  Jürg Billeter  <j@bitron.ch>
 
+       * gee/hashmap.vala, gee/hashset.vala: fix invalid variable initializers
+
+2008-01-22  Jürg Billeter  <j@bitron.ch>
+
        * configure.ac: Post-release version bump
 
 2008-01-22  Jürg Billeter  <j@bitron.ch>

diff --git a/gee/hashmap.vala b/gee/hashmap.vala
index c6cd0f9..3868769 100644 (file)
--- a/gee/hashmap.vala
+++ b/gee/hashmap.vala
@@ -141,7 +141,7 @@ public class Gee.HashMap<K,V> : Object, Map<K,V> {
        private void resize () {
                if ((_array_size >= 3 * _nnodes && _array_size >= MIN_SIZE) ||
                    (3 * _array_size <= _nnodes && _array_size < MAX_SIZE)) {
-                       int new_array_size = SpacedPrimes.closest (_nnodes);
+                       int new_array_size = (int) SpacedPrimes.closest (_nnodes);
                        new_array_size = new_array_size.clamp (MIN_SIZE, MAX_SIZE);
 
                        Node<K,V>[] new_nodes = new Node<K,V>[new_array_size];

diff --git a/gee/hashset.vala b/gee/hashset.vala
index afa674d..36ec346 100644 (file)
--- a/gee/hashset.vala
+++ b/gee/hashset.vala
@@ -126,7 +126,7 @@ public class Gee.HashSet<G> : Object, Iterable<G>, Collection<G>, Set<G> {
        private void resize () {
                if ((_array_size >= 3 * _nnodes && _array_size >= MIN_SIZE) ||
                    (3 * _array_size <= _nnodes && _array_size < MAX_SIZE)) {
-                       int new_array_size = SpacedPrimes.closest (_nnodes);
+                       int new_array_size = (int) SpacedPrimes.closest (_nnodes);
                        new_array_size = new_array_size.clamp (MIN_SIZE, MAX_SIZE);
 
                        Node<G>[] new_nodes = new Node<G>[new_array_size];