Merge branch 'master' of https://github.com/blackvladimir/cython

Cython/Compiler/Parsing.py

@@ -296,7 +296,8 @@ def p_typecast(s):
     s.next()
     base_type = p_c_base_type(s)
     is_memslice = isinstance(base_type, Nodes.MemoryViewSliceTypeNode)
-    if not is_memslice and base_type.name is None:
+    is_template =isinstance(base_type, Nodes.TemplatedTypeNode)
+    if not is_memslice and not is_template and base_type.name is None:
         s.error("Unknown type")
     declarator = p_c_declarator(s, empty = 1)
     if s.sy == '?':

Cython/Compiler/PyrexTypes.py

@@ -2954,7 +2954,7 @@ class CppClassType(CType):
         if other_type.is_cpp_class:
             if self == other_type:
                 return 1
-            elif self.template_type and self.template_type == other_type.template_type:
+            elif self.template_type and other_type.template_type:
                 if self.templates == other_type.templates:
                     return 1
                 for t1, t2 in zip(self.templates, other_type.templates):