diff options
Diffstat (limited to 'src/test/commonapi/tests/DerivedTypeCollection.h')
-rw-r--r-- | src/test/commonapi/tests/DerivedTypeCollection.h | 56 |
1 files changed, 39 insertions, 17 deletions
diff --git a/src/test/commonapi/tests/DerivedTypeCollection.h b/src/test/commonapi/tests/DerivedTypeCollection.h index 0ca1d79..52687f6 100644 --- a/src/test/commonapi/tests/DerivedTypeCollection.h +++ b/src/test/commonapi/tests/DerivedTypeCollection.h @@ -1,9 +1,11 @@ /* -* This file was generated by the CommonAPI Generators. +* This file was generated by the CommonAPI Generators. +* Used org.genivi.commonapi.core 2.1.0.qualifier. +* Used org.franca.core 0.8.9.201308271211. * -* This Source Code Form is subject to the terms of the Mozilla Public -* License, v. 2.0. If a copy of the MPL was not distributed with this -* file, You can obtain one at http://mozilla.org/MPL/2.0/. +* This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. +* If a copy of the MPL was not distributed with this file, You can obtain one at +* http://mozilla.org/MPL/2.0/. */ #ifndef COMMONAPI_TESTS_Derived_Type_Collection_H_ #define COMMONAPI_TESTS_Derived_Type_Collection_H_ @@ -31,8 +33,14 @@ namespace tests { namespace DerivedTypeCollection { struct TestStruct: CommonAPI::SerializableStruct { - PredefinedTypeCollection::TestString testString; - uint16_t uintValue; + /** + * the name of the property + */ + PredefinedTypeCollection::TestString testString; + /** + * the actual value + */ + uint16_t uintValue; TestStruct() = default; TestStruct(const PredefinedTypeCollection::TestString& testString, const uint16_t& uintValue); @@ -46,33 +54,46 @@ namespace DerivedTypeCollection { typeOutputStream.writeUInt16Type(); } }; - typedef std::vector<TestStruct> TestArrayTestStruct; - typedef std::unordered_map<uint32_t, TestArrayTestStruct> TestMap; - + /** + * Common errors. + */ enum class TestEnum: int32_t { + /** + * default + */ E_UNKNOWN = 0x0, + /** + * no error - positive reply + */ E_OK = 0x1, + /** + * value out of range + */ E_OUT_OF_RANGE = 0x2, + /** + * not used + */ E_NOT_USED = 0x3 }; // Definition of a comparator still is necessary for GCC 4.4.1, topic is fixed since 4.5.1 struct TestEnumComparator; - enum class TestEnumExtended: int32_t { E_UNKNOWN = TestEnum::E_UNKNOWN, E_OK = TestEnum::E_OK, E_OUT_OF_RANGE = TestEnum::E_OUT_OF_RANGE, E_NOT_USED = TestEnum::E_NOT_USED , + /** + * new error + */ E_NEW = 0x4 }; // Definition of a comparator still is necessary for GCC 4.4.1, topic is fixed since 4.5.1 struct TestEnumExtendedComparator; - enum class TestEnumExtended2: int32_t { E_UNKNOWN = TestEnum::E_UNKNOWN, E_OK = TestEnum::E_OK, @@ -81,14 +102,16 @@ namespace DerivedTypeCollection { E_NEW = TestEnumExtended::E_NEW , + /** + * new error + */ E_NEW2 = 0x5 }; // Definition of a comparator still is necessary for GCC 4.4.1, topic is fixed since 4.5.1 struct TestEnumExtended2Comparator; - struct TestStructExtended: TestStruct { - TestEnumExtended2 testEnumExtended2; + TestEnumExtended2 testEnumExtended2; TestStructExtended() = default; TestStructExtended(const PredefinedTypeCollection::TestString& testString, const uint16_t& uintValue, const TestEnumExtended2& testEnumExtended2); @@ -102,10 +125,11 @@ namespace DerivedTypeCollection { typeOutputStream.writeInt32Type(); } }; - typedef std::unordered_map<TestEnum, std::string> TestEnumMap; - enum class TestEnumMissingValue: int32_t { + /** + * default + */ E1 = 0xa, E2, E3 = 2 @@ -113,9 +137,7 @@ namespace DerivedTypeCollection { // Definition of a comparator still is necessary for GCC 4.4.1, topic is fixed since 4.5.1 struct TestEnumMissingValueComparator; - typedef std::vector<uint64_t> TestArrayUInt64; - bool operator==(const TestStructExtended& lhs, const TestStructExtended& rhs); inline bool operator!=(const TestStructExtended& lhs, const TestStructExtended& rhs) { |