Fix some compiler warnings

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@18292 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Nov 25, 2013 · 0836b8b · 0836b8b
1 parent 50fa1a7
commit 0836b8b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Compiler/Template/CodegenC.tpl b/Compiler/Template/CodegenC.tpl
@@ -279,9 +279,6 @@ template simulationFile_inz(SimCode simCode, String guid)
     <%simulationFileHeader(simCode)%>
     #include "<%simCode.fileNamePrefix%>_11mix.h"
     #include "<%simCode.fileNamePrefix%>_12jac.h"
-    #include "linearSystem.h"
-    #include "nonlinearSystem.h"
-    #include "mixedSystem.h"
 
     <%functionInitialResidual(residualEquations, modelNamePrefix(simCode))%>
     <%functionInitialEquations(useSymbolicInitialization, initialEquations, modelNamePrefix(simCode))%>    
@@ -632,6 +629,9 @@ template simulationFileHeader(SimCode simCode)
     #include "omc_error.h"
     #include "model_help.h"
     #include "delay.h"
+    #include "linearSystem.h"
+    #include "nonlinearSystem.h"
+    #include "mixedSystem.h"
 
     #include <assert.h>
     #include <string.h>
@@ -3287,8 +3287,9 @@ template equation_(SimEqSystem eq, Context context, Text &varDecls /*BUFP*/, Tex
     then equationAlgorithm(e, context, &varD /*BUFD*/)
   case e as SES_LINEAR(__)
     then equationLinear(e, context, &varD /*BUFD*/)
-  case e as SES_NONLINEAR(__)
-    then equationNonlinear(e, context, &varD /*BUFD*/)
+  case e as SES_NONLINEAR(__) then
+    let &tempeqns += (e.eqs |> eq => 'void eqFunction_<%equationIndex(eq)%>(DATA*);' ; separator = "\n")
+    equationNonlinear(e, context, &varD /*BUFD*/)
   case e as SES_WHEN(__)
     then equationWhen(e, context, &varD /*BUFD*/)
   case e as SES_RESIDUAL(__)

diff --git a/SimulationRuntime/c/util/string_array.h b/SimulationRuntime/c/util/string_array.h
@@ -49,6 +49,7 @@ extern void simple_alloc_1d_string_array(string_array_t* dest, int n);
 extern void simple_alloc_2d_string_array(string_array_t *dest, int r, int c);
 
 extern void alloc_string_array(string_array_t *dest, int ndims, ...);
+extern void fill_alloc_string_array(string_array_t* dest, modelica_string_t value, int ndims, ...);
 
 /* Allocation of string data */
 extern void alloc_string_array_data(string_array_t* a);