- bugfix remove alias equations

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@8257 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 16, 2011 · 71df6bc · 71df6bc
1 parent 4002af6
commit 71df6bc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Compiler/susan_codegen/SimCode/SimCodeC.tpl b/Compiler/susan_codegen/SimCode/SimCodeC.tpl
@@ -282,11 +282,11 @@ case MODELINFO(varInfo=VARINFO(__), vars=SIMVARS(__)) then
   if (data->nAlias)
     memcpy(data->realAlias,omc__realAlias,sizeof(DATA_REAL_ALIAS)*data->nAlias);
   if (data->stringVariables.nAlias)
-    memcpy(data->intVariables.nAlias,omc__realAlias,sizeof(DATA_INT_ALIAS)*data->intVariables.nAlias);
+    memcpy(data->intVariables.alias,omc__intAlias,sizeof(DATA_INT_ALIAS)*data->intVariables.nAlias);
   if (data->stringVariables.nAlias)
-    memcpy(data->boolVariables.nAlias,omc__realAlias,sizeof(DATA_BOOL_ALIAS)*data->boolVariables.nAlias);
+    memcpy(data->boolVariables.alias,omc__boolAlias,sizeof(DATA_BOOL_ALIAS)*data->boolVariables.nAlias);
   if (data->stringVariables.nAlias)
-    memcpy(data->stringVariables.alias,omc__realAlias,sizeof(DATA_STRING_ALIAS)*data->stringVariables.nAlias);  
+    memcpy(data->stringVariables.alias,omc__stringAlias,sizeof(DATA_STRING_ALIAS)*data->stringVariables.nAlias);  
   };
 
   static char init_fixed[NX+NX+NY+NYINT+NYBOOL+NYSTR+NP+NPINT+NPBOOL+NPSTR] = {

diff --git a/Compiler/susan_codegen/SimCode/SimCodeFMU.tpl b/Compiler/susan_codegen/SimCode/SimCodeFMU.tpl
@@ -809,7 +809,7 @@ match simVar
   case SIMVAR(__) then
   let description = if comment then '// "<%comment%>"'
   <<
-  case <%cref(name)%>_ : return (globalData-><%arrayName%>[<%index%>].negate?*(globalData-><%arrayName%>[<%index%>].alias):<%negator%>*(globalData-><%arrayName%>[<%index%>].alias)); break;
+  case <%cref(name)%>_ : return (globalData-><%arrayName%>[<%index%>].negate?<%negator%>*(globalData-><%arrayName%>[<%index%>].alias):*(globalData-><%arrayName%>[<%index%>].alias)); break;
   >>
 end SwitchAliasVars;