Commit ffa9279f authored by Mirko Stoffers's avatar Mirko Stoffers

Moved inheritance of cNumberGenerator from cAsyncModule to cSimpleModule

We are about to eliminate the need for special cAsyncModule objects
since it is more convenient to just stick to cSimpleModule in the
model implementation and active Horizon through omnetpp.ini switches.

Therefore, we first shifted the inheritance of cNumberGenerator from
cAsyncModule to cSimpleModule. This means that everytime you call
number generator functions inside a module, a local number generator
of the calling module is used rather than the one global RNG.
parent 79b044ca
......@@ -24,7 +24,6 @@
#include "csimplemodule.h"
#include "cmessage.h"
#include "cnumgen.h"
#ifdef ATOMIC_OPS_DEBUG
#include "catomicopsdebug.h"
......@@ -43,7 +42,7 @@
*/
class cAsyncMessage;
class SIM_API cAsyncModule : public cSimpleModule, public cNumberGenerator
class SIM_API cAsyncModule : public cSimpleModule
{
private:
......
......@@ -21,6 +21,7 @@
#define __CSIMPLEMODULE_H
#include "cmodule.h"
#include "cnumgen.h"
NAMESPACE_BEGIN
......@@ -61,7 +62,7 @@ class cCoroutine;
*
* @ingroup SimCore
*/
class SIM_API cSimpleModule : public cModule //implies noncopyable
class SIM_API cSimpleModule : public cModule, public cNumberGenerator //implies noncopyable
{
friend class cModule;
friend class cSimulation;
......
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