diff options
| author | epaen | 2014-07-22 09:26:04 +0000 |
|---|---|---|
| committer | epaen | 2014-07-22 09:26:04 +0000 |
| commit | 85332039dea58e98196a1df7186d43009c4c06d2 (patch) | |
| tree | ace42a2b914327d11cd39675da4abe3608a8c2a3 /plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend | |
| parent | 0b156eb6b810420c94342b9bd78c0d89bcf6b46c (diff) | |
| download | org.eclipse.etrice-85332039dea58e98196a1df7186d43009c4c06d2.tar.gz org.eclipse.etrice-85332039dea58e98196a1df7186d43009c4c06d2.tar.xz org.eclipse.etrice-85332039dea58e98196a1df7186d43009c4c06d2.zip | |
[generator.c] Compiler error for unbound simple ports with MSC logging
activated, due to missing #ifdef
Change-Id: I517aa941b08445a358df6ff8f57b605c7809daf3
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend')
| -rw-r--r-- | plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend index 8749c1f3a..a5b2eb2de 100644 --- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend +++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/NodeGen.xtend @@ -545,10 +545,13 @@ class NodeGen { val objId = if (pi.peers.empty) 0 else pi.peers.get(0).objId val idx = if (pi.peers.empty) 0 else pi.peers.get(0).peers.indexOf(pi) val msgSvc = if (pi.peers.empty) "NULL" else "&msgService_"+ETMapUtil::getMappedThread(pi.peers.get(0).eContainer as ActorInstance).thread.name - val myInst = if (Main::settings.generateMSCInstrumentation) "\n#ifdef ET_ASYNC_MSC_LOGGER_ACTIVATE\n,\""+(pi.eContainer as ActorInstance).path+"\"," - else "" - val peerInst = if (Main::settings.generateMSCInstrumentation && !pi.peers.empty) "\""+(pi.peers.get(0).eContainer as ActorInstance).path+"\"\n#endif\n" - else "" + var myInst = "" + var peerInst = "" + if(Main::settings.generateMSCInstrumentation) { + myInst = "\n#ifdef ET_ASYNC_MSC_LOGGER_ACTIVATE\n,\""+(pi.eContainer as ActorInstance).path+"\"," + peerInst = if (!pi.peers.empty) "\""+(pi.peers.get(0).eContainer as ActorInstance).path+"\"\n#endif\n" + else "\n#endif\n" + } "{"+getInterfaceItemInstanceData(pi)+", " +msgSvc+", " |