Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2016-10-05 08:02:07 +0000
committerHenrik Rentz-Reichert2016-10-05 08:18:12 +0000
commit096f19bb7981a01aaecf96c20d0894d229531daf (patch)
treed7f2cf9f356fbcf40f1247fced9c305cea799226 /plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c
parent821851389cdbba6f0127cabc36b4449926c937e3 (diff)
downloadorg.eclipse.etrice-096f19bb7981a01aaecf96c20d0894d229531daf.tar.gz
org.eclipse.etrice-096f19bb7981a01aaecf96c20d0894d229531daf.tar.xz
org.eclipse.etrice-096f19bb7981a01aaecf96c20d0894d229531daf.zip
Bug 501354 - ids for transition chains not generated completely (C++
Generator) Also with inheritance we don't use base class chain IDs since they might differ for corner cases. So we always generate all IDs and use qualification to make explicit which constant is used. Also the chain IDs are handled properly now in the ExpandedModelClass. Before the genmodel was invalid since chain IDs haven't been stored. Change-Id: I594a90876d56d760e61b899c265aaf1b98e17017
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c')
-rw-r--r--plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend
index 55779bec0..e27d01a2f 100644
--- a/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend
+++ b/plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/CExtensions.xtend
@@ -73,7 +73,9 @@ class CExtensions implements ILanguageExtension {
override String selfPointer(boolean hasArgs) { if (hasArgs) "self, " else "self" }
- override String operationScope(String classname, boolean isDeclaration){classname+"_"}
+ override String scopeSeparator() {""}
+
+ override String operationScope(String classname, boolean isDeclaration) {classname+"_"}
override String memberInDeclaration(String namespace, String member) {
return namespace+"_"+member

Back to the top