Skip to content

Commit

Permalink
fix for external C Array arguments data pointer
Browse files Browse the repository at this point in the history
  • Loading branch information
niklwors committed Sep 22, 2015
1 parent f49a665 commit 9c70b1b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Compiler/Template/CodegenCpp.tpl
Expand Up @@ -5203,7 +5203,7 @@ template daeExternalCExp(Exp exp, Context context, Text &preExp /*BUFP*/,Text &v
match typeof(exp)
case T_ARRAY(__) then // Array-expressions
let shortTypeStr = expTypeShort(typeof(exp))
'<%daeExp(exp, context, &preExp, &varDecls,simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)%>).data()'
'<%daeExp(exp, context, &preExp, &varDecls,simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)%>.getData()'
else daeExp(exp, context, &preExp, &varDecls,simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
end daeExternalCExp;

Expand Down
4 changes: 2 additions & 2 deletions Compiler/Template/CodegenCppCommon.tpl
Expand Up @@ -788,9 +788,9 @@ template expTypeFlag(DAE.Type ty, Integer flag)
match ty case T_COMPLEX(complexClassType=EXTERNAL_OBJ(__)) then
'<%expTypeShort(ty)%>'
else match ty case T_COMPLEX(complexClassType=RECORD(path=rname)) then
'<%underscorePath(rname)%>Type &'
'<%underscorePath(rname)%>Type&'
else match ty case T_COMPLEX(__) then
'<%underscorePath(ClassInf.getStateName(complexClassType))%> &'
'<%underscorePath(ClassInf.getStateName(complexClassType))%>&'
else
'<%expTypeShort(ty)%>'

Expand Down

0 comments on commit 9c70b1b

Please sign in to comment.