merge fallout

diff --git a/Cython/Compiler/Nodes.py b/Cython/Compiler/Nodes.py
index 68dd042dc756810a87bc38c581a744a6d5e77edb..8bb096eb94d10c177cede985cd20f232970396df 100644 (file)
--- 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 cb5f41a7b5a74c4ed6a1c0f761992c733fefa04c..63deaea429fe5e3c62d3a169c930e0dca6ba7c42 100644 (file)
--- 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