diff options
| author | JackLivio <jack@livio.io> | 2018-08-04 17:23:16 -0400 |
|---|---|---|
| committer | JackLivio <jack@livio.io> | 2018-08-04 17:23:16 -0400 |
| commit | 4a5afcf8cac695c88635f4bf791f03fa8bc98bc0 (patch) | |
| tree | 40782fea706b5563a72a1ad208a62946ef7d19f6 /src/components/smart_objects | |
| parent | fd7f61fae6e83a81449399080ae18efde16d6ccc (diff) | |
| download | sdl_core-4a5afcf8cac695c88635f4bf791f03fa8bc98bc0.tar.gz | |
Fixes for parsing enum history elements
Diffstat (limited to 'src/components/smart_objects')
| -rw-r--r-- | src/components/smart_objects/include/smart_objects/enum_schema_item.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/components/smart_objects/include/smart_objects/enum_schema_item.h b/src/components/smart_objects/include/smart_objects/enum_schema_item.h index f6b7bdff92..b0fd0ca418 100644 --- a/src/components/smart_objects/include/smart_objects/enum_schema_item.h +++ b/src/components/smart_objects/include/smart_objects/enum_schema_item.h @@ -104,7 +104,7 @@ class TEnumSchemaItem : public CDefaultSchemaItem<EnumType> { **/ static std::shared_ptr<TEnumSchemaItem> createWithSignatures( const std::set<EnumType>& AllowedElements, - const std::set<ElementSignature>& ElementSignatures, + const std::map<EnumType, std::vector<ElementSignature>>& ElementSignatures, const TSchemaItemParameter<EnumType>& DefaultValue = TSchemaItemParameter<EnumType>()); /** @@ -160,14 +160,14 @@ class TEnumSchemaItem : public CDefaultSchemaItem<EnumType> { TEnumSchemaItem(const std::set<EnumType>& AllowedElements, const TSchemaItemParameter<EnumType>& DefaultValue, - const std::set<ElementSignature>& ElementSignatures); + const std::map<EnumType, std::vector<ElementSignature>>& ElementSignatures); SmartType getSmartType() const OVERRIDE; EnumType getDefaultValue() const OVERRIDE; /** * @brief Set of allowed enumeration elements. **/ const std::set<EnumType> mAllowedElements; - const std::set<ElementSignature> mElementSignatures; + const std::map<EnumType, std::vector<ElementSignature>> mElementSignatures; /** * @brief Default value. **/ @@ -276,7 +276,7 @@ std::shared_ptr<TEnumSchemaItem<EnumType> > TEnumSchemaItem<EnumType>::create( template <typename EnumType> std::shared_ptr<TEnumSchemaItem<EnumType> > TEnumSchemaItem<EnumType>::createWithSignatures( const std::set<EnumType>& AllowedElements, - const std::set<ElementSignature>& ElementSignatures, + const std::map<EnumType, std::vector<ElementSignature>>& ElementSignatures, const TSchemaItemParameter<EnumType>& DefaultValue ) { return std::shared_ptr<TEnumSchemaItem<EnumType> >( new TEnumSchemaItem<EnumType>(AllowedElements, DefaultValue, ElementSignatures)); @@ -363,7 +363,7 @@ template <typename EnumType> TEnumSchemaItem<EnumType>::TEnumSchemaItem( const std::set<EnumType>& AllowedElements, const TSchemaItemParameter<EnumType>& DefaultValue, - const std::set<ElementSignature>& ElementSignatures) + const std::map<EnumType, std::vector<ElementSignature>>& ElementSignatures) : CDefaultSchemaItem<EnumType>(DefaultValue) , mAllowedElements(AllowedElements) , mElementSignatures(mElementSignatures) {} |