From: Robert Bradshaw <robertwb@math.washington.edu>
Date: Tue, 15 Dec 2009 12:27:40 +0000 (-0800)
Subject: merge fallout
X-Git-Tag: 0.13.beta0~353^2~30
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=79eb3441978ed3850a0aaae3ee636c909c2232aa;p=cython.git

merge fallout
---

diff --git a/Cython/Compiler/Nodes.py b/Cython/Compiler/Nodes.py
index 68dd042d..8bb096eb 100644
--- a/Cython/Compiler/Nodes.py
+++ b/Cython/Compiler/Nodes.py
@@ -3473,7 +3473,7 @@ class DelStatNode(StatNode):
         for arg in self.args:
             arg.analyse_target_expression(env, None)
             if arg.type.is_pyobject:
-                self.gil_check(env)
+                pass
             elif arg.type.is_ptr and arg.type.base_type.is_cpp_class:
                 self.cpp_check(env)
             elif arg.type.is_cpp_class:
diff --git a/Cython/Compiler/Symtab.py b/Cython/Compiler/Symtab.py
index cb5f41a7..63deaea4 100644
--- a/Cython/Compiler/Symtab.py
+++ b/Cython/Compiler/Symtab.py
@@ -311,10 +311,11 @@ class Scope(object):
         entry.in_cinclude = self.in_cinclude
         if name:
             entry.qualified_name = self.qualify_name(name)
-            if name in entries and self.is_cpp():
-                entries[name].overloaded_alternatives.append(entry)
-            else:
-                entries[name] = entry
+#            if name in entries and self.is_cpp():
+#                entries[name].overloaded_alternatives.append(entry)
+#            else:
+#                entries[name] = entry
+            entries[name] = entry
         entry.scope = self
         entry.visibility = visibility
         return entry