diff options
| author | Henrik Rentz-Reichert | 2016-10-24 08:54:51 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2016-10-24 08:54:51 +0000 |
| commit | 983530e67b659bef1210d4fe9969cece58787524 (patch) | |
| tree | fd1c3c607aa05736f715d63da380aef5a42de68c | |
| parent | 6737a6ed67c0d0ecbdf1c95a42c10362708bbf75 (diff) | |
| download | org.eclipse.etrice-983530e67b659bef1210d4fe9969cece58787524.tar.gz org.eclipse.etrice-983530e67b659bef1210d4fe9969cece58787524.tar.xz org.eclipse.etrice-983530e67b659bef1210d4fe9969cece58787524.zip | |
Bug 500736 - usercode3 for C++ is not generated
Change-Id: I972c52f87a34a06aa52015caf09356fcc9ad919a
2 files changed, 11 insertions, 3 deletions
diff --git a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.xtend b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.xtend index e1228095b..4678467f0 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.xtend +++ b/plugins/org.eclipse.etrice.generator.cpp/src/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.xtend @@ -97,8 +97,9 @@ class ActorClassGen extends GenericActorClassGenerator { «ENDFOR» «ac.userCode1.userCode» - - using namespace etRuntime; //TODO JH remove + +««« //TODO JH remove + using namespace etRuntime; «ac.generateNamespaceBegin» @@ -241,6 +242,8 @@ class ActorClassGen extends GenericActorClassGenerator { «ac.generateNamespaceBegin» + «ac.userCode3.userCode» + «clsname»::«clsname»(etRuntime::IRTObject* parent, const std::string& name) «ac.generateConstructorInitalizerList» { diff --git a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java index dc626700c..16a83c080 100644 --- a/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java +++ b/plugins/org.eclipse.etrice.generator.cpp/xtend-gen/org/eclipse/etrice/generator/cpp/gen/ActorClassGen.java @@ -270,7 +270,7 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append(_userCode, ""); _builder.newLineIfNotEmpty(); _builder.newLine(); - _builder.append("using namespace etRuntime; //TODO JH remove"); + _builder.append("using namespace etRuntime;"); _builder.newLine(); _builder.newLine(); String _generateNamespaceBegin = this._cppExtensions.generateNamespaceBegin(ac); @@ -762,6 +762,11 @@ public class ActorClassGen extends GenericActorClassGenerator { _builder.append(_generateNamespaceBegin, ""); _builder.newLineIfNotEmpty(); _builder.newLine(); + DetailCode _userCode3 = ac.getUserCode3(); + CharSequence _userCode = this._procedureHelpers.userCode(_userCode3); + _builder.append(_userCode, ""); + _builder.newLineIfNotEmpty(); + _builder.newLine(); _builder.append(clsname, ""); _builder.append("::"); _builder.append(clsname, ""); |