diff options
Diffstat (limited to 'runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase')
4 files changed, 7 insertions, 6 deletions
diff --git a/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/ActorClassBase.cpp b/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/ActorClassBase.cpp index a19b46d52..dbd5682f6 100644 --- a/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/ActorClassBase.cpp +++ b/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/ActorClassBase.cpp @@ -19,7 +19,7 @@ ActorClassBase::ActorClassBase(IRTObject* parent, std::string name, Address ownA m_ownMsgsvc(RTServices::getInstance().getMsgSvcCtrl().getMsgSvc(ownAddr.m_threadID)) {
// own ports
- m_RTSystemPort = new RTSystemServicesProtocol::RTSystemServicesProtocolPort(*this, this, "RTSystemPort", 0, 0, ownAddr,
+ m_RTSystemPort = new RTSystemServicesProtocolPort(*this, this, "RTSystemPort", 0, 0, ownAddr,
systemPortPeerAddr);
}
@@ -34,12 +34,12 @@ bool ActorClassBase::handleSystemEvent(InterfaceItemBase ifitem, int evt, void* }
switch (evt) {
- case RTSystemServicesProtocol::Events::IN_executeInitialTransition:
+ case RTSystemServicesProtocol::IN_executeInitialTransition:
executeInitTransition();
break;
- case RTSystemServicesProtocol::Events::IN_startDebugging:
+ case RTSystemServicesProtocol::IN_startDebugging:
break;
- case RTSystemServicesProtocol::Events::IN_stopDebugging:
+ case RTSystemServicesProtocol::IN_stopDebugging:
break;
}
return true;
diff --git a/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/ActorClassBase.h b/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/ActorClassBase.h index 28dc8a19c..7beaa5422 100644 --- a/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/ActorClassBase.h +++ b/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/ActorClassBase.h @@ -59,7 +59,7 @@ protected: * the current state
*/
int m_state;
- RTSystemServicesProtocol::RTSystemServicesProtocolPort* m_RTSystemPort;
+ RTSystemServicesProtocolPort* m_RTSystemPort;
bool handleSystemEvent(InterfaceItemBase ifitem, int evt, void* generic_data);
private:
diff --git a/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/SubSystemClassBase.cpp b/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/SubSystemClassBase.cpp index 173cb7717..7d32bac03 100644 --- a/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/SubSystemClassBase.cpp +++ b/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/SubSystemClassBase.cpp @@ -9,6 +9,7 @@ #include "common/messaging/MessageService.h"
#include "common/messaging/RTServices.h"
#include "ActorClassBase.h"
+#include "common/debugging/DebuggingService.h"
namespace etRuntime {
diff --git a/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/SubSystemClassBase.h b/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/SubSystemClassBase.h index c1da895a7..d6b106582 100644 --- a/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/SubSystemClassBase.h +++ b/runtime/org.eclipse.etrice.runtime.cpp/src/common/modelbase/SubSystemClassBase.h @@ -53,7 +53,7 @@ public: void testFinished(int errorCode);
protected:
- RTSystemServicesProtocol::RTSystemServicesProtocolConjPortRepl* m_RTSystemPort;
+ RTSystemServicesProtocolConjPortRepl* m_RTSystemPort;
//--------------------- interface item IDs
static const int IFITEM_RTSystemPort = 0;
std::vector<ActorClassBase*> m_instances;
|