Commit aafac865 authored by Mirko Stoffers's avatar Mirko Stoffers
Browse files

Merge branch 'omnet43' into ada

Conflicts:
	src/sim/csimplemodule.cc
parents ee44bd2e eb21e3cf
......@@ -183,8 +183,9 @@ void cSimpleModule::activate(void *p)
// legacy constructor, only for backwards compatiblity; first two args are unused
cSimpleModule::cSimpleModule(const char *, cModule *, unsigned stksize) :
currentEventType(NULL),
executionState(asynchronous),
t_end(0.0)
executionState(synchronous),
t_end(0.0),
executionOrderId(0)
{
coroutine = NULL;
setFlag(FL_USESACTIVITY, stksize!=0);
......@@ -235,8 +236,9 @@ cSimpleModule::cSimpleModule(const char *, cModule *, unsigned stksize) :
cSimpleModule::cSimpleModule(unsigned stksize) :
currentEventType(NULL),
executionState(asynchronous),
t_end(0.0)
executionState(synchronous),
t_end(0.0),
executionOrderId(0)
{
coroutine = NULL;
setFlag(FL_USESACTIVITY, stksize!=0);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment