Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-02-27 16:03:29 +0000
committerHenrik Rentz-Reichert2012-02-27 16:03:29 +0000
commit9b63ec1b9654dd00d644ceb94f664df3e61d6c4e (patch)
tree3607453cd83d3e2963fd2a415a84289931d29e22 /tests/org.eclipse.etrice.generator.c.tests/src-gen
parent1b19f7079ee48921ad2fb0169eb73d537f9eab1e (diff)
parentfa4a03389b5596fbaa65d5acb0e198013c1820a8 (diff)
downloadorg.eclipse.etrice-9b63ec1b9654dd00d644ceb94f664df3e61d6c4e.tar.gz
org.eclipse.etrice-9b63ec1b9654dd00d644ceb94f664df3e61d6c4e.tar.xz
org.eclipse.etrice-9b63ec1b9654dd00d644ceb94f664df3e61d6c4e.zip
Merge remote branch 'refs/remotes/origin/master'
Conflicts: plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java
Diffstat (limited to 'tests/org.eclipse.etrice.generator.c.tests/src-gen')
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.c7
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.h19
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.c3
-rw-r--r--tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.h9
4 files changed, 17 insertions, 21 deletions
diff --git a/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.c b/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.c
index 7683d9062..f89049ff7 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.c
+++ b/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.c
@@ -9,13 +9,12 @@
#include <string.h>
-//--------------------- begin user code
+/*--------------------- begin user code ---------------------*/
// usercode3
-//--------------------- end user code
+/*--------------------- end user code ---------------------*/
-// TODO: do we need setters and getters for C and C++ ?
-//--------------------- operations
+/*--------------------- operations ---------------------*/
int32 DataClass1_MultiplyWithAttr1(DataClass1* self, int32 value) {
return self->Attr1*value;
}
diff --git a/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.h b/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.h
index 948491f86..f1d7a6fb0 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.h
+++ b/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass1.h
@@ -10,31 +10,30 @@
#include "etDatatypes.h"
-/* TODO: includes only for used DataClasses, also for other models */
#include "DataClass2.h"
-//--------------------- begin user code
+/*--------------------- begin user code ---------------------*/
// usercode1
-//--------------------- end user code
+/*--------------------- end user code ---------------------*/
typedef struct {
- //--------------------- begin user code
- // usercode2
- //--------------------- end user code
- //--------------------- attributes
+ /*--------------------- attributes ---------------------*/
int32 Attr1;
DataClass2 ComplexAttr;
float32 Attr3;
} DataClass1;
-// TODO: do we need setters and getters for C and C++ ?
-//--------------------- operations
+/*--------------------- operations ---------------------*/
int32 DataClass1_MultiplyWithAttr1(DataClass1* self, int32 value);
float32 DataClass1_MultiplyWithAttr3(DataClass1* self, float32 value);
-// deep copy
+/* deep copy */
void DataClass1_deepCopy(DataClass1* source, DataClass1* target);
+/*--------------------- begin user code ---------------------*/
+ // usercode2
+/*--------------------- end user code ---------------------*/
+
#endif /* _DATACLASS1_H_ */
diff --git a/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.c b/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.c
index 1fd7e1572..ab4bbb274 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.c
+++ b/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.c
@@ -10,9 +10,8 @@
#include <string.h>
-// TODO: do we need setters and getters for C and C++ ?
-//--------------------- operations
+/*--------------------- operations ---------------------*/
void DataClass2_Operation1(DataClass2* self) {
/*nothing to do*/
}
diff --git a/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.h b/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.h
index 4b1f3164f..4b08b4125 100644
--- a/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.h
+++ b/tests/org.eclipse.etrice.generator.c.tests/src-gen/cGenRef/DataClass2.h
@@ -10,23 +10,22 @@
#include "etDatatypes.h"
-/* TODO: includes only for used DataClasses, also for other models */
typedef struct {
- //--------------------- attributes
+ /*--------------------- attributes ---------------------*/
int32 Attr1;
float32 Attr2;
int32 Attr3;
} DataClass2;
-// TODO: do we need setters and getters for C and C++ ?
-//--------------------- operations
+/*--------------------- operations ---------------------*/
void DataClass2_Operation1(DataClass2* self);
-// deep copy
+/* deep copy */
void DataClass2_deepCopy(DataClass2* source, DataClass2* target);
+
#endif /* _DATACLASS2_H_ */

Back to the top