fix for empty discrete vars in cpp template

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20904 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · May 30, 2014 · 11147ac · 11147ac
1 parent 68d584c
commit 11147ac
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -5356,8 +5356,17 @@ match simCode
 case SIMCODE(modelInfo = MODELINFO(vars = vars as SIMVARS(__)))
   then
   let n_vars = intAdd(listLength(vars.algVars), intAdd( listLength(vars.intAlgVars) , listLength(vars.boolAlgVars )))
+  let modelname = lastIdentOfPath(modelInfo.name)
+  match n_vars
+  case "0" then 
+  <<
+    void <%modelname%>::saveDiscreteVars()
+    {
+    }
+  >>
+  else
   <<
-    void <%lastIdentOfPath(modelInfo.name)%>::saveDiscreteVars()
+    void <%modelname%>::saveDiscreteVars()
     {
        unsigned int n = <%n_vars%>;
        double  pre_vars[] = {

diff --git a/Compiler/Template/CodegenCppHpcom.tpl b/Compiler/Template/CodegenCppHpcom.tpl
@@ -1343,7 +1343,7 @@ let _extraCflags = match sopt case SOME(s as SIMULATION_SETTINGS(__)) then
        case "inline-rungekutta" then "-D_OMC_INLINE_RK"%>'
 let extraCflags = '<%_extraCflags%><% if Flags.isSet(Flags.GEN_DEBUG_SYMBOLS) then " -g"%>'
 
-let analyzationLibs = if Flags.isSet(Flags.HPCOM_ANALYZATION_MODE) then '$(LIBOMCPPOMCFACTORY) $(LIBOMCPPSIMCONTROLLER) $(LIBOMCPPSIMULATIONSETTINGS) $(LIBOMCPPSYSTEM) $(LIBOMCPPDATAEXCHANGE) $(LIBOMCPPNEWTON) $(LIBOMCPPKINSOL) $(LIBOMCPPCVODE) $(LIBOMCPPSOLVER) $(LIBOMCPPMATH) $(LIBOMCPPMODELICAUTILITIES) $(SUNDIALS_LIBS) $(LAPACK_LIBS) -lOMCppBase' else '-lOMCppOMCFactory -lOMCppBase'
+let analyzationLibs = if Flags.isSet(Flags.HPCOM_ANALYZATION_MODE) then '$(LIBOMCPPOMCFACTORY) $(LIBOMCPPSIMCONTROLLER) $(LIBOMCPPSIMULATIONSETTINGS) $(LIBOMCPPSYSTEM) $(LIBOMCPPDATAEXCHANGE) $(LIBOMCPPNEWTON) $(LIBOMCPPKINSOL) $(LIBOMCPPCVODE) $(LIBOMCPPSOLVER) $(LIBOMCPPMATH) $(LIBOMCPPMODELICAUTILITIES) $(SUNDIALS_LIBS) $(LAPACK_LIBS) $(BASE_LIB)' else '-lOMCppOMCFactory -lOMCppBase'
 let _extraCflags = if Flags.isSet(Flags.HPCOM_ANALYZATION_MODE) then '<%extraCflags%> -D ANALYZATION_MODE -I"$(SUNDIALS_INCLUDE)" -I"$(SUNDIALS_INCLUDE)/kinsol" -I"$(SUNDIALS_INCLUDE)/nvector"' else '<%extraCflags%>'
 <<
 # Makefile generated by OpenModelica

diff --git a/Compiler/Template/CodegenFMUCpp.tpl b/Compiler/Template/CodegenFMUCpp.tpl
@@ -527,7 +527,7 @@ case SIMCODE(modelInfo=MODELINFO(__), makefileParams=MAKEFILE_PARAMS(__), simula
   SRC+= OMCpp<%fileNamePrefix%>Jacobian.cpp
   SRC+= <%algloopcppfilenames(listAppend(allEquations,initialEquations),simCode)%>
   SRC+=  OMCpp<%fileNamePrefix%>StateSelection.cpp
-  LIBS= -lOMCppSystem_static -lOMCppDataExchange_static -lOMCppOMCFactory -lOMCppBase
+  LIBS= -lOMCppSystem_static -lOMCppDataExchange_static -lOMCppOMCFactory $(BASE_LIB)
   LIBS+= $(BOOST_SYSTEM_LIB) $(BOOST_FILESYSTEM_LIB) $(BOOST_SERIALIZATION_LIB)
   LIBS+= $(LINUX_LIB_DL)