adapt Cpp terminate() to other runtimes

The previous implementation was broken after commit 88a5a66.
OpenModelica · Aug 14, 2015 · 2d797bb · 2d797bb
1 parent 005f9dc
commit 2d797bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Compiler/Template/CodegenCpp.tpl b/Compiler/Template/CodegenCpp.tpl
@@ -12128,7 +12128,7 @@ template functionWhenReinitStatementThen(list<WhenOperator> reinits, Text &varDe
         let msgVar = daeExp(message, contextSimulationDiscrete, &preExp /*BUFC*/, &varDecls /*BUFD*/,simCode , &extraFuncs , &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)
         <<
         <%preExp%>
-        Terminate(<%msgVar%>);
+        MODELICA_TERMINATE(<%msgVar%>);
         >>
       case ASSERT(source=SOURCE(info=info)) then
         assertCommon(condition, message, contextSimulationDiscrete, &varDecls, info,simCode , &extraFuncs , &extraFuncsDecl, extraFuncsNamespace, stateDerVectorName, useFlatArrayNotation)

diff --git a/SimulationRuntime/cpp/Include/Core/System/SystemDefaultImplementation.h b/SimulationRuntime/cpp/Include/Core/System/SystemDefaultImplementation.h
@@ -36,6 +36,8 @@ for Open Modelica", September, 10 th, 2008
 Copyright (c) 2008, OSMC
 *****************************************************************************/
 
+#define MODELICA_TERMINATE(msg) Terminate(msg)
+
 //typedef boost::unordered_map<std::string, boost::any> SValuesMap;
 
 template <class T>