**** Merged from MCS ****

svn path=/trunk/mcs/; revision=36183

diff --git a/mcs/gmcs/ChangeLog b/mcs/gmcs/ChangeLog
index 09832aad548ba98968a28b2a76836d5b4355bbe7..74cf3f0bb4de272523cf27cef60bb0372c9b83e4 100755 (executable)
--- a/mcs/gmcs/ChangeLog
+++ b/mcs/gmcs/ChangeLog
@@ -22,6 +22,10 @@
        * class.cs (TypeContainer.DoDefineMembers): Setup cache for
        interfaces too.
 
+2004-11-14  Ben Maurer  <bmaurer@ximian.com>
+
+       * statement.cs: Avoid adding bools to a hashtable.
+
 2004-11-15  Martin Baulig  <martin@ximian.com>
 
        * decl.cs (MemberName.GetPartialName): Removed, use GetTypeName() instead.

diff --git a/mcs/gmcs/statement.cs b/mcs/gmcs/statement.cs
index 895b08e52dcee6af36155e42059c33984b21eede..7e4606719633ce83b07ccdb7128f5a0d69295823 100755 (executable)
--- a/mcs/gmcs/statement.cs
+++ b/mcs/gmcs/statement.cs
@@ -1432,8 +1432,7 @@ namespace Mono.CSharp {
                        if (child_variable_names == null)
                                child_variable_names = new Hashtable ();
 
-                       if (!child_variable_names.Contains (name))
-                               child_variable_names.Add (name, true);
+                       child_variable_names [name] = null;
                }
 
                // <summary>