fix CPP-Runtime

Author: Willi Braun

Compiler/Template/CodegenCpp.tpl

@@ -5737,6 +5737,7 @@ case SIMCODE(modelInfo = MODELINFO(__))  then
    void <%lastIdentOfPath(modelInfo.name)%>Initialize::initializeFreeVariables()
    {
       _simTime = 0.0;
+      _state_var_reinitialized = false;
 
       /*initialize parameter*/
       initializeParameterVars();
@@ -6919,6 +6920,7 @@ match modelInfo
       //Variables:
       boost::shared_ptr<EventHandling> _event_handling;
       boost::shared_ptr<DiscreteEvents> _discrete_events;
+      bool _state_var_reinitialized;
 
       //pointer to simVars-array to speedup simulation and compile time
       double* _pointerToRealVars;
@@ -10798,8 +10800,8 @@ match typeof(e.right)
     <%cref1(e.left, simCode , &extraFuncs , &extraFuncsDecl,  extraFuncsNamespace, context, varDecls, stateDerVectorName, useFlatArrayNotation)%> = _discrete_events->pre(<%cref1(e.left, simCode , &extraFuncs , &extraFuncsDecl,  extraFuncsNamespace, context, varDecls, stateDerVectorName, useFlatArrayNotation)%>);
    >>
 end match
-   else
-    error(sourceInfo(), 'No support for this sort of pre call')
+        else
+          <<; // nothing to do>>
 ;separator="\n")
 <<
   <%body%>
@@ -10869,7 +10871,7 @@ template whenOperators(list<WhenOperator> whenOps, Context context, Text &varDec
         let &varDeclsCref = buffer "" /*BUFD*/
         let val = daeExp(value, contextSimulationDiscrete, &preExp /*BUFC*/, &varDecls /*BUFD*/,simCode , &extraFuncs , &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
         <<
-        state_var_reinitialized = true;
+        _state_var_reinitialized = true;
         <%preExp%>
         <%cref1(stateVar,simCode , &extraFuncs , &extraFuncsDecl,  extraFuncsNamespace,contextOther,varDeclsCref,stateDerVectorName,useFlatArrayNotation)%> = <%val%>;
         >>
@@ -11962,7 +11964,6 @@ template createEvaluateAll( list<SimEqSystem> allEquationsPlusWhen,list<SimWhenC
   bool <%className%>::evaluateAll(const UPDATETYPE command)
   {
     <%if createMeasureTime then generateMeasureTimeStartCode("measuredFunctionStartValues", "evaluateAll", "MEASURETIME_MODELFUNCTIONS") else ""%>
-    bool state_var_reinitialized = false;
 
     <%varDecls%>
     // Evaluate Equations
@@ -11971,7 +11972,7 @@ template createEvaluateAll( list<SimEqSystem> allEquationsPlusWhen,list<SimWhenC
     <%reinit%>
 
     <%if createMeasureTime then generateMeasureTimeEndCode("measuredFunctionStartValues", "measuredFunctionEndValues", "measureTimeFunctionsArray[1]", "evaluateAll", "MEASURETIME_MODELFUNCTIONS") else ""%>
-    return state_var_reinitialized;
+    return _state_var_reinitialized;
   }
   >>
 end createEvaluateAll;
@@ -12118,7 +12119,7 @@ template functionWhenReinitStatementThen(list<WhenOperator> reinits, Text &varDe
         let &varDeclsCref = buffer "" /*BUFD*/
         let val = daeExp(value, contextSimulationDiscrete, &preExp /*BUFC*/, &varDecls /*BUFD*/,simCode , &extraFuncs , &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
         <<
-        state_var_reinitialized = true;
+        _state_var_reinitialized = true;
         <%preExp%>
         <%cref1(stateVar,simCode , &extraFuncs , &extraFuncsDecl,  extraFuncsNamespace,contextOther,varDeclsCref,stateDerVectorName,useFlatArrayNotation)%> = <%val%>;
         >>