- Fix compilation

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@12750 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Aug 31, 2012 · 4536cb4 · 4536cb4
1 parent 1e7827f
commit 4536cb4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Compiler/BackEnd/Derive.mo b/Compiler/BackEnd/Derive.mo
@@ -136,7 +136,7 @@ algorithm
         // get Allgorithm
         DAE.ALGORITHM_STMTS(statementLst= {DAE.STMT_TUPLE_ASSIGN(type_=exptyp,expExpLst=expExpLst,exp = e1,source=sourceStmt)}) = alg;
         e1_1 = differentiateFunctionTime(e1,(timevars,shared));
-        (e2,source) = Inline.inlineExp(e1_1,(SOME(funcs),{DAE.NORM_INLINE()}),source);
+        (e2,source,_) = Inline.inlineExp(e1_1,(SOME(funcs),{DAE.NORM_INLINE()}),source);
         (expExpLst1,out1) = differentiateFunctionTimeOutputs(e1,e2,expExpLst,expExpLst,(timevars,shared));
         op1 = DAE.OP_DERIVE(DAE.crefTime,e1,e2);
         source = DAEUtil.addSymbolicTransformation(source,op1);
@@ -615,7 +615,7 @@ algorithm
       equation
         // get Derivative function
         e1 = differentiateFunctionTime(e,inVariables);
-        (e2,_) = Inline.inlineExp(e1,(SOME(functions),{DAE.NORM_INLINE()}),DAE.emptyElementSource/*TODO:Can we propagate source?*/);
+        (e2,_,_) = Inline.inlineExp(e1,(SOME(functions),{DAE.NORM_INLINE()}),DAE.emptyElementSource/*TODO:Can we propagate source?*/);
       then
         e2;
 

diff --git a/Compiler/BackEnd/SimCode.mo b/Compiler/BackEnd/SimCode.mo
@@ -1689,7 +1689,7 @@ algorithm
         part_func_elems = PartFn.partEvalBackendDAE(dlow,part_func_elems);
         funcelems = List.union(part_func_elems, part_func_elems);
         //funcelems = List.union(funcelems, part_func_elems);
-        funcelems = Inline.inlineCallsInFunctions(funcelems,(NONE(),{DAE.NORM_INLINE(), DAE.AFTER_INDEX_RED_INLINE()}));
+        funcelems = Inline.inlineCallsInFunctions(funcelems,(NONE(),{DAE.NORM_INLINE(), DAE.AFTER_INDEX_RED_INLINE()}),{});
         //Debug.fprintln(Flags.INFO, "Generating functions, call Codegen.\n") "debug" ;
         (funcelems,literals as (_,_,lits)) = simulationFindLiterals(dlow,funcelems);
         (fns, recordDecls, includes2, includeDirs2, libs2) = elaborateFunctions(funcelems, {}, lits, {}); // Do we need metarecords here as well?