walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Ticket #4544: Also handle Foo<struct Bar> constructs.

This commit is contained in:
Simon Martin 2017-04-17 11:24:28 +02:00 committed by PKEuS
parent 892f11b7f1
commit 5fd686c878
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/templatesimplifier.cpp
View File

@ -1303,7 +1303,7 @@ bool TemplateSimplifier::simplifyTemplateInstantiations(
typeForPatternMatch += tok3->str();
}
// add additional type information
if (!constconst && tok3->str() != "class") {
if (!constconst && !Token::Match(tok3, "class|struct|enum")) {
if (tok3->isUnsigned())
typeForNewName += "unsigned";
else if (tok3->isSigned())

30
test/testsimplifytemplate.cpp
View File

@ -766,12 +766,30 @@ private:
}
void template37() { // #4544 - A<class B> a;
const char code[] = "class A { };\n"
"template<class T> class B {};\n"
"B<class A> b1;\n"
"B<A> b2;";
ASSERT_EQUALS("class A { } ; B < A > b1 ; B < A > b2 ; class B < A > { } ;",
tok(code));
{
const char code[] = "class A { };\n"
"template<class T> class B {};\n"
"B<class A> b1;\n"
"B<A> b2;";
ASSERT_EQUALS("class A { } ; B < A > b1 ; B < A > b2 ; class B < A > { } ;",
tok(code));
}
{
const char code[] = "struct A { };\n"
"template<class T> class B {};\n"
"B<struct A> b1;\n"
"B<A> b2;";
ASSERT_EQUALS("struct A { } ; B < A > b1 ; B < A > b2 ; class B < A > { } ;",
tok(code));
}
{
const char code[] = "enum A { };\n"
"template<class T> class B {};\n"
"B<enum A> b1;\n"
"B<A> b2;";
ASSERT_EQUALS("enum A { } ; B < A > b1 ; B < A > b2 ; class B < A > { } ;",
tok(code));
}
}
void template_unhandled() {