From: daniloaf@daniloaf-PC <none@none>
Date: Sat, 30 Jan 2010 18:39:29 +0000 (-0300)
Subject: Fixed bug on subclass instanciation and using 'del' on templates compile test
X-Git-Tag: 0.13.beta0~353^2~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c176a809f8cefb4745828d7feb4471c365f376c5;p=cython.git

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 e7c1141c..0b7592fb 100755
--- 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 2476a530..7fba995f 100644
--- 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