From e182aade28071f7d500d8f7b2c40fc00fccedace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Franke?= Date: Thu, 6 Aug 2015 11:53:19 +0200 Subject: [PATCH] adapt processing of outputs to recent changes --- Compiler/Template/CodegenCpp.tpl | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl index a90c054aeaf..dcd45442879 100644 --- a/Compiler/Template/CodegenCpp.tpl +++ b/Compiler/Template/CodegenCpp.tpl @@ -4725,8 +4725,7 @@ case efn as EXTERNAL_FUNCTION(extArgs=extArgs) then let &inputAssign = buffer "" /*BUFD*/ let &outputAssign = buffer "" /*BUFD*/ - // make sure the variable is named "out", doh! - let retVar = if outVars then '_<%fname%>' + let retVar = if outVars then match outVars case {var} then funArgName(var) else '_<%fname%>' let &outVarInits = buffer "" let callPart = match outVars case {var} then extFunCall(fn, &preExp, &varDeclsExtFunCall, &inputAssign, &outputAssign, simCode, &extraFuncs, &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation, false) @@ -4750,8 +4749,6 @@ case efn as EXTERNAL_FUNCTION(extArgs=extArgs) then ) end match - - let &varDecls1 = buffer "" let &outVarInits1 = buffer "" let &outVarCopy1 = buffer "" @@ -4770,9 +4767,6 @@ case efn as EXTERNAL_FUNCTION(extArgs=extArgs) then case "" then << <%if retVar then 'output = <%retVar%>;' else '/*no output*/' %> >> else outVarAssign1 - - - let fnBody = << void /*<%retType%>*/ Functions::<%fname%>(<%funArgs |> var => funArgDefinition(var,simCode , &extraFuncs , &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation) ;separator=", "%><%if funArgs then if outVars then "," else ""%> <%if retVar then '<%retType%>& output' %>)/*function2*/ {