diff options
| author | Juergen Haug | 2016-07-17 19:10:17 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2016-08-12 13:59:50 +0000 |
| commit | 8ef7f2301ec756c29f08ba56dd4f6d537828b8c3 (patch) | |
| tree | 5fd19a27cf1c562053ca6e1109de38c9de3b173a /runtime/org.eclipse.etrice.runtime.c/src | |
| parent | cc3093fe8f33d131870d6f5ef468c22c0420870e (diff) | |
| download | org.eclipse.etrice-8ef7f2301ec756c29f08ba56dd4f6d537828b8c3.tar.gz org.eclipse.etrice-8ef7f2301ec756c29f08ba56dd4f6d537828b8c3.tar.xz org.eclipse.etrice-8ef7f2301ec756c29f08ba56dd4f6d537828b8c3.zip | |
[cpp] Improvements + fixed data passing, data classes and attribute init
Equipped etUnit with a special version of EXPECT_ORDER_START()
in the C++ case that assumes a StaticArray as second argument.
Updated ui.runtime archives.
Change-Id: I2bbafe26b345b4deafd0269284cfc5bfbbc3d69d
Diffstat (limited to 'runtime/org.eclipse.etrice.runtime.c/src')
| -rw-r--r-- | runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.h b/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.h index ff1902cac..f891c37a5 100644 --- a/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.h +++ b/runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.h @@ -158,7 +158,11 @@ void etUnit_closeAll(etInt16 id); * more specialized functions */ /** calls \ref expectOrderStart() */ +#ifdef __cplusplus +#define EXPECT_ORDER_START(id, list, size) expectOrderStart(id, list.getData(), size, __FILE__, __LINE__) +#else #define EXPECT_ORDER_START(id, list, size) expectOrderStart(id, list, size, __FILE__, __LINE__) +#endif /** calls \ref expectOrder() */ #define EXPECT_ORDER(id, msg, val) expectOrder(id, msg, val, __FILE__, __LINE__) /** calls \ref expectOrderEnd() */ |