Commit 16683040 authored by Robert Bradshaw's avatar Robert Bradshaw

Fix (obsolete) forward declared C++ subclass declarations.

parent 7f408bff
...@@ -1186,7 +1186,7 @@ class CppClassNode(CStructOrUnionDefNode): ...@@ -1186,7 +1186,7 @@ class CppClassNode(CStructOrUnionDefNode):
scope = None scope = None
if self.attributes is not None: if self.attributes is not None:
scope = CppClassScope(self.name, env, templates = self.templates) scope = CppClassScope(self.name, env, templates = self.templates)
base_class_types = [b.analyse(scope) for b in self.base_classes] base_class_types = [b.analyse(scope or env) for b in self.base_classes]
if self.templates is None: if self.templates is None:
template_types = None template_types = None
else: else:
......
...@@ -2028,6 +2028,8 @@ class CppClassScope(Scope): ...@@ -2028,6 +2028,8 @@ class CppClassScope(Scope):
self.default_constructor = True self.default_constructor = True
return return
for base_class in entry.type.base_classes: for base_class in entry.type.base_classes:
if base_class is PyrexTypes.error_type:
continue
temp_entry = base_class.scope.lookup_here("<init>") temp_entry = base_class.scope.lookup_here("<init>")
found = False found = False
if temp_entry is None: if temp_entry is None:
......
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