Merge pull request #355 from ludvichzme/master

Fix condition in declare_cpp_class

Cython/Compiler/Symtab.py

@@ -575,7 +575,7 @@ class Scope(object):
                 else:
                     declare_inherited_attributes(entry, base_class.base_classes)
                     entry.type.scope.declare_inherited_cpp_attributes(base_class.scope)
-        if entry.type.scope:
+        if scope:
             declare_inherited_attributes(entry, base_classes)
             scope.declare_var(name="this", cname="this", type=PyrexTypes.CPtrType(entry.type), pos=entry.pos)
         if self.is_cpp_class_scope:

tests/compile/cpp_class_redefinition.pyx

+# tag: cpp
+# mode: compile
+
+cdef extern from "templates.h":
+    cdef cppclass TemplateTest1[T]:
+        TemplateTest1()
+        T value
+        int t
+        T getValue()
+
+    cdef cppclass TemplateTest1[T]
+