Commit 029e359d authored by Botond Baranyi's avatar Botond Baranyi

OOP: fixed nested template argument lists in code generated for exceptions (Bug 568899)

Signed-off-by: Botond Baranyi's avatarBotond Baranyi <botond.baranyi@ericsson.com>
Change-Id: I8c35937c31664f821565314e44e5b4ec1f8fa21f
parent bac61c61
......@@ -5548,7 +5548,7 @@ namespace Ttcn {
char* Def_Exception::generate_code_str(char *str)
{
return mputprintf(str, "EXCEPTION<%s>& %s = static_cast<EXCEPTION<%s>&>(exc_base);\n",
return mputprintf(str, "EXCEPTION< %s >& %s = static_cast<EXCEPTION< %s >&>(exc_base);\n",
type->get_genname_value(my_scope).c_str(), id->get_name().c_str(), type->get_genname_value(my_scope).c_str());
}
......
......@@ -8569,7 +8569,7 @@ error:
str = mputprintf(str, "%s[%i] = \"%s\";\n",
id_str.c_str(), i, t != NULL ? t->get_exception_name().c_str() : "object");
}
str = mputprintf(str, "throw EXCEPTION<%s>(new %s(%s), %s, %i);\n",
str = mputprintf(str, "throw EXCEPTION< %s >(new %s(%s), %s, %i);\n",
exc_type_str.c_str(), exc_type_str.c_str(), expr.expr, id_str.c_str(), nof_exc_types);
if (expr.postamble != NULL) {
str = mputstr(str, expr.postamble);
......
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