Fixed bug on subclass instanciation and using 'del' on templates compile test

diff --git a/Cython/Compiler/PyrexTypes.py b/Cython/Compiler/PyrexTypes.py
index e7c1141cd2f62bea18272a8c3684e068c678bf66..0b7592fb40a12372a78084f93f9d6543f61173e2 100755 (executable)
--- a/Cython/Compiler/PyrexTypes.py
+++ b/Cython/Compiler/PyrexTypes.py
@@ -1,4 +1,5 @@
 
+
 #
 #   Pyrex - Types
 #
@@ -1879,7 +1880,7 @@ class CppClassType(CType):
         if other_type.is_cpp_class:
             if self == other_type:
                 return 1
-            elif self.template_type == other_type.template_type:
+            elif self.template_type and self.template_type == other_type.template_type:
                 if self.templates == other_type.templates:
                     return 1
                 for t1, t2 in zip(self.templates, other_type.templates):

diff --git a/tests/compile/cpp_templates.pyx b/tests/compile/cpp_templates.pyx
index 2476a530c2e2a240a99e94534b60c2c8d71fd2ee..7fba995f46be01cefe59e3f1f70dc7891e2eaf87 100644 (file)
--- a/tests/compile/cpp_templates.pyx
+++ b/tests/compile/cpp_templates.pyx
@@ -26,3 +26,5 @@ c = e.getValue2()
 
 cdef char f = d.getValue2()
 f = e.getValue2()
+
+del b, e