Commit 3c62a75e authored by scoder's avatar scoder

Merge pull request #317 from larsmans/nested_templates

fix bug in nested C++ template syntax
parents 9c8d1ec4 8baa9dba
......@@ -3153,10 +3153,8 @@ class CppClassType(CType):
if for_display:
brackets = "[%s]"
else:
brackets = "<%s>"
brackets = "<%s> "
templates = brackets % ",".join(template_strings)
if templates[-2:] == ">>":
templates = templates[:-2] + "> >"
else:
templates = ""
if pyrex or for_display:
......
......@@ -16,6 +16,8 @@ cdef extern from "templates.h":
T getValue1()
U getValue2()
void template_function[T](TemplateTest1[T] &)
cdef TemplateTest1[int] a
cdef TemplateTest1[int]* b = new TemplateTest1[int]()
......@@ -39,3 +41,11 @@ cdef TemplateTest1_int aa
# Verify that T767 is fixed.
cdef public int func(int arg):
return arg
# Regression test: the function call used to produce
# template_function<TemplateTest1<int>>(__pyx_v_t);
# which is valid C++11, but not valid C++98 because the ">>" would be
# parsed as a single token.
cdef public void use_nested_templates():
cdef TemplateTest1[TemplateTest1[int]] t
template_function(t)
......@@ -22,4 +22,9 @@ public:
U getValue2() { return value2; }
};
template <typename T>
void template_function(TemplateTest1<T> &)
{
}
#endif
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