Sync with 5.2.0

[deliverable/titan.core.git] / compiler2 / ttcn3 / TtcnTemplate.cc

diff --git a/compiler2/ttcn3/TtcnTemplate.cc b/compiler2/ttcn3/TtcnTemplate.cc
index 8052ecc0c0648542a7aac1c4ee23b6878da0329d..bf646c6aca538013d956dbcc7a19d537a5f639c1 100644 (file)
--- a/compiler2/ttcn3/TtcnTemplate.cc
+++ b/compiler2/ttcn3/TtcnTemplate.cc
@@ -1729,7 +1729,8 @@ namespace Ttcn {
         vs->add_v(v);
       }
       ret_val = new Value(Value::V_SEQOF, vs);
-      if (gov) ret_val->set_my_governor(gov->get_parent_type());
+      if (gov) gov = gov->get_parent_type();
+      if (gov) ret_val->set_my_governor(gov);
       break; }
     case NAMED_TEMPLATE_LIST: {
       NamedValues *nvs = new NamedValues;
@@ -1744,7 +1745,8 @@ namespace Ttcn {
         nvs->add_nv(nv);
       }
       ret_val = new Value(Value::V_SEQ, nvs);
-      if (gov) ret_val->set_my_governor(gov->get_parent_type());
+      if (gov) gov = gov->get_parent_type();
+      if (gov) ret_val->set_my_governor(gov);
       break; }
     case INDEXED_TEMPLATE_LIST: {
       Values *ivs = new Values(true);
@@ -1759,7 +1761,8 @@ namespace Ttcn {
         ivs->add_iv(iv);
       }
       ret_val = new Value(Value::V_SEQOF, ivs);
-      if (gov) ret_val->set_my_governor(gov->get_parent_type());
+      if (gov) gov = gov->get_parent_type();
+      if (gov) ret_val->set_my_governor(gov);
       break; }
     default:
       FATAL_ERROR("Template::get_Value()");