diff options
author | JackLivio <jack@livio.io> | 2018-08-08 09:58:33 -0400 |
---|---|---|
committer | JackLivio <jack@livio.io> | 2018-08-08 09:58:33 -0400 |
commit | 564a5ccc9bd457623b9a963cf7680f97342615ef (patch) | |
tree | b05301b8495fbe6d4845f672fec57589f9b048b5 | |
parent | 8a5be2b85c5c37b5b2d2b304f0816eda6f05352b (diff) | |
download | sdl_core-564a5ccc9bd457623b9a963cf7680f97342615ef.tar.gz |
Change boost optional to compare boost::none
-rw-r--r-- | src/components/smart_objects/src/object_schema_item.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/components/smart_objects/src/object_schema_item.cc b/src/components/smart_objects/src/object_schema_item.cc index def0c0aceb..f2ec3b088c 100644 --- a/src/components/smart_objects/src/object_schema_item.cc +++ b/src/components/smart_objects/src/object_schema_item.cc @@ -76,11 +76,11 @@ CObjectSchemaItem::SMember::SMember( bool CObjectSchemaItem::SMember::CheckHistoryFieldVersion( const utils::SemanticVersion& MessageVersion) const { if (MessageVersion.isValid()) { - if (mSince.is_initialized()) { + if (mSince != boost::none) { if (MessageVersion < mSince.get()) { return false; // Msg version predates `since` field } else { - if (mUntil.is_initialized() && (MessageVersion >= mUntil.get())) { + if (mUntil != boost::none && (MessageVersion >= mUntil.get())) { return false; // Msg version newer than `until` field } else { return true; // Mobile msg version falls within specified version @@ -89,7 +89,7 @@ bool CObjectSchemaItem::SMember::CheckHistoryFieldVersion( } } - if (mUntil.is_initialized() && (MessageVersion >= mUntil.get())) { + if (mUntil != boost::none && (MessageVersion >= mUntil.get())) { return false; // Msg version newer than `until` field } else { return true; // Mobile msg version falls within specified version range @@ -168,14 +168,14 @@ Errors::eType CObjectSchemaItem::validate( const SMember& member = it->second; std::set<std::string>::const_iterator key_it = object_keys.find(key); if (object_keys.end() == key_it) { - if (member.mSince.is_initialized() && + if (member.mSince != boost::none && MessageVersion < member.mSince.get() && member.mHistoryVector.size() > 0) { // Message version predates parameter and a history vector exists. for (uint i = 0; i < member.mHistoryVector.size(); i++) { - if (member.mHistoryVector[i].mSince.is_initialized() && + if (member.mHistoryVector[i].mSince != boost::none && MessageVersion >= member.mHistoryVector[i].mSince.get()) { - if (member.mHistoryVector[i].mUntil.is_initialized() && + if (member.mHistoryVector[i].mUntil != boost::none && MessageVersion >= member.mHistoryVector[i].mUntil.get()) { // MessageVersion is newer than the specified "Until" version continue; @@ -189,9 +189,8 @@ Errors::eType CObjectSchemaItem::validate( } break; } - } else if (member.mHistoryVector[i].mSince.is_initialized() == - false && - member.mHistoryVector[i].mUntil.is_initialized() && + } else if (member.mHistoryVector[i].mSince == boost::none && + member.mHistoryVector[i].mUntil != boost::none && MessageVersion < member.mHistoryVector[i].mUntil.get()) { if (member.mHistoryVector[i].mIsMandatory == true && (member.mHistoryVector[i].mIsRemoved == false)) { |