Commit 79eb3441 authored by Robert Bradshaw's avatar Robert Bradshaw

merge fallout

parent 73da9b35
...@@ -3473,7 +3473,7 @@ class DelStatNode(StatNode): ...@@ -3473,7 +3473,7 @@ class DelStatNode(StatNode):
for arg in self.args: for arg in self.args:
arg.analyse_target_expression(env, None) arg.analyse_target_expression(env, None)
if arg.type.is_pyobject: if arg.type.is_pyobject:
self.gil_check(env) pass
elif arg.type.is_ptr and arg.type.base_type.is_cpp_class: elif arg.type.is_ptr and arg.type.base_type.is_cpp_class:
self.cpp_check(env) self.cpp_check(env)
elif arg.type.is_cpp_class: elif arg.type.is_cpp_class:
......
...@@ -311,9 +311,10 @@ class Scope(object): ...@@ -311,9 +311,10 @@ class Scope(object):
entry.in_cinclude = self.in_cinclude entry.in_cinclude = self.in_cinclude
if name: if name:
entry.qualified_name = self.qualify_name(name) entry.qualified_name = self.qualify_name(name)
if name in entries and self.is_cpp(): # if name in entries and self.is_cpp():
entries[name].overloaded_alternatives.append(entry) # entries[name].overloaded_alternatives.append(entry)
else: # else:
# entries[name] = entry
entries[name] = entry entries[name] = entry
entry.scope = self entry.scope = self
entry.visibility = visibility entry.visibility = visibility
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment