summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaroslav Mamykin (GitHub) <ymamykin@luxoft.com>2019-10-24 10:55:20 +0300
committerYarik <ymamykin@gmail.com>2019-11-15 15:19:30 +0200
commit19793052fc379e2792d4e5aecf865b7b96dfc523 (patch)
treedba780ae7e212c3023bc745fed9f9474184ed063
parent3afba6ed23fce915d74e56cf42a2a4fc5a7c6659 (diff)
downloadsdl_core-19793052fc379e2792d4e5aecf865b7b96dfc523.tar.gz
fixup! Fix versioning appliance for vehicle data
-rw-r--r--src/components/smart_objects/include/smart_objects/object_schema_item.h15
-rw-r--r--src/components/smart_objects/src/object_schema_item.cc3
2 files changed, 2 insertions, 16 deletions
diff --git a/src/components/smart_objects/include/smart_objects/object_schema_item.h b/src/components/smart_objects/include/smart_objects/object_schema_item.h
index 3427a48da9..0240a191b0 100644
--- a/src/components/smart_objects/include/smart_objects/object_schema_item.h
+++ b/src/components/smart_objects/include/smart_objects/object_schema_item.h
@@ -50,11 +50,6 @@ namespace ns_smart_objects {
* @brief Object member.
**/
struct SMember {
- /*
- * @brief Defines data type that SMember contains.
- */
- enum class Type { OEM_SPECIFIC = 0, RPC_SPECIFIC = 1 };
-
/**
* @brief Default constructor.
**/
@@ -72,8 +67,7 @@ struct SMember {
const std::string& Until = "",
const bool IsDeprecated = false,
const bool IsRemoved = false,
- const std::vector<SMember>& history_vector = {},
- const Type type = Type::RPC_SPECIFIC);
+ const std::vector<SMember>& history_vector = {});
/**
* @brief Checks the version a parameter was removed (until)
@@ -82,13 +76,6 @@ struct SMember {
bool CheckHistoryFieldVersion(
const utils::SemanticVersion& MessageVersion) const;
- private:
- bool CheckCustomVehicleData(
- const utils::SemanticVersion& MessageVersion) const;
-
- bool CheckAPIVehicleData(const utils::SemanticVersion& MessageVersion) const;
-
- public:
/**
* @brief Member schema item.
**/
diff --git a/src/components/smart_objects/src/object_schema_item.cc b/src/components/smart_objects/src/object_schema_item.cc
index a838a9fe03..5990815905 100644
--- a/src/components/smart_objects/src/object_schema_item.cc
+++ b/src/components/smart_objects/src/object_schema_item.cc
@@ -60,8 +60,7 @@ SMember::SMember(const ISchemaItemPtr SchemaItem,
const std::string& Until,
const bool IsDeprecated,
const bool IsRemoved,
- const std::vector<SMember>& history_vector,
- const Type type)
+ const std::vector<SMember>& history_vector)
: mSchemaItem(SchemaItem), mIsMandatory(IsMandatory) {
if (Since.size() > 0) {
utils::SemanticVersion since_struct(Since);