Skip to content

Commit 876a710

Browse files
committed
-some adaptions for vxworks
1 parent b073360 commit 876a710

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

Compiler/Template/CodegenCpp.tpl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3312,7 +3312,7 @@ case SIMCODE(modelInfo = MODELINFO(__)) then
33123312
let constVariableInitialize = simulationInitFile(simCode, &extraFuncsDecl, stateDerVectorName, false)
33133313
<<
33143314
#if defined(__TRICORE__) || defined(__vxworks)
3315-
#include <DataExchange/SimDouble.h>
3315+
#include <Core/DataExchange/SimDouble.h>
33163316
#endif
33173317

33183318
/* Constructor */
@@ -10491,7 +10491,7 @@ template initAlgloopsolvers2(SimEqSystem eq, Context context, Text &varDecls, Si
1049110491
case SIMCODE(modelInfo = MODELINFO(__)) then
1049210492
<<
1049310493
if(_algLoopSolver<%num%>)
10494-
_algLoopSolver<%num%>->initialize();
10494+
_algLoopSolver<%num%>->initialize();<%\n%>
1049510495
>>
1049610496
end match
1049710497
case e as SES_NONLINEAR(nlSystem = nls as NONLINEARSYSTEM(__))
@@ -12799,6 +12799,7 @@ let modelname = identOfPath(modelInfo.name)
1279912799
'
1280012800
typedef struct <%modelname%>_struct
1280112801
{
12802+
void* __VFTABLEPOINTER;
1280212803
<%inputVars%>
1280312804
<%outputVars%>
1280412805
MLPI_IEC_REAL cycletime;

SimulationRuntime/cpp/Core/System/AlgLoopSolverFactory.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ boost::shared_ptr<IAlgLoopSolver> AlgLoopSolverFactory::createAlgLoopSolver(IAlg
2525
{
2626
if(algLoop->getDimReal() > 0)
2727
{
28+
29+
/*
2830
if(algLoop->isLinear())
2931
{
3032
try
@@ -42,7 +44,7 @@ boost::shared_ptr<IAlgLoopSolver> AlgLoopSolverFactory::createAlgLoopSolver(IAlg
4244
{
4345
//the linear solver was not found -> take the nonlinear solver
4446
}
45-
}
47+
}*/
4648

4749
string nonlinsolver_name = _global_settings->getSelectedNonLinSolver();
4850
boost::shared_ptr<INonLinSolverSettings> algsolversetting= createNonLinSolverSettings(nonlinsolver_name);

SimulationRuntime/cpp/Include/Core/System/AlgLoopDefaultImplementation.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#pragma once
2+
23
/** @addtogroup coreSystem
34
*
45
* @{
@@ -97,4 +98,4 @@ class BOOST_EXTENSION_ALGLOOPDEFAULTIMPL_DECL AlgLoopDefaultImplementation
9798
_constraintType; ///< Typ der Bindungsgleichungen (analog, digital, binär)
9899

99100
};
100-
/** @} */ // end of coreSystem
101+
/** @} */ // end of coreSystem

0 commit comments

Comments
 (0)