update for use with non-null types

2008-04-15  Juerg Billeter  <j@bitron.ch>

	* vala/valascope.vala: update for use with non-null types

svn path=/trunk/; revision=1241

diff --git a/ChangeLog b/ChangeLog
index 49c01e4..1013fca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-04-15  Jürg Billeter  <j@bitron.ch>
 
+       * vala/valascope.vala: update for use with non-null types
+
+2008-04-15  Jürg Billeter  <j@bitron.ch>
+
        * vapi/cairo.vapi: fix cairo_set_dash binding
 
 2008-04-15  Jürg Billeter  <j@bitron.ch>

diff --git a/vala/valascope.vala b/vala/valascope.vala
index 7dd6841..21ff653 100644 (file)
--- a/vala/valascope.vala
+++ b/vala/valascope.vala
@@ -55,7 +55,7 @@ public class Vala.Scope : Object {
         * @param name name for the specified symbol
         * @param sym  a symbol
         */
-       public void add (string name, Symbol sym) {
+       public void add (string? name, Symbol sym) {
                if (name != null) {
                        if (symbol_table == null) {
                                symbol_table = new HashMap<string,Symbol> (str_hash, str_equal);
@@ -65,7 +65,7 @@ public class Vala.Scope : Object {
                                return;
                        }
 
-                       symbol_table[name] = sym;
+                       symbol_table[(string) name] = sym;
                }
                sym.owner = this;
        }